diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index cdd92f530988..7d9214dfe014 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -75,8 +75,8 @@ # @raitobezarius is not "code owner", but is listed here to be notified of changes # pertaining to the Nix package manager. # i.e. no authority over those files. -pkgs/tools/package-management/nix/ @raitobezarius -nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius +pkgs/tools/package-management/nix/ @NixOS/nix-team @raitobezarius +nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobezarius # Nixpkgs documentation /maintainers/scripts/db-to-md.sh @jtojnar @ryantm diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 15741f57e6f4..c2351056bf8b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -21,7 +21,7 @@ For new packages please briefly describe the package or provide a link to its ho - [NixOS test(s)](https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests) (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - and/or [package tests](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#package-tests) - or, for functions and "core" functionality, tests in [lib/tests](https://github.com/NixOS/nixpkgs/blob/master/lib/tests) or [pkgs/test](https://github.com/NixOS/nixpkgs/blob/master/pkgs/test) - - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages + - made sure NixOS tests are [linked](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#linking-nixos-module-tests-to-a-package) to the relevant packages - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) - [24.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) (or backporting [23.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2311.section.md) and [24.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2405.section.md) Release notes) diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 614de43832a5..96a1a0971555 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -83,7 +83,7 @@ jobs: if (( "${#unformattedFiles[@]}" > 0 )); then echo "Some new/changed Nix files are not properly formatted" - echo "Please run the following in \`nix-shell\`:" + echo "Please go to the Nixpkgs root directory, run \`nix-shell\`, then:" echo "nixfmt ${unformattedFiles[*]@Q}" exit 1 fi diff --git a/.mailmap b/.mailmap index 26abb4c7cfc0..d7e9caacea7e 100644 --- a/.mailmap +++ b/.mailmap @@ -3,6 +3,7 @@ Anderson Torres Atemu Daniel Løvbrøtte Olsen Fabian Affolter +goatastronaut0212 Janne Heß Jörg Thalheim Martin Weinelt diff --git a/ci/pinned-nixpkgs.json b/ci/pinned-nixpkgs.json index b32545b900a5..05fb911c5470 100644 --- a/ci/pinned-nixpkgs.json +++ b/ci/pinned-nixpkgs.json @@ -1,4 +1,4 @@ { - "rev": "521d48afa9ae596930a95325529df27fa7135ff5", - "sha256": "0a1pa5azw990narsfipdli1wng4nc3vhvrp00hb8v1qfchcq7dc9" + "rev": "4de4818c1ffa76d57787af936e8a23648bda6be4", + "sha256": "0l3b9jr5ydzqgvd10j12imc9jqb6jv5v2bdi1gyy5cwkwplfay67" } diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md index 5d4ede836a1b..8af68845202f 100644 --- a/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/doc/build-helpers/trivial-build-helpers.chapter.md @@ -3,32 +3,122 @@ Nixpkgs provides a variety of wrapper functions that help build commonly useful derivations. Like [`stdenv.mkDerivation`](#sec-using-stdenv), each of these build helpers creates a derivation, but the arguments passed are different (usually simpler) from those required by `stdenv.mkDerivation`. -## `runCommand` {#trivial-builder-runCommand} -`runCommand :: String -> AttrSet -> String -> Derivation` +## `runCommandWith` {#trivial-builder-runCommandWith} -The result of `runCommand name drvAttrs buildCommand` is a derivation that is built by running the specified shell commands. +The function `runCommandWith` returns a derivation built using the specified command(s), in a specified environment. -By default `runCommand` runs in a stdenv with no compiler environment, whereas [`runCommandCC`](#trivial-builder-runCommandCC) uses the default stdenv, `pkgs.stdenv`. +It is the underlying base function of all [`runCommand*` variants]. +The general behavior is controlled via a single attribute set passed +as the first argument, and allows specifying `stdenv` freely. -`name :: String` -: The name that Nix will append to the store path in the same way that `stdenv.mkDerivation` uses its `name` attribute. +The following [`runCommand*` variants] exist: `runCommand`, `runCommandCC`, and `runCommandLocal`. -`drvAttr :: AttrSet` -: Attributes to pass to the underlying call to [`stdenv.mkDerivation`](#chap-stdenv). +[`runCommand*` variants]: #trivial-builder-runCommand -`buildCommand :: String` +### Type {#trivial-builder-runCommandWith-Type} + +``` +runCommandWith :: { + name :: name; + stdenv? :: Derivation; + runLocal? :: Bool; + derivationArgs? :: { ... }; +} -> String -> Derivation +``` + +### Inputs {#trivial-builder-runCommandWith-Inputs} + +`name` (String) +: The derivation's name, which Nix will append to the store path; see [`mkDerivation`](#sec-using-stdenv). + +`runLocal` (Boolean) +: If set to `true` this forces the derivation to be built locally, not using [substitutes] nor remote builds. + This is intended for very cheap commands (<1s execution time) which can be sped up by avoiding the network round-trip(s). + Its effect is to set [`preferLocalBuild = true`][preferLocalBuild] and [`allowSubstitutes = false`][allowSubstitutes]. + + ::: {.note} + This prevents the use of [substituters][substituter], so only set `runLocal` (or use `runCommandLocal`) when certain the user will + always have a builder for the `system` of the derivation. This should be true for most trivial use cases + (e.g., just copying some files to a different location or adding symlinks) because there the `system` + is usually the same as `builtins.currentSystem`. + ::: + +`stdenv` (Derivation) +: The [standard environment](#chap-stdenv) to use, defaulting to `pkgs.stdenv` + +`derivationArgs` (Attribute set) +: Additional arguments for [`mkDerivation`](#sec-using-stdenv). + +`buildCommand` (String) : Shell commands to run in the derivation builder. ::: {.note} You have to create a file or directory `$out` for Nix to be able to run the builder successfully. ::: +[allowSubstitutes]: https://nixos.org/nix/manual/#adv-attr-allowSubstitutes +[preferLocalBuild]: https://nixos.org/nix/manual/#adv-attr-preferLocalBuild +[substituter]: https://nix.dev/manual/nix/latest/glossary#gloss-substituter +[substitutes]: https://nix.dev/manual/nix/2.23/glossary#gloss-substitute + +::: {.example #ex-runcommandwith} +# Invocation of `runCommandWith` + +```nix +runCommandWith { + name = "example"; + derivationArgs.nativeBuildInputs = [ cowsay ]; +} '' + cowsay > $out < AttrSet -> String -> Derivation +runCommandCC :: String -> AttrSet -> String -> Derivation +runCommandLocal :: String -> AttrSet -> String -> Derivation +``` + +### Input {#trivial-builder-runCommand-Input} + +While the type signature(s) differ from [`runCommandWith`], individual arguments with the same name will have the same type and meaning: + +`name` (String) +: The derivation's name + +`derivationArgs` (Attribute set) +: Additional parameters passed to [`mkDerivation`] + +`buildCommand` (String) +: The command(s) run to build the derivation. + + ::: {.example #ex-runcommand-simple} # Invocation of `runCommand` ```nix -(import {}).runCommand "my-example" {} '' +runCommand "my-example" {} '' echo My example command is running mkdir $out @@ -49,18 +139,24 @@ By default `runCommand` runs in a stdenv with no compiler environment, whereas [ ``` ::: -## `runCommandCC` {#trivial-builder-runCommandCC} - -This works just like `runCommand`. The only difference is that it also provides a C compiler in `buildCommand`'s environment. To minimize your dependencies, you should only use this if you are sure you will need a C compiler as part of running your command. - -## `runCommandLocal` {#trivial-builder-runCommandLocal} - -Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network round-trip and can speed up a build. - ::: {.note} -This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g., just copying some files to a different location or adding symlinks) because there the `system` is usually the same as `builtins.currentSystem`. +`runCommand name derivationArgs buildCommand` is equivalent to +```nix +runCommandWith { + inherit name derivationArgs; + stdenv = stdenvNoCC; +} buildCommand +``` + +Likewise, `runCommandCC name derivationArgs buildCommand` is equivalent to +```nix +runCommandWith { + inherit name derivationArgs; +} buildCommand +``` ::: + ## Writing text files {#trivial-builder-text-writing} Nixpkgs provides the following functions for producing derivations which write text files or executable scripts into the Nix store. diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index ffca98cabced..5a9144792d19 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -232,6 +232,14 @@ To add a new plugin, run `nix-shell -p vimPluginsUpdater --run 'vim-plugins-upda Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `vimPluginsUpdater` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with Vim/Neovim. +### Plugin optional configuration {#vim-plugin-required-snippet} + +Some plugins require specific configuration to work. We choose not to +patch those plugins but expose the necessary configuration under +`PLUGIN.passthru.initLua` for neovim plugins. For instance, the `unicode-vim` plugin +needs the path towards a unicode database so we expose the following snippet `vim.g.Unicode_data_directory="${self.unicode-vim}/autoload/unicode"` under `vimPlugins.unicode-vim.passthru.initLua`. + + ## Updating plugins in nixpkgs {#updating-plugins-in-nixpkgs} Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token). diff --git a/doc/packages/build-support.md b/doc/packages/build-support.md new file mode 100644 index 000000000000..cf6a13384753 --- /dev/null +++ b/doc/packages/build-support.md @@ -0,0 +1,102 @@ +# Build Support {#sec-build-support} + +## `pkgs.substitute` {#pkgs-substitute} + +`pkgs.substitute` is a wrapper around [the `substitute` Bash function](#fun-substitute) in the standard environment. +It replaces strings in `src` as specified by the `substitutions` argument. + + +:::{.example #ex-pkgs-substitute} +# Usage of `pkgs.substitute` + +In a build script, the line: + +```bash +substitute $infile $outfile --replace-fail @foo@ ${foopkg}/bin/foo +``` + +is equivalent to: + +```nix +{ substitute, foopkg }: +substitute { + src = ./sourcefile.txt; + substitutions = [ + "--replace" + "@foo@" + "${foopkg}/bin/foo" + ]; +} +``` +::: + +## `pkgs.substituteAll` {#pkgs-substituteall} + +`pkgs.substituteAll` substitutes all instances of `@varName@` (`@`s included) in file `src` with the value of the corresponding environment variable. +As this uses the [`substituteAll`] (#fun-substitute) function, its limitations regarding variable names that will or will not be replaced also apply here. + +:::{.example #ex-pkgs-substituteAll} +# Usage of `pkgs.substituteAll` + +If `say-goodbye.sh` contains the following: + +```bash +#! @bash@/bin/bash + +echo @unchanged@ +@hello@/bin/hello --greeting @greeting@ +``` + +the following derivation will make substitutions to `@bash@`, `@hello@`, and `@greeting@`: + +```nix +{ + substituteAll, + bash, + hello, +}: +substituteAll { + src = ./say-goodbye.sh; + env = { + inherit bash hello; + greeting = "goodbye"; + }; +} +``` + +such that `$out` will result in something like the following: + +``` +#! /nix/store/s30jrpgav677fpc9yvkqsib70xfmx7xi-bash-5.2p26/bin/bash + +echo @unchanged@ +/nix/store/566f5isbvw014h7knmzmxa5l6hshx43k-hello-2.12.1/bin/hello --greeting goodbye +``` +::: + +## `pkgs.substituteAllFiles` {#pkgs-substituteallfiles} + +`pkgs.substituteAllFiles` replaces `@varName@` with the value of the environment variable `varName`. +It expects `src` to be a directory and requires a `files` argument that specifies which files will be subject to replacements; only these files will be placed in `$out`. + +As it also uses the `substituteAll` function, it is subject to the same limitations on environment variables as discussed in [pkgs.substituteAll](#pkgs-substituteall). + +:::{.example #ex-pkgs-substitute-all-files} +# Usage of `pkgs.substituteAllFiles` + +If the current directory contains `{foo,bar,baz}.txt` and the following `default.nix` + +```nix +{ substituteAllFiles }: +substituteAllFiles { + src = ./.; + files = [ + "foo.txt" + "bar.txt" + ]; + hello = "there"; +} +``` + +in the resulting derivation, every instance of `@hello@` will be replaced with `there` in `$out/foo.txt` and` `$out/bar.txt`; `baz.txt` will not be processed nor will it appear in `$out`. +::: diff --git a/doc/packages/index.md b/doc/packages/index.md index 69dd8c3b3bff..c5aa7dbfa0ee 100644 --- a/doc/packages/index.md +++ b/doc/packages/index.md @@ -27,4 +27,5 @@ urxvt.section.md vcpkg.section.md weechat.section.md xorg.section.md +build-support.md ``` diff --git a/lib/types.nix b/lib/types.nix index ae482eeef751..8b1d19ff2c61 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -219,7 +219,7 @@ rec { else "(${t.description})"; # When adding new types don't forget to document them in - # nixos/doc/manual/development/option-types.xml! + # nixos/doc/manual/development/option-types.section.md! types = rec { raw = mkOptionType { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index caf93f53b7e8..349b6d2a9f3f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -212,6 +212,12 @@ githubId = 882455; name = "Elliot Cameron"; }; + _404wolf = { + email = "wolfmermelstein@gmail.com"; + github = "404wolf"; + githubId = 108041238; + name = "Wolf Mermelstein"; + }; _414owen = { email = "owen@owen.cafe"; github = "414owen"; @@ -828,6 +834,12 @@ githubId = 20405311; name = "Aksh Gupta"; }; + aksiksi = { + email = "assil@ksiksi.net"; + github = "aksiksi"; + githubId = 916621; + name = "Assil Ksiksi"; + }; akssri = { email = "akssri@vakra.xyz"; github = "akssri"; @@ -963,6 +975,12 @@ matrix = "@alexshpilkin:matrix.org"; name = "Alexander Shpilkin"; }; + AlexSKaye = { + email = "AlexSKaye@proton.me"; + github = "AlexSKaye"; + githubId = 3017212; + name = "Alex S. Kaye"; + }; alexvorobiev = { email = "alexander.vorobiev@gmail.com"; github = "alexvorobiev"; @@ -1887,7 +1905,7 @@ keys = [ { fingerprint = "BF47 81E1 F304 1ADF 18CE C401 DE16 C7D1 536D A72F"; } ]; }; astronaut0212 = { - email = "goatastronaut0212@proton.me"; + email = "goatastronaut0212@outlook.com"; github = "goatastronaut0212"; githubId = 119769817; name = "goatastronaut0212"; @@ -2702,6 +2720,14 @@ githubId = 5700358; name = "Thomas Blank"; }; + bleetube = { + email = "git@blee.tube"; + matrix = "@blee:satstack.cloud"; + name = "Brian Lee"; + github = "bleetube"; + githubId = 77934086; + keys = [ { fingerprint = "4CA3 48F6 8FE1 1777 8EDA 3860 B9A2 C1B0 25EC 2C55"; } ]; + }; blinry = { name = "blinry"; email = "mail@blinry.org"; @@ -3423,6 +3449,12 @@ githubId = 977929; name = "Cody Allen"; }; + Celibistrial = { + email = "ryan80222@gmail.com"; + github = "Celibistrial"; + githubId = 82810795; + name = "Gaurav Choudhury"; + }; centromere = { email = "nix@centromere.net"; github = "centromere"; @@ -5634,7 +5666,7 @@ matrix = "@e1mo:chaos.jetzt"; github = "e1mo"; githubId = 61651268; - name = "Moritz Fromm"; + name = "Nina Fromm"; keys = [ { fingerprint = "67BE E563 43B6 420D 550E DF2A 6D61 7FD0 A85B AADA"; } ]; }; eadwu = { @@ -7671,6 +7703,12 @@ githubId = 1621335; name = "Andrew Trachenko"; }; + gordon-bp = { + email = "gordy@hanakano.com"; + github = "Gordon-BP"; + githubId = 77560236; + name = "Gordon Clark"; + }; gotcha = { email = "gotcha@bubblenet.be"; github = "gotcha"; @@ -8559,6 +8597,11 @@ name = "Iago Manoel Brito"; keys = [ { fingerprint = "DF90 9D58 BEE4 E73A 1B8C 5AF3 35D3 9F9A 9A1B C8DA"; } ]; }; + i-al-istannen = { + name = "I Al Istannen"; + github = "I-Al-Istannen"; + githubId = 20284688; + }; iammrinal0 = { email = "nixpkgs@mrinalpurohit.in"; matrix = "@iammrinal0:nixos.dev"; @@ -8687,6 +8730,12 @@ githubId = 7481521; name = "Balázs Lengyel"; }; + ilaumjd = { + email = "ilaumjd@gmail.com"; + github = "ilaumjd"; + githubId = 16514431; + name = "Ilham AM"; + }; ilian = { email = "ilian@tuta.io"; github = "ilian"; @@ -10097,6 +10146,12 @@ githubId = 15893072; name = "Josh van Leeuwen"; }; + jovandeginste = { + email = "jo.vandeginste@gmail.com"; + github = "jovandeginste"; + githubId = 3170771; + name = "Jo Vandeginste"; + }; jpagex = { name = "Jérémy Pagé"; email = "contact@jeremypage.me"; @@ -14429,6 +14484,12 @@ githubId = 2287221; name = "Andreas Zweili"; }; + nebunebu = { + email = "neb.nebuchadnezzar@gmail.com"; + github = "nebunebu"; + githubId = 87451010; + name = "nebu"; + }; Necior = { email = "adrian@sadlocha.eu"; github = "Necior"; @@ -15157,6 +15218,12 @@ githubId = 61095988; name = "Brian Shu"; }; + oberth-effect = { + email = "stepan.venclik@gmail.com"; + github = "oberth-effect"; + githubId = 88210794; + name = "Štěpán Venclík"; + }; obfusk = { email = "flx@obfusk.net"; matrix = "@obfusk:matrix.org"; @@ -15210,6 +15277,12 @@ githubId = 7397786; name = "Odysseas Georgoudis"; }; + ofalvai = { + email = "ofalvai@gmail.com"; + github = "ofalvai"; + githubId = 1694986; + name = "Olivér Falvai"; + }; ofek = { email = "oss@ofek.dev"; github = "ofek"; @@ -15463,6 +15536,12 @@ github = "OlivierNicole"; githubId = 14031333; }; + ottoblep = { + name = "Severin Lochschmidt"; + email = "seviron53@gmail.com"; + github = "ottoblep"; + githubId = 57066925; + }; otwieracz = { email = "slawek@otwiera.cz"; github = "otwieracz"; @@ -17103,11 +17182,11 @@ name = "Szymon Scholz"; }; ratcornu = { - email = "ratcornu@skaven.org"; + email = "ratcornu+programmation@skaven.org"; github = "RatCornu"; githubId = 98173832; name = "Balthazar Patiachvili"; - matrix = "@ratcornu:skweel.skaven.org"; + matrix = "@ratcornu:skaven.org"; keys = [ { fingerprint = "1B91 F087 3D06 1319 D3D0 7F91 FA47 BDA2 6048 9ADA"; } ]; }; ratsclub = { @@ -17182,6 +17261,12 @@ githubId = 52847440; name = "Ryan Burns"; }; + rcmlz = { + email = "haguga-nixos@yahoo.com"; + github = "rcmlz"; + githubId = 19784049; + name = "rcmlz"; + }; rcoeurjoly = { email = "rolandcoeurjoly@gmail.com"; github = "RCoeurjoly"; @@ -18545,6 +18630,12 @@ githubId = 17243347; name = "Sebastian Sellmeier"; }; + sedlund = { + email = "scott+nixpkgs@teraton.com"; + github = "sedlund"; + githubId = 8109138; + name = "Scott Edlund"; + }; sefidel = { name = "sefidel"; email = "contact@sefidel.net"; diff --git a/maintainers/scripts/kde/collect-missing-deps.py b/maintainers/scripts/kde/collect-missing-deps.py index 3ec1411986c8..aec2c29588f0 100755 --- a/maintainers/scripts/kde/collect-missing-deps.py +++ b/maintainers/scripts/kde/collect-missing-deps.py @@ -73,6 +73,9 @@ OK_MISSING_BY_PACKAGE = { "kwin": { "display-info", # newer versions identify as libdisplay-info }, + "libksysguard": { + "Libcap", # used to call setcap at build time and nothing else + }, "mlt": { "Qt5", # intentionally disabled "SWIG", @@ -88,6 +91,9 @@ OK_MISSING_BY_PACKAGE = { "powerdevil": { "DDCUtil", # cursed, intentionally disabled }, + "print-manager": { + "PackageKitQt6", # used for auto-installing drivers which does not work for obvious reasons + }, "pulseaudio-qt": { "Qt6Qml", # tests only "Qt6Quick", diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 643528348ca8..8ad34173bb0d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -104,6 +104,7 @@ luv,,,,1.48.0-2,, lush.nvim,,,https://luarocks.org/dev,,,teto lyaml,,,,,,lblasc lz.n,,,,,,mrcjkb +lzn-auto-require,,,,,,mrcjkb magick,,,,,5.1,donovanglover markdown,,,,,, mediator_lua,,,,,, diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 2b68d876100c..6b380c5023d4 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -61,6 +61,8 @@ - [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). +- [Pingvin Share](https://github.com/stonith404/pingvin-share), a self-hosted file sharing platform and an alternative for WeTransfer. Available as [services.pingvin-share](#opt-services.pingvin-share.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). - [Localsend](https://localsend.org/), an open source cross-platform alternative to AirDrop. Available as [programs.localsend](#opt-programs.localsend.enable). @@ -73,6 +75,8 @@ - [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld). +- [MenhirLib](https://gitlab.inria.fr/fpottier/menhir/-/tree/master/coq-menhirlib) A support library for verified Coq parsers produced by Menhir. + - [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). - [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](option.html#opt-services.tika). @@ -87,6 +91,9 @@ - [Proton Mail bridge](https://proton.me/mail/bridge), a desktop application that runs in the background, encrypting and decrypting messages as they enter and leave your computer. It lets you add your Proton Mail account to your favorite email client via IMAP/SMTP by creating a local email server on your computer. +- [chromadb](https://www.trychroma.com/), an open-source AI application + database. Batteries included. Available as [services.chromadb](options.html#opt-services.chromadb.enable). + ## 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: @@ -253,6 +260,8 @@ - `/share/nano` is now only linked when `programs.nano.enable` is enabled. +- PPD files for Utax printers got renamed (spaces replaced by underscores) in newest `foomatic-db` package; users of Utax printers might need to adapt their `hardware.printers.ensurePrinters.*.model` value. + - `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 @@ -319,6 +328,12 @@ - The `services.trust-dns` module has been renamed to `services.hickory-dns`. +- The `lsh` package and the `services.lshd` module have been removed as they had no maintainer in Nixpkgs and hadn’t seen an upstream release in over a decade. It is recommended to migrate to `openssh` and `services.openssh`. + +- `opencv2` and `opencv3` have been removed, as they are obsolete and + were not used by any other package. External users are encouraged to + migrate to OpenCV 4. + ## Other Notable Changes {#sec-release-24.11-notable-changes} @@ -383,9 +398,6 @@ - `nix.channel.enable = false` no longer implies `nix.settings.nix-path = []`. Since Nix 2.13, a `nix-path` set in `nix.conf` cannot be overriden by the `NIX_PATH` configuration variable. -- Buildkite Agents are now each running in their own private `/tmp`. - To return to the old behaviour, set `systemd.services.buildkite-agent-${name}.serviceConfig.PrivateTmp = false;`. - ## Detailed migration information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b6fd67d206ca..cf79c8b4792b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -458,6 +458,7 @@ ./services/continuous-integration/woodpecker/server.nix ./services/databases/aerospike.nix ./services/databases/cassandra.nix + ./services/databases/chromadb.nix ./services/databases/clickhouse.nix ./services/databases/cockroachdb.nix ./services/databases/couchdb.nix @@ -1208,7 +1209,6 @@ ./services/networking/spacecookie.nix ./services/networking/spiped.nix ./services/networking/squid.nix - ./services/networking/ssh/lshd.nix ./services/networking/ssh/sshd.nix ./services/networking/sslh.nix ./services/networking/strongswan-swanctl/module.nix @@ -1467,6 +1467,7 @@ ./services/web-apps/phylactery.nix ./services/web-apps/photoprism.nix ./services/web-apps/pict-rs.nix + ./services/web-apps/pingvin-share.nix ./services/web-apps/plantuml-server.nix ./services/web-apps/plausible.nix ./services/web-apps/powerdns-admin.nix diff --git a/nixos/modules/profiles/perlless.nix b/nixos/modules/profiles/perlless.nix index 6257589ef9eb..f34c3d2d210b 100644 --- a/nixos/modules/profiles/perlless.nix +++ b/nixos/modules/profiles/perlless.nix @@ -1,8 +1,4 @@ -# WARNING: If you enable this profile, you will NOT be able to switch to a new -# configuration and thus you will not be able to rebuild your system with -# nixos-rebuild! - -{ lib, ... }: +{ lib, pkgs, ... }: { @@ -31,4 +27,8 @@ # string "perl". system.forbiddenDependenciesRegexes = ["perl"]; + # Re-add nixos-rebuild to the systemPackages that was removed by the + # `system.disableInstallerTools` option. + environment.systemPackages = [pkgs.nixos-rebuild]; + } diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index df6090e41d7d..374d127198d0 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -70,6 +70,7 @@ in (mkRemovedOptionModule [ "services" "hydron" ] "The `services.hydron` module has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability.") (mkRemovedOptionModule [ "services" "ihatemoney" ] "The ihatemoney module has been removed for lack of downstream maintainer") (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "lshd" ] "The corresponding package was removed from nixpkgs as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decades.") (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed") diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 4f891021a7de..2ff08cbfde81 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1,45 +1,41 @@ # This module provides configuration for the PAM (Pluggable # Authentication Modules) system. - { config, lib, pkgs, ... }: - -with lib; - let - moduleSettingsType = with types; attrsOf (nullOr (oneOf [ bool str int pathInStore ])); + moduleSettingsType = with lib.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 { + mkRulesTypeOption = type: lib.mkOption { # These options are experimental and subject to breaking changes without notice. description = '' PAM `${type}` rules for this service. Attribute keys are the name of each rule. ''; - type = types.attrsOf (types.submodule ({ name, config, ... }: { + type = lib.types.attrsOf (lib.types.submodule ({ name, config, ... }: { options = { - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; description = '' Name of this rule. ''; internal = true; readOnly = true; }; - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether this rule is added to the PAM service config file. ''; }; - order = mkOption { - type = types.int; + order = lib.mkOption { + type = lib.types.int; description = '' Order of this rule in the service file. Rules are arranged in ascending order of this value. @@ -55,20 +51,20 @@ let ::: ''; }; - control = mkOption { - type = types.str; + control = lib.mkOption { + type = lib.types.str; description = '' Indicates the behavior of the PAM-API should the module fail to succeed in its authentication task. See `control` in {manpage}`pam.conf(5)` for details. ''; }; - modulePath = mkOption { - type = types.str; + modulePath = lib.mkOption { + type = lib.types.str; description = '' Either the full filename of the PAM to be used by the application (it begins with a '/'), or a relative pathname from the default module location. See `module-path` in {manpage}`pam.conf(5)` for details. ''; }; - args = mkOption { - type = types.listOf types.str; + args = lib.mkOption { + type = lib.types.listOf lib.types.str; description = '' Tokens that can be used to modify the specific behavior of the given PAM. Such arguments will be documented for each individual module. See `module-arguments` in {manpage}`pam.conf(5)` for details. @@ -77,7 +73,7 @@ let {option}`settings` are automatically added as {option}`args`. It's recommended to use the {option}`settings` option whenever possible so that arguments can be overridden. ''; }; - settings = mkOption { + settings = lib.mkOption { type = moduleSettingsType; default = {}; description = '' @@ -90,10 +86,10 @@ let config = { inherit name; # Formats an attrset of settings as args for use as `module-arguments`. - args = concatLists (flip mapAttrsToList config.settings (name: value: - if isBool value - then optional value name - else optional (value != null) "${name}=${toString value}" + args = lib.concatLists (lib.flip lib.mapAttrsToList config.settings (name: value: + if lib.isBool value + then lib.optional value name + else lib.optional (value != null) "${name}=${toString value}" )); }; })); @@ -110,13 +106,13 @@ let options = { - name = mkOption { + name = lib.mkOption { example = "sshd"; - type = types.str; + type = lib.types.str; description = "Name of the PAM service."; }; - rules = mkOption { + rules = lib.mkOption { # This option is experimental and subject to breaking changes without notice. visible = false; @@ -133,33 +129,33 @@ let You may freely use this option within `nixpkgs`, and future changes will account for those use sites. ::: ''; - type = types.submodule { - options = genAttrs [ "account" "auth" "password" "session" ] mkRulesTypeOption; + type = lib.types.submodule { + options = lib.genAttrs [ "account" "auth" "password" "session" ] mkRulesTypeOption; }; }; - unixAuth = mkOption { + unixAuth = lib.mkOption { default = true; - type = types.bool; + type = lib.types.bool; description = '' Whether users can log in with passwords defined in {file}`/etc/shadow`. ''; }; - rootOK = mkOption { + rootOK = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If set, root doesn't need to authenticate (e.g. for the {command}`useradd` service). ''; }; - p11Auth = mkOption { + p11Auth = lib.mkOption { default = config.security.pam.p11.enable; - defaultText = literalExpression "config.security.pam.p11.enable"; - type = types.bool; + defaultText = lib.literalExpression "config.security.pam.p11.enable"; + type = lib.types.bool; description = '' If set, keys listed in {file}`~/.ssh/authorized_keys` and @@ -168,10 +164,10 @@ let ''; }; - u2fAuth = mkOption { + u2fAuth = lib.mkOption { default = config.security.pam.u2f.enable; - defaultText = literalExpression "config.security.pam.u2f.enable"; - type = types.bool; + defaultText = lib.literalExpression "config.security.pam.u2f.enable"; + type = lib.types.bool; description = '' If set, users listed in {file}`$XDG_CONFIG_HOME/Yubico/u2f_keys` (or @@ -181,9 +177,9 @@ let ''; }; - usshAuth = mkOption { + usshAuth = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If set, users with an SSH certificate containing an authorized principal in their SSH agent are able to log in. Specific options are controlled @@ -194,10 +190,10 @@ let ''; }; - yubicoAuth = mkOption { + yubicoAuth = lib.mkOption { default = config.security.pam.yubico.enable; - defaultText = literalExpression "config.security.pam.yubico.enable"; - type = types.bool; + defaultText = lib.literalExpression "config.security.pam.yubico.enable"; + type = lib.types.bool; description = '' If set, users listed in {file}`~/.yubico/authorized_yubikeys` @@ -206,9 +202,9 @@ let }; googleAuthenticator = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If set, users with enabled Google Authenticator (created {file}`~/.google_authenticator`) will be required @@ -217,19 +213,19 @@ let }; }; - otpwAuth = mkOption { + otpwAuth = lib.mkOption { default = config.security.pam.enableOTPW; - defaultText = literalExpression "config.security.pam.enableOTPW"; - type = types.bool; + defaultText = lib.literalExpression "config.security.pam.enableOTPW"; + type = lib.types.bool; description = '' If set, the OTPW system will be used (if {file}`~/.otpw` exists). ''; }; - googleOsLoginAccountVerification = mkOption { + googleOsLoginAccountVerification = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If set, will use the Google OS Login PAM modules (`pam_oslogin_login`, @@ -240,9 +236,9 @@ let ''; }; - googleOsLoginAuthentication = mkOption { + googleOsLoginAuthentication = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If set, will use the `pam_oslogin_login`'s user authentication methods to authenticate users using 2FA. @@ -251,38 +247,38 @@ let ''; }; - mysqlAuth = mkOption { + mysqlAuth = lib.mkOption { default = config.users.mysql.enable; - defaultText = literalExpression "config.users.mysql.enable"; - type = types.bool; + defaultText = lib.literalExpression "config.users.mysql.enable"; + type = lib.types.bool; description = '' If set, the `pam_mysql` module will be used to authenticate users against a MySQL/MariaDB database. ''; }; - fprintAuth = mkOption { + fprintAuth = lib.mkOption { default = config.services.fprintd.enable; - defaultText = literalExpression "config.services.fprintd.enable"; - type = types.bool; + defaultText = lib.literalExpression "config.services.fprintd.enable"; + type = lib.types.bool; description = '' If set, fingerprint reader will be used (if exists and your fingerprints are enrolled). ''; }; - oathAuth = mkOption { + oathAuth = lib.mkOption { default = config.security.pam.oath.enable; - defaultText = literalExpression "config.security.pam.oath.enable"; - type = types.bool; + defaultText = lib.literalExpression "config.security.pam.oath.enable"; + type = lib.types.bool; description = '' If set, the OATH Toolkit will be used. ''; }; - sshAgentAuth = mkOption { + sshAgentAuth = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If set, the calling user's SSH agent is used to authenticate against the keys in the calling user's @@ -292,9 +288,9 @@ let }; duoSecurity = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If set, use the Duo Security pam module `pam_duo` for authentication. Requires @@ -303,9 +299,9 @@ let }; }; - startSession = mkOption { + startSession = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If set, the service will register a new session with systemd's login manager. For local sessions, this will give @@ -315,8 +311,8 @@ let ''; }; - setEnvironment = mkOption { - type = types.bool; + setEnvironment = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether the service should set the environment variables @@ -325,8 +321,8 @@ let ''; }; - setLoginUid = mkOption { - type = types.bool; + setLoginUid = lib.mkOption { + type = lib.types.bool; description = '' Set the login uid of the process ({file}`/proc/self/loginuid`) for auditing @@ -337,16 +333,16 @@ let }; ttyAudit = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable or disable TTY auditing for specified users ''; }; - enablePattern = mkOption { - type = types.nullOr types.str; + enablePattern = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' For each user matching one of comma-separated @@ -354,8 +350,8 @@ let ''; }; - disablePattern = mkOption { - type = types.nullOr types.str; + disablePattern = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' For each user matching one of comma-separated @@ -363,8 +359,8 @@ let ''; }; - openOnly = mkOption { - type = types.bool; + openOnly = lib.mkOption { + type = lib.types.bool; default = false; description = '' Set the TTY audit flag when opening the session, @@ -376,9 +372,9 @@ let }; }; - forwardXAuth = mkOption { + forwardXAuth = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether X authentication keys should be passed from the calling user to the target user (e.g. for @@ -386,18 +382,18 @@ let ''; }; - pamMount = mkOption { + pamMount = lib.mkOption { default = config.security.pam.mount.enable; - defaultText = literalExpression "config.security.pam.mount.enable"; - type = types.bool; + defaultText = lib.literalExpression "config.security.pam.mount.enable"; + type = lib.types.bool; description = '' Enable PAM mount (pam_mount) system to mount filesystems on user login. ''; }; - allowNullPassword = mkOption { + allowNullPassword = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to allow logging into accounts that have no password set (i.e., have an empty password field in @@ -410,23 +406,23 @@ let ''; }; - nodelay = mkOption { + nodelay = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether the delay after typing a wrong password should be disabled. ''; }; - requireWheel = mkOption { + requireWheel = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to permit root access only to members of group wheel. ''; }; - limits = mkOption { + limits = lib.mkOption { default = []; type = limitsType; description = '' @@ -436,15 +432,15 @@ let ''; }; - showMotd = mkOption { + showMotd = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "Whether to show the message of the day."; }; - makeHomeDir = mkOption { + makeHomeDir = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to try to create home directories for users with `$HOME`s pointing to nonexistent @@ -452,21 +448,21 @@ let ''; }; - updateWtmp = mkOption { + updateWtmp = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "Whether to update {file}`/var/log/wtmp`."; }; - logFailures = mkOption { + logFailures = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "Whether to log authentication failures in {file}`/var/log/faillog`."; }; - enableAppArmor = mkOption { + enableAppArmor = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Enable support for attaching AppArmor profiles at the user/group level, e.g., as part of a role based access @@ -475,9 +471,9 @@ let }; kwallet = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If enabled, pam_wallet will attempt to automatically unlock the user's default KDE wallet upon login. If the user has no wallet named @@ -486,11 +482,11 @@ let ''; }; - package = mkPackageOption pkgs.plasma5Packages "kwallet-pam" { + package = lib.mkPackageOption pkgs.plasma5Packages "kwallet-pam" { pkgsText = "pkgs.plasma5Packages"; }; - forceRun = mkEnableOption null // { + forceRun = lib.mkEnableOption null // { description = '' The `force_run` option is used to tell the PAM module for KWallet to forcefully run even if no graphical session (such as a GUI @@ -503,15 +499,15 @@ let }; }; - sssdStrictAccess = mkOption { + sssdStrictAccess = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "enforce sssd access control"; }; - enableGnomeKeyring = mkOption { + enableGnomeKeyring = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' If enabled, pam_gnome_keyring will attempt to automatically unlock the user's default Gnome keyring upon login. If the user login password does @@ -521,8 +517,8 @@ let }; failDelay = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' If enabled, this will replace the `FAIL_DELAY` setting from `login.defs`. @@ -530,17 +526,17 @@ let ''; }; - delay = mkOption { + delay = lib.mkOption { default = 3000000; - type = types.int; + type = lib.types.int; example = 1000000; description = "The delay time (in microseconds) on failure."; }; }; gnupg = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' If enabled, pam_gnupg will attempt to automatically unlock the @@ -554,8 +550,8 @@ let ''; }; - noAutostart = mkOption { - type = types.bool; + noAutostart = lib.mkOption { + type = lib.types.bool; default = false; description = '' Don't start {command}`gpg-agent` if it is not running. @@ -564,8 +560,8 @@ let ''; }; - storeOnly = mkOption { - type = types.bool; + storeOnly = lib.mkOption { + type = lib.types.bool; default = false; description = '' Don't send the password immediately after login, but store for PAM @@ -574,17 +570,17 @@ let }; }; - zfs = mkOption { + zfs = lib.mkOption { default = config.security.pam.zfs.enable; - defaultText = literalExpression "config.security.pam.zfs.enable"; - type = types.bool; + defaultText = lib.literalExpression "config.security.pam.zfs.enable"; + type = lib.types.bool; description = '' Enable unlocking and mounting of encrypted ZFS home dataset at login. ''; }; - text = mkOption { - type = types.nullOr types.lines; + text = lib.mkOption { + type = lib.types.nullOr lib.types.lines; description = "Contents of the PAM service file."; }; @@ -594,34 +590,34 @@ let # nixos/tests/pam/pam-file-contents.nix. Please update tests there when # changing the derivation. config = { - name = mkDefault name; - setLoginUid = mkDefault cfg.startSession; - limits = mkDefault config.security.pam.loginLimits; + name = lib.mkDefault name; + setLoginUid = lib.mkDefault cfg.startSession; + limits = lib.mkDefault config.security.pam.loginLimits; text = let ensureUniqueOrder = type: rules: let - checkPair = a: b: assert assertMsg (a.order != b.order) "security.pam.services.${name}.rules.${type}: rules '${a.name}' and '${b.name}' cannot have the same order value (${toString a.order})"; b; - checked = zipListsWith checkPair rules (drop 1 rules); - in take 1 rules ++ checked; + checkPair = a: b: assert lib.assertMsg (a.order != b.order) "security.pam.services.${name}.rules.${type}: rules '${a.name}' and '${b.name}' cannot have the same order value (${toString a.order})"; b; + checked = lib.zipListsWith checkPair rules (lib.drop 1 rules); + in lib.take 1 rules ++ checked; # Formats a string for use in `module-arguments`. See `man pam.conf`. formatModuleArgument = token: - if hasInfix " " token - then "[${replaceStrings ["]"] ["\\]"] token}]" + if lib.hasInfix " " token + then "[${lib.replaceStrings ["]"] ["\\]"] token}]" else token; - formatRules = type: pipe cfg.rules.${type} [ - attrValues - (filter (rule: rule.enable)) - (sort (a: b: a.order < b.order)) + formatRules = type: lib.pipe cfg.rules.${type} [ + lib.attrValues + (lib.filter (rule: rule.enable)) + (lib.sort (a: b: a.order < b.order)) (ensureUniqueOrder type) - (map (rule: concatStringsSep " " ( + (map (rule: lib.concatStringsSep " " ( [ type rule.control rule.modulePath ] ++ map formatModuleArgument rule.args ++ [ "# ${rule.name} (order ${toString rule.order})" ] ))) - (concatStringsSep "\n") + (lib.concatStringsSep "\n") ]; - in mkDefault '' + in lib.mkDefault '' # Account management. ${formatRules "account"} @@ -639,10 +635,10 @@ let # Samba stuff to the Samba module. This requires that the PAM # module provides the right hooks. rules = let - autoOrderRules = flip pipe [ - (imap1 (index: rule: rule // { order = mkDefault (10000 + index * 100); } )) - (map (rule: nameValuePair rule.name (removeAttrs rule [ "name" ]))) - listToAttrs + autoOrderRules = lib.flip lib.pipe [ + (lib.imap1 (index: rule: rule // { order = lib.mkDefault (10000 + index * 100); } )) + (map (rule: lib.nameValuePair rule.name (removeAttrs rule [ "name" ]))) + lib.listToAttrs ]; in { account = autoOrderRules [ @@ -694,7 +690,7 @@ let (let yubi = config.security.pam.yubico; in { name = "yubico"; enable = cfg.yubicoAuth; control = yubi.control; modulePath = "${pkgs.yubico-pam}/lib/security/pam_yubico.so"; settings = { inherit (yubi) mode debug; chalresp_path = yubi.challengeResponsePath; - id = mkIf (yubi.mode == "client") yubi.id; + id = lib.mkIf (yubi.mode == "client") yubi.id; }; }) (let dp9ik = config.security.pam.dp9ik; in { name = "p9"; enable = dp9ik.enable; control = dp9ik.control; modulePath = "${pkgs.pam_dp9ik}/lib/security/pam_p9.so"; args = [ dp9ik.authserver @@ -709,7 +705,7 @@ let # We use try_first_pass the second time to avoid prompting password twice. # # The same principle applies to systemd-homed - (optionals ((cfg.unixAuth || config.services.homed.enable) && + (lib.optionals ((cfg.unixAuth || config.services.homed.enable) && (config.security.pam.enableEcryptfs || config.security.pam.enableFscrypt || cfg.pamMount @@ -896,25 +892,25 @@ let # Create a limits.conf(5) file. makeLimitsConf = limits: pkgs.writeText "limits.conf" - (concatMapStrings ({ domain, type, item, value }: + (lib.concatMapStrings ({ domain, type, item, value }: "${domain} ${type} ${item} ${toString value}\n") limits); limitsType = with lib.types; listOf (submodule ({ ... }: { options = { - domain = mkOption { + domain = lib.mkOption { description = "Username, groupname, or wildcard this limit applies to"; example = "@wheel"; type = str; }; - type = mkOption { + type = lib.mkOption { description = "Type of this limit"; type = enum [ "-" "hard" "soft" ]; default = "-"; }; - item = mkOption { + item = lib.mkOption { description = "Item this limit applies to"; type = enum [ "core" @@ -938,7 +934,7 @@ let ]; }; - value = mkOption { + value = lib.mkOption { description = "Value of this limit"; type = oneOf [ str int ]; }; @@ -954,7 +950,7 @@ let value.source = pkgs.writeText "${name}.pam" service.text; }; - optionalSudoConfigForSSHAgentAuth = optionalString config.security.pam.sshAgentAuth.enable '' + optionalSudoConfigForSSHAgentAuth = lib.optionalString config.security.pam.sshAgentAuth.enable '' # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. Defaults env_keep+=SSH_AUTH_SOCK ''; @@ -963,26 +959,26 @@ in { - meta.maintainers = [ maintainers.majiir ]; + meta.maintainers = [ lib.maintainers.majiir ]; 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" ]) + (lib.mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ]) + (lib.mkRenamedOptionModule [ "security" "pam" "enableSSHAgentAuth" ] [ "security" "pam" "sshAgentAuth" "enable" ]) + (lib.mkRenamedOptionModule [ "security" "pam" "u2f" "authFile" ] [ "security" "pam" "u2f" "settings" "authfile" ]) + (lib.mkRenamedOptionModule [ "security" "pam" "u2f" "appId" ] [ "security" "pam" "u2f" "settings" "appid" ]) + (lib.mkRenamedOptionModule [ "security" "pam" "u2f" "origin" ] [ "security" "pam" "u2f" "settings" "origin" ]) + (lib.mkRenamedOptionModule [ "security" "pam" "u2f" "debug" ] [ "security" "pam" "u2f" "settings" "debug" ]) + (lib.mkRenamedOptionModule [ "security" "pam" "u2f" "interactive" ] [ "security" "pam" "u2f" "settings" "interactive" ]) + (lib.mkRenamedOptionModule [ "security" "pam" "u2f" "cue" ] [ "security" "pam" "u2f" "settings" "cue" ]) ]; ###### interface options = { - security.pam.package = mkPackageOption pkgs "pam" { }; + security.pam.package = lib.mkPackageOption pkgs "pam" { }; - security.pam.loginLimits = mkOption { + security.pam.loginLimits = lib.mkOption { default = []; type = limitsType; example = @@ -1012,9 +1008,9 @@ in ''; }; - security.pam.services = mkOption { + security.pam.services = lib.mkOption { default = {}; - type = with types; attrsOf (submodule pamOpts); + type = with lib.types; attrsOf (submodule pamOpts); description = '' This option defines the PAM services. A service typically corresponds to a program that uses PAM, @@ -1024,8 +1020,8 @@ in ''; }; - security.pam.makeHomeDir.skelDirectory = mkOption { - type = types.str; + security.pam.makeHomeDir.skelDirectory = lib.mkOption { + type = lib.types.str; default = "/var/empty"; example = "/etc/skel"; description = '' @@ -1034,8 +1030,8 @@ in ''; }; - security.pam.makeHomeDir.umask = mkOption { - type = types.str; + security.pam.makeHomeDir.umask = lib.mkOption { + type = lib.types.str; default = "0077"; example = "0022"; description = '' @@ -1045,13 +1041,13 @@ in }; security.pam.sshAgentAuth = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' authenticating using a signature performed by the ssh-agent. This allows using SSH keys exclusively, instead of passwords, for instance on remote machines ''; - authorizedKeysFiles = mkOption { - type = with types; listOf str; + authorizedKeysFiles = lib.mkOption { + type = with lib.types; listOf str; description = '' A list of paths to files in OpenSSH's `authorized_keys` format, containing the keys that will be trusted by the `pam_ssh_agent_auth` module. @@ -1072,25 +1068,25 @@ in }; }; - security.pam.enableOTPW = mkEnableOption "the OTPW (one-time password) PAM module"; + security.pam.enableOTPW = lib.mkEnableOption "the OTPW (one-time password) PAM module"; security.pam.dp9ik = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' the dp9ik pam module provided by tlsclient. If set, users can be authenticated against the 9front authentication server given in {option}`security.pam.dp9ik.authserver` ''; - control = mkOption { + control = lib.mkOption { default = "sufficient"; - type = types.str; + type = lib.types.str; description = '' This option sets the pam "control" used for this module. ''; }; - authserver = mkOption { + authserver = lib.mkOption { default = null; - type = with types; nullOr str; + type = with lib.types; nullOr str; description = '' This controls the hostname for the 9front authentication server that users will be authenticated against. @@ -1099,10 +1095,10 @@ in }; security.pam.krb5 = { - enable = mkOption { + enable = lib.mkOption { default = config.security.krb5.enable; - defaultText = literalExpression "config.security.krb5.enable"; - type = types.bool; + defaultText = lib.literalExpression "config.security.krb5.enable"; + type = lib.types.bool; description = '' Enables Kerberos PAM modules (`pam-krb5`, `pam-ccreds`). @@ -1119,9 +1115,9 @@ in }; security.pam.p11 = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Enables P11 PAM (`pam_p11`) module. @@ -1131,9 +1127,9 @@ in ''; }; - control = mkOption { + control = lib.mkOption { default = "sufficient"; - type = types.enum [ "required" "requisite" "sufficient" "optional" ]; + type = lib.types.enum [ "required" "requisite" "sufficient" "lib.optional" ]; description = '' This option sets pam "control". If you want to have multi factor authentication, use "required". @@ -1148,9 +1144,9 @@ in }; security.pam.u2f = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Enables U2F PAM (`pam-u2f`) module. @@ -1168,9 +1164,9 @@ in ''; }; - control = mkOption { + control = lib.mkOption { default = "sufficient"; - type = types.enum [ "required" "requisite" "sufficient" "optional" ]; + type = lib.types.enum [ "required" "requisite" "sufficient" "optional" ]; description = '' This option sets pam "control". If you want to have multi factor authentication, use "required". @@ -1182,14 +1178,14 @@ in ''; }; - settings = mkOption { - type = types.submodule { + settings = lib.mkOption { + type = lib.types.submodule { freeformType = moduleSettingsType; options = { - authfile = mkOption { + authfile = lib.mkOption { default = null; - type = with types; nullOr path; + type = with lib.types; nullOr path; description = '' By default `pam-u2f` module reads the keys from {file}`$XDG_CONFIG_HOME/Yubico/u2f_keys` (or @@ -1208,9 +1204,9 @@ in ''; }; - appid = mkOption { + appid = lib.mkOption { default = null; - type = with types; nullOr str; + type = with lib.types; nullOr str; description = '' By default `pam-u2f` module sets the application ID to `pam://$HOSTNAME`. @@ -1222,9 +1218,9 @@ in ''; }; - origin = mkOption { + origin = lib.mkOption { default = null; - type = with types; nullOr str; + type = with lib.types; nullOr str; description = '' By default `pam-u2f` module sets the origin to `pam://$HOSTNAME`. @@ -1238,26 +1234,26 @@ in ''; }; - debug = mkOption { + debug = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Debug output to stderr. ''; }; - interactive = mkOption { + interactive = lib.mkOption { default = false; - type = types.bool; + type = lib.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 { + cue = lib.mkOption { default = false; - type = types.bool; + type = lib.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. @@ -1285,9 +1281,9 @@ in }; security.pam.ussh = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Enables Uber's USSH PAM (`pam-ussh`) module. @@ -1302,9 +1298,9 @@ in ''; }; - caFile = mkOption { + caFile = lib.mkOption { default = null; - type = with types; nullOr path; + type = with lib.types; nullOr path; description = '' By default `pam-ussh` reads the trusted user CA keys from {file}`/etc/ssh/trusted_user_ca`. @@ -1314,9 +1310,9 @@ in ''; }; - authorizedPrincipals = mkOption { + authorizedPrincipals = lib.mkOption { default = null; - type = with types; nullOr commas; + type = with lib.types; nullOr commas; description = '' Comma-separated list of authorized principals to permit; if the user presents a certificate with one of these principals, then they will be @@ -1330,9 +1326,9 @@ in ''; }; - authorizedPrincipalsFile = mkOption { + authorizedPrincipalsFile = lib.mkOption { default = null; - type = with types; nullOr path; + type = with lib.types; nullOr path; description = '' Path to a list of principals; if the user presents a certificate with one of these principals, then they will be authorized. @@ -1345,18 +1341,18 @@ in ''; }; - group = mkOption { + group = lib.mkOption { default = null; - type = with types; nullOr str; + type = with lib.types; nullOr str; description = '' If set, then the authenticating user must be a member of this group to use this module. ''; }; - control = mkOption { + control = lib.mkOption { default = "sufficient"; - type = types.enum [ "required" "requisite" "sufficient" "optional" ]; + type = lib.types.enum [ "required" "requisite" "sufficient" "optional" ]; description = '' This option sets pam "control". If you want to have multi factor authentication, use "required". @@ -1371,9 +1367,9 @@ in }; security.pam.yubico = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Enables Yubico PAM (`yubico-pam`) module. @@ -1386,9 +1382,9 @@ in More information can be found [here](https://developers.yubico.com/yubico-pam/). ''; }; - control = mkOption { + control = lib.mkOption { default = "sufficient"; - type = types.enum [ "required" "requisite" "sufficient" "optional" ]; + type = lib.types.enum [ "required" "requisite" "sufficient" "optional" ]; description = '' This option sets pam "control". If you want to have multi factor authentication, use "required". @@ -1399,22 +1395,22 @@ in for better understanding of this option. ''; }; - id = mkOption { + id = lib.mkOption { example = "42"; - type = types.str; + type = lib.types.str; description = "client id"; }; - debug = mkOption { + debug = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Debug output to stderr. ''; }; - mode = mkOption { + mode = lib.mkOption { default = "client"; - type = types.enum [ "client" "challenge-response" ]; + type = lib.types.enum [ "client" "challenge-response" ]; description = '' Mode of operation. @@ -1428,9 +1424,9 @@ in More information can be found [here](https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html). ''; }; - challengeResponsePath = mkOption { + challengeResponsePath = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = '' If not null, set the path used by yubico pam module where the challenge expected response is stored. @@ -1440,35 +1436,35 @@ in }; security.pam.zfs = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Enable unlocking and mounting of encrypted ZFS home dataset at login. ''; }; - homes = mkOption { + homes = lib.mkOption { example = "rpool/home"; default = "rpool/home"; - type = types.str; + type = lib.types.str; description = '' Prefix of home datasets. This value will be concatenated with `"/" + ` in order to determine the home dataset to unlock. ''; }; - noUnmount = mkOption { + noUnmount = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Do not unmount home dataset on logout. ''; }; }; - security.pam.enableEcryptfs = mkEnableOption "eCryptfs PAM module (mounting ecryptfs home directory on login)"; - security.pam.enableFscrypt = mkEnableOption '' + security.pam.enableEcryptfs = lib.mkEnableOption "eCryptfs PAM module (mounting ecryptfs home directory on login)"; + security.pam.enableFscrypt = lib.mkEnableOption '' fscrypt, to automatically unlock directories with the user's login password. This also enables a service at security.pam.services.fscrypt which is used by @@ -1477,17 +1473,17 @@ in adjust this PAM service ''; - users.motd = mkOption { + users.motd = lib.mkOption { default = ""; example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178."; - type = types.lines; + type = lib.types.lines; description = "Message of the day shown to users when they log in."; }; - users.motdFile = mkOption { + users.motdFile = lib.mkOption { default = null; example = "/etc/motd"; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "A file containing the message of the day shown to users when they log in."; }; }; @@ -1518,9 +1514,9 @@ in } ]; - warnings = optional + warnings = lib.optional (with lib; with config.security.pam.sshAgentAuth; - enable && any (s: hasPrefix "%h" s || hasPrefix "~" s) authorizedKeysFiles) + enable && lib.any (s: lib.hasPrefix "%h" s || lib.hasPrefix "~" s) authorizedKeysFiles) ''config.security.pam.sshAgentAuth.authorizedKeysFiles contains files in the user's home directory. Specifying user-writeable files there result in an insecure configuration: @@ -1531,17 +1527,17 @@ in environment.systemPackages = # Include the PAM modules in the system path mostly for the manpages. [ package ] - ++ optional config.users.ldap.enable pam_ldap - ++ optional config.services.kanidm.enablePam config.services.kanidm.package - ++ optional config.services.sssd.enable pkgs.sssd - ++ optionals config.security.pam.krb5.enable [pam_krb5 pam_ccreds] - ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ] - ++ optionals config.security.pam.oath.enable [ pkgs.oath-toolkit ] - ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ] - ++ optionals config.security.pam.enableFscrypt [ pkgs.fscrypt-experimental ] - ++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ]; + ++ lib.optional config.users.ldap.enable pam_ldap + ++ lib.optional config.services.kanidm.enablePam config.services.kanidm.package + ++ lib.optional config.services.sssd.enable pkgs.sssd + ++ lib.optionals config.security.pam.krb5.enable [pam_krb5 pam_ccreds] + ++ lib.optionals config.security.pam.enableOTPW [ pkgs.otpw ] + ++ lib.optionals config.security.pam.oath.enable [ pkgs.oath-toolkit ] + ++ lib.optionals config.security.pam.p11.enable [ pkgs.pam_p11 ] + ++ lib.optionals config.security.pam.enableFscrypt [ pkgs.fscrypt-experimental ] + ++ lib.optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ]; - boot.supportedFilesystems = optionals config.security.pam.enableEcryptfs [ "ecryptfs" ]; + boot.supportedFilesystems = lib.optionals config.security.pam.enableEcryptfs [ "ecryptfs" ]; security.wrappers = { unix_chkpwd = { @@ -1552,7 +1548,7 @@ in }; }; - environment.etc = mapAttrs' makePAMService config.security.pam.services; + environment.etc = lib.mapAttrs' makePAMService config.security.pam.services; security.pam.services = { other.text = @@ -1580,7 +1576,7 @@ in it complains "Cannot create session: Already running in a session". */ runuser-l = { rootOK = true; unixAuth = false; }; - } // optionalAttrs (config.security.pam.enableFscrypt) { + } // lib.optionalAttrs (config.security.pam.enableFscrypt) { # Allow fscrypt to verify login passphrase fscrypt = {}; }; @@ -1588,22 +1584,22 @@ in security.apparmor.includes."abstractions/pam" = lib.concatMapStrings (name: "r ${config.environment.etc."pam.d/${name}".source},\n") - (attrNames config.security.pam.services) + + (lib.attrNames config.security.pam.services) + (with lib; pipe config.security.pam.services [ - attrValues + lib.attrValues (catAttrs "rules") - (concatMap attrValues) - (concatMap attrValues) - (filter (rule: rule.enable)) - (catAttrs "modulePath") - # TODO(@uninsane): replace this warning + filter with just an assertion + (lib.concatMap lib.attrValues) + (lib.concatMap lib.attrValues) + (lib.filter (rule: rule.enable)) + (lib.catAttrs "modulePath") + # TODO(@uninsane): replace this warning + lib.filter with just an assertion (map (modulePath: lib.warnIfNot - (hasPrefix "/" modulePath) + (lib.hasPrefix "/" modulePath) ''non-absolute PAM modulePath "${modulePath}" is unsupported by apparmor and will be treated as an error by future versions of nixpkgs; see '' modulePath )) - (filter (hasPrefix "/")) - unique + (lib.filter (lib.hasPrefix "/")) + lib.unique (map (module: "mr ${module},")) concatLines ]); diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index eb7b7a170785..fc30172c6499 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -205,8 +205,6 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/buildkite-agent start --config ${cfg.dataDir}/buildkite-agent.cfg"; User = "buildkite-agent-${name}"; - # Workaround https://github.com/buildkite/agent/issues/2916 - PrivateTmp = lib.mkDefault true; RestartSec = 5; Restart = "on-failure"; TimeoutSec = 10; diff --git a/nixos/modules/services/databases/chromadb.nix b/nixos/modules/services/databases/chromadb.nix new file mode 100644 index 000000000000..d8d60078cf45 --- /dev/null +++ b/nixos/modules/services/databases/chromadb.nix @@ -0,0 +1,107 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.chromadb; + inherit (lib) + mkEnableOption + mkOption + mkIf + types + literalExpression + ; +in +{ + + meta.maintainers = with lib.maintainers; [ drupol ]; + + options = { + services.chromadb = { + enable = mkEnableOption "ChromaDB, an open-source AI application database."; + + package = mkOption { + type = types.package; + example = literalExpression "pkgs.python3Packages.chromadb"; + default = pkgs.python3Packages.chromadb; + defaultText = "pkgs.python3Packages.chromadb"; + description = "ChromaDB package to use."; + }; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + Defines the IP address by which ChromaDB will be accessible. + ''; + }; + + port = mkOption { + type = types.port; + default = 8000; + description = '' + Defined the port number to listen. + ''; + }; + + logFile = mkOption { + type = types.path; + default = "/var/log/chromadb/chromadb.log"; + description = '' + Specifies the location of file for logging output. + ''; + }; + + dbpath = mkOption { + type = types.str; + default = "/var/lib/chromadb"; + description = "Location where ChromaDB stores its files"; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to automatically open the specified TCP port in the firewall. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.chromadb = { + description = "ChromaDB"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + StateDirectory = "chromadb"; + WorkingDirectory = "/var/lib/chromadb"; + LogsDirectory = "chromadb"; + ExecStart = "${lib.getExe cfg.package} run --path ${cfg.dbpath} --host ${cfg.host} --port ${toString cfg.port} --log-path ${cfg.logFile}"; + Restart = "on-failure"; + ProtectHome = true; + ProtectSystem = "strict"; + PrivateTmp = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + NoNewPrivileges = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + PrivateMounts = true; + DynamicUser = true; + }; + }; + + networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ cfg.port ]; + }; +} diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index bd43b4c1cfda..2d3cecfe9e43 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -26,6 +26,7 @@ in { lomiri-clock-app lomiri-download-manager lomiri-filemanager-app + lomiri-gallery-app lomiri-polkit-agent lomiri-schemas # exposes some required dbus interfaces lomiri-session # wrappers to properly launch the session diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix index fe4999bfbdbb..5c0fed35c4c9 100644 --- a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix +++ b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix @@ -32,7 +32,7 @@ default = false; type = lib.types.bool; description = '' - Enable dynamic CDI configuration for NVidia devices by running + Enable dynamic CDI configuration for Nvidia devices by running nvidia-container-toolkit on boot. ''; }; diff --git a/nixos/modules/services/matrix/mautrix-whatsapp.nix b/nixos/modules/services/matrix/mautrix-whatsapp.nix index d124edc216dd..89bf7f9e9fac 100644 --- a/nixos/modules/services/matrix/mautrix-whatsapp.nix +++ b/nixos/modules/services/matrix/mautrix-whatsapp.nix @@ -108,6 +108,16 @@ in { List of Systemd services to require and wait for when starting the application service. ''; }; + + registerToSynapse = lib.mkOption { + type = lib.types.bool; + default = config.services.matrix-synapse.enable; + defaultText = lib.literalExpression "config.services.matrix-synapse.enable"; + description = '' + Whether to add the bridge's app service registration file to + `services.matrix-synapse.settings.app_service_config_files`. + ''; + }; }; config = lib.mkIf cfg.enable { @@ -121,6 +131,13 @@ in { users.groups.mautrix-whatsapp = {}; + services.matrix-synapse = lib.mkIf cfg.registerToSynapse { + settings.app_service_config_files = [ registrationFile ]; + }; + systemd.services.matrix-synapse = lib.mkIf cfg.registerToSynapse { + serviceConfig.SupplementaryGroups = [ "mautrix-whatsapp" ]; + }; + services.mautrix-whatsapp.settings = lib.mkMerge (map mkDefaults [ defaultConfig # Note: this is defined here to avoid the docs depending on `config` @@ -155,10 +172,15 @@ in { chmod 640 ${registrationFile} umask 0177 + # 1. Overwrite registration tokens in config + # 2. If environment variable MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET + # is set, set it as the login shared secret value for the configured + # homeserver domain. ${pkgs.yq}/bin/yq -s '.[0].appservice.as_token = .[1].as_token | .[0].appservice.hs_token = .[1].hs_token - | .[0]' '${settingsFile}' '${registrationFile}' \ - > '${settingsFile}.tmp' + | .[0] + | if env.MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET then .bridge.login_shared_secret_map.[.homeserver.domain] = env.MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET else . end' \ + '${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp' mv '${settingsFile}.tmp' '${settingsFile}' umask $old_umask ''; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 35a2d61da1de..359cb9085fcf 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -560,6 +560,9 @@ in }; environment.NUT_CONFPATH = "/etc/nut"; environment.NUT_STATEPATH = "/var/lib/nut"; + restartTriggers = [ + config.environment.etc."nut/ups.conf".source + ]; }; environment.etc = { diff --git a/nixos/modules/services/networking/cgit.nix b/nixos/modules/services/networking/cgit.nix index cdd316dd99d2..910db84a2641 100644 --- a/nixos/modules/services/networking/cgit.nix +++ b/nixos/modules/services/networking/cgit.nix @@ -6,6 +6,7 @@ let cfgs = config.services.cgit; settingType = with types; oneOf [ bool int str ]; + repeatedSettingType = with types; oneOf [ settingType (listOf settingType) ]; genAttrs' = names: f: listToAttrs (map f names); @@ -44,12 +45,20 @@ let toString value }"; + # list value as multiple lines (for "readme" for example) + cgitrcEntry = name: value: + if isList value then + map (cgitrcLine name) value + else + [ (cgitrcLine name value) ]; + mkCgitrc = cfg: pkgs.writeText "cgitrc" '' # global settings ${concatStringsSep "\n" ( - mapAttrsToList - cgitrcLine + flatten (mapAttrsToList + cgitrcEntry ({ virtual-root = cfg.nginx.location; } // cfg.settings) + ) ) } ${optionalString (cfg.scanPath != null) (cgitrcLine "scan-path" cfg.scanPath)} @@ -125,7 +134,7 @@ in settings = mkOption { description = "cgit configuration, see cgitrc(5)"; - type = types.attrsOf settingType; + type = types.attrsOf repeatedSettingType; default = {}; example = literalExpression '' { diff --git a/nixos/modules/services/networking/harmonia.nix b/nixos/modules/services/networking/harmonia.nix index 629ee436e63d..ac5c35ddb280 100644 --- a/nixos/modules/services/networking/harmonia.nix +++ b/nixos/modules/services/networking/harmonia.nix @@ -2,6 +2,12 @@ let cfg = config.services.harmonia; format = pkgs.formats.toml { }; + + signKeyPaths = cfg.signKeyPaths ++ lib.optional (cfg.signKeyPath != null) cfg.signKeyPath; + credentials = lib.imap0 (i: signKeyPath: { + id = "sign-key-${builtins.toString i}"; + path = signKeyPath; + }) signKeyPaths; in { options = { @@ -11,7 +17,13 @@ in signKeyPath = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; - description = "Path to the signing key that will be used for signing the cache"; + description = "DEPRECATED: Use `services.harmonia.signKeyPaths` instead. Path to the signing key to use for signing the cache"; + }; + + signKeyPaths = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = "Paths to the signing keys to use for signing the cache"; }; package = lib.mkPackageOption pkgs "harmonia" { }; @@ -28,6 +40,8 @@ in }; config = lib.mkIf cfg.enable { + warnings = lib.optional (cfg.signKeyPath != null) + "`services.harmonia.signKeyPath` is deprecated, use `services.harmonia.signKeyPaths` instead"; nix.settings.extra-allowed-users = [ "harmonia" ]; users.users.harmonia = { isSystemUser = true; @@ -44,7 +58,9 @@ in environment = { CONFIG_FILE = format.generate "harmonia.toml" cfg.settings; - SIGN_KEY_PATH = lib.mkIf (cfg.signKeyPath != null) "%d/sign-key"; + SIGN_KEY_PATHS = lib.strings.concatMapStringsSep " " ( + credential: "%d/${credential.id}" + ) credentials; # Note: it's important to set this for nix-store, because it wants to use # $HOME in order to use a temporary cache dir. bizarre failures will occur # otherwise @@ -60,7 +76,7 @@ in DeviceAllow = [ "" ]; UMask = "0066"; RuntimeDirectory = "harmonia"; - LoadCredential = lib.mkIf (cfg.signKeyPath != null) [ "sign-key:${cfg.signKeyPath}" ]; + LoadCredential = builtins.map (credential: "${credential.id}:${credential.path}") credentials; SystemCallFilter = [ "@system-service" "~@privileged" diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix deleted file mode 100644 index a833d738f885..000000000000 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ /dev/null @@ -1,187 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - inherit (pkgs) lsh; - - cfg = config.services.lshd; - -in - -{ - - ###### interface - - options = { - - services.lshd = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the GNU lshd SSH2 daemon, which allows - secure remote login. - ''; - }; - - portNumber = mkOption { - default = 22; - type = types.port; - description = '' - The port on which to listen for connections. - ''; - }; - - interfaces = mkOption { - default = []; - type = types.listOf types.str; - description = '' - List of network interfaces where listening for connections. - When providing the empty list, `[]`, lshd listens on all - network interfaces. - ''; - example = [ "localhost" "1.2.3.4:443" ]; - }; - - hostKey = mkOption { - default = "/etc/lsh/host-key"; - type = types.str; - description = '' - Path to the server's private key. Note that this key must - have been created, e.g., using "lsh-keygen --server | - lsh-writekey --server", so that you can run lshd. - ''; - }; - - syslog = mkOption { - type = types.bool; - default = true; - description = "Whether to enable syslog output."; - }; - - passwordAuthentication = mkOption { - type = types.bool; - default = true; - description = "Whether to enable password authentication."; - }; - - publicKeyAuthentication = mkOption { - type = types.bool; - default = true; - description = "Whether to enable public key authentication."; - }; - - rootLogin = mkOption { - type = types.bool; - default = false; - description = "Whether to enable remote root login."; - }; - - loginShell = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - If non-null, override the default login shell with the - specified value. - ''; - example = "/nix/store/xyz-bash-10.0/bin/bash10"; - }; - - srpKeyExchange = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable SRP key exchange and user authentication. - ''; - }; - - tcpForwarding = mkOption { - type = types.bool; - default = true; - description = "Whether to enable TCP/IP forwarding."; - }; - - x11Forwarding = mkOption { - type = types.bool; - default = true; - description = "Whether to enable X11 forwarding."; - }; - - subsystems = mkOption { - type = types.listOf types.path; - description = '' - List of subsystem-path pairs, where the head of the pair - denotes the subsystem name, and the tail denotes the path to - an executable implementing it. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - services.lshd.subsystems = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ]; - - systemd.services.lshd = { - description = "GNU lshd SSH2 daemon"; - - after = [ "network.target" ]; - - wantedBy = [ "multi-user.target" ]; - - environment = { - LD_LIBRARY_PATH = config.system.nssModules.path; - }; - - preStart = '' - test -d /etc/lsh || mkdir -m 0755 -p /etc/lsh - test -d /var/spool/lsh || mkdir -m 0755 -p /var/spool/lsh - - if ! test -f /var/spool/lsh/yarrow-seed-file - then - # XXX: It would be nice to provide feedback to the - # user when this fails, so that they can retry it - # manually. - ${lsh}/bin/lsh-make-seed --sloppy \ - -o /var/spool/lsh/yarrow-seed-file - fi - - if ! test -f "${cfg.hostKey}" - then - ${lsh}/bin/lsh-keygen --server | \ - ${lsh}/bin/lsh-writekey --server -o "${cfg.hostKey}" - fi - ''; - - script = with cfg; '' - ${lsh}/sbin/lshd --daemonic \ - --password-helper="${lsh}/sbin/lsh-pam-checkpw" \ - -p ${toString portNumber} \ - ${optionalString (interfaces != []) (concatStrings (map (i: "--interface=\"${i}\"") interfaces))} \ - -h "${hostKey}" \ - ${optionalString (!syslog) "--no-syslog" } \ - ${if passwordAuthentication then "--password" else "--no-password" } \ - ${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \ - ${if rootLogin then "--root-login" else "--no-root-login" } \ - ${optionalString (loginShell != null) "--login-shell=\"${loginShell}\"" } \ - ${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \ - ${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \ - ${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \ - --subsystems=${concatStringsSep "," - (map (pair: (head pair) + "=" + - (head (tail pair))) - subsystems)} - ''; - }; - - security.pam.services.lshd = {}; - }; -} diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index daebd6441cb5..5c383e9f16ab 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -775,7 +775,7 @@ in { '' + lib.optionalString (!databaseActuallyCreateLocally) '' unset PGPASSWORD ''; - path = [ cfg.package pkgs.postgresql ]; + path = [ cfg.package config.services.postgresql.package ]; environment = env // lib.optionalAttrs (!databaseActuallyCreateLocally) { PGHOST = cfg.database.host; PGPORT = toString cfg.database.port; diff --git a/nixos/modules/services/web-apps/pict-rs.nix b/nixos/modules/services/web-apps/pict-rs.nix index 07f84578a59b..360dc4fe6418 100644 --- a/nixos/modules/services/web-apps/pict-rs.nix +++ b/nixos/modules/services/web-apps/pict-rs.nix @@ -3,9 +3,6 @@ let cfg = config.services.pict-rs; inherit (lib) maintainers mkOption types; - - is03 = lib.versionOlder cfg.package.version "0.4.0"; - in { meta.maintainers = with maintainers; [ happysalada ]; @@ -61,38 +58,62 @@ in config = lib.mkIf cfg.enable { services.pict-rs.package = lib.mkDefault ( - # An incompatible db change happened in the transition from 0.3 to 0.4. if lib.versionAtLeast config.system.stateVersion "23.11" then pkgs.pict-rs - else pkgs.pict-rs_0_3 + else throw '' + pict-rs made changes to the database schema between 0.3 and 0.4. It + will apply these automatically on the first run of 0.4, but the old + version will no longer work after that. + + Your configuration is currently using the old default of pict-rs + 0.3. Unfortunately, 0.3 no longer builds due to the Rust 1.80 update, + and has been removed. pict-rs has already been updated to 0.5 in + Nixpkgs, which has another schema change but removes the migration + logic for 0.3. + + You will need to migrate to 0.4 first, and then to 0.5. As 0.4 is + no longer present in Nixpkgs, the recommended migration path is: + + * Import a separate Nixpkgs old enough to contain 0.4, temporarily + set `services.pict-rs.package` to its pict-rs, set the + `PICTRS__OLD_DB__PATH` environment variable for the migration, and + activate your configuration to start it. The following configuration + snippet should work: + + services.pict-rs.package = + (import (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/9b19f5e77dd906cb52dade0b7bd280339d2a1f3d.tar.gz"; + sha256 = "sha256:0939vbhln9d33xkqw63nsk908k03fxihj85zaf70i3il9z42q8mc"; + }) pkgs.config).pict-rs; + + systemd.services.pict-rs.environment.PICTRS__OLD_DB__PATH = config.services.pict-rs.dataDir; + + * After the migration to 0.4 completes, remove the package and + environment variable overrides, set `services.pict-rs.package` to + the current `pkgs.pict-rs` instead, and activate your configuration + to begin the migration to 0.5. + + For more information, see: + + * + * + + The NixOS module will handle the configuration changes for you, + at least. + '' ); - # Account for config differences between 0.3 and 0.4 - assertions = [ - { - assertion = !is03 || (cfg.repoPath == null && cfg.storePath == null); - message = '' - Using `services.pict-rs.repoPath` or `services.pict-rs.storePath` with pict-rs 0.3 or older has no effect. - ''; - } - ]; - systemd.services.pict-rs = { - # Pict-rs split it's database and image storage paths in 0.4.0. - environment = - if is03 then { - PICTRS__PATH = cfg.dataDir; - PICTRS__ADDR = "${cfg.address}:${toString cfg.port}"; - } else { - PICTRS__REPO__PATH = if cfg.repoPath != null then cfg.repoPath else "${cfg.dataDir}/sled-repo"; - PICTRS__STORE__PATH = if cfg.storePath != null then cfg.storePath else "${cfg.dataDir}/files"; - PICTRS__SERVER__ADDR = "${cfg.address}:${toString cfg.port}"; - }; + environment = { + PICTRS__REPO__PATH = if cfg.repoPath != null then cfg.repoPath else "${cfg.dataDir}/sled-repo"; + PICTRS__STORE__PATH = if cfg.storePath != null then cfg.storePath else "${cfg.dataDir}/files"; + PICTRS__SERVER__ADDRESS = "${cfg.address}:${toString cfg.port}"; + }; wantedBy = [ "multi-user.target" ]; serviceConfig = { DynamicUser = true; StateDirectory = "pict-rs"; - ExecStart = if is03 then "${lib.getBin cfg.package}/bin/pict-rs" else "${lib.getBin cfg.package}/bin/pict-rs run"; + ExecStart = "${lib.getBin cfg.package}/bin/pict-rs run"; }; }; }; diff --git a/nixos/modules/services/web-apps/pingvin-share.md b/nixos/modules/services/web-apps/pingvin-share.md new file mode 100644 index 000000000000..4c9ab901ee53 --- /dev/null +++ b/nixos/modules/services/web-apps/pingvin-share.md @@ -0,0 +1,43 @@ +# Pingvin Share {#module-services-pingvin-share} + +A self-hosted file sharing platform and an alternative for WeTransfer. + +## Configuration {#module-services-pingvin-share-basic-usage} + +By default, the module will execute Pingvin Share backend and frontend on the ports 8080 and 3000. + +I will run two systemd services named `pingvin-share-backend` and `pingvin-share-frontend` in the specified data directory. + +Here is a basic configuration: + +```nix +{ + services-pingvin-share = { + enable = true; + + openFirewall = true; + + backend.port = 9010; + frontend.port = 9011; + }; +} +``` + +## Reverse proxy configuration {#module-services-pingvin-share-reverse-proxy-configuration} + +The prefered method to run this service is behind a reverse proxy not to expose an open port. This, you can configure Nginx such like this: + +```nix +{ + services-pingvin-share = { + enable = true; + + hostname = "pingvin-share.domain.tld"; + https = true; + + nginx.enable = true; + }; +} +``` + +Furthermore, you can increase the maximal size of an uploaded file with the option [services.nginx.clientMaxBodySize](#opt-services.nginx.clientMaxBodySize). diff --git a/nixos/modules/services/web-apps/pingvin-share.nix b/nixos/modules/services/web-apps/pingvin-share.nix new file mode 100644 index 000000000000..2d637a82ba8e --- /dev/null +++ b/nixos/modules/services/web-apps/pingvin-share.nix @@ -0,0 +1,226 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.pingvin-share; + inherit (lib) + mkOption + mkEnableOption + mkIf + mkPackageOption + types + ; +in + +{ + options = { + services.pingvin-share = { + enable = mkEnableOption "Pingvin Share, a self-hosted file sharing platform"; + + user = mkOption { + type = types.str; + default = "pingvin"; + description = '' + User account under which Pingvin Share runs. + ''; + }; + + group = mkOption { + type = types.str; + default = "pingvin"; + description = '' + Group under which Pingvin Share runs. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open the firewall for the port in {option}`services.pingvin-share.frontend.port`. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/pingvin-share"; + example = "/var/lib/pingvin"; + description = '' + The path to the data directory in which Pingvin Share will store its data. + ''; + }; + + hostname = mkOption { + type = types.str; + default = "localhost:${toString cfg.backend.port}"; + defaultText = lib.literalExpression "localhost:\${options.services.pingvin-share.backend.port}"; + example = "pingvin-share.domain.tdl"; + description = '' + The domain name of your instance. If null, the redirections will be made to localhost. + ''; + }; + + https = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to enable HTTPS for the domain. + ''; + }; + + backend = { + package = mkPackageOption pkgs [ + "pingvin-share" + "backend" + ] { }; + + port = mkOption { + type = types.port; + default = 8080; + example = 9000; + description = '' + The port that the backend service of Pingvin Share will listen to. + ''; + }; + }; + + frontend = { + package = mkPackageOption pkgs [ + "pingvin-share" + "frontend" + ] { }; + + port = mkOption { + type = types.port; + default = 3000; + example = 8000; + description = '' + The port that the frontend service of Pingvin Share will listen to. + ''; + }; + }; + + nginx = { + enable = mkEnableOption "a Nginx reverse proxy for Pingvin Share."; + }; + }; + }; + + config = mkIf cfg.enable { + + users.groups = mkIf (cfg.group == "pingvin") { pingvin = { }; }; + + users.users = mkIf (cfg.user == "pingvin") { + pingvin = { + group = cfg.group; + description = "Pingvin Share daemon user"; + isSystemUser = true; + }; + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.frontend.port ]; + + systemd.services.pingvin-share-backend = { + description = "Backend service of Pingvin Share, a self-hosted file sharing platform."; + + wantedBy = [ + "multi-user.target" + "pingvin-share-frontend.service" + ]; + before = [ "pingvin-share-frontend.service" ]; + after = [ + "network.target" + "network-online.target" + ]; + wants = [ "network-online.target" ]; + + environment = { + PRISMA_SCHEMA_ENGINE_BINARY = "${pkgs.prisma-engines}/bin/schema-engine"; + PRISMA_QUERY_ENGINE_BINARY = "${pkgs.prisma-engines}/bin/query-engine"; + PRISMA_QUERY_ENGINE_LIBRARY = "${pkgs.prisma-engines}/lib/libquery_engine.node"; + PRISMA_INTROSPECTION_ENGINE_BINARY = "${pkgs.prisma-engines}/bin/introspection-engine"; + PRISMA_FMT_BINARY = "${pkgs.prisma-engines}/bin/prisma-fmt"; + PORT = toString cfg.backend.port; + DATABASE_URL = "file:${cfg.dataDir}/pingvin-share.db?connection_limit=1"; + DATA_DIRECTORY = cfg.dataDir; + }; + + path = with pkgs; [ + cfg.backend.package + openssl + prisma-engines + ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Type = "simple"; + Restart = "on-failure"; + ExecStartPre = [ + "${cfg.backend.package}/node_modules/.bin/prisma migrate deploy" + "${cfg.backend.package}/node_modules/.bin/prisma db seed" + ]; + ExecStart = "${cfg.backend.package}/node_modules/.bin/ts-node dist/src/main"; + StateDirectory = mkIf (cfg.dataDir == "/var/lib/pingvin-share") "pingvin-share"; + WorkingDirectory = cfg.backend.package; + }; + }; + + systemd.services.pingvin-share-frontend = { + description = "Frontend service of Pingvin Share, a self-hosted file sharing platform."; + + wantedBy = [ "multi-user.target" ]; + wants = [ + "network-online.target" + "pingvin-share-backend.service" + ]; + after = [ + "network-online.target" + "pingvin-share-backend.service" + ]; + + environment = { + PORT = toString cfg.frontend.port; + API_URL = "${if cfg.https then "https" else "http"}://${cfg.hostname}"; + }; + path = [ cfg.frontend.package ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Type = "simple"; + Restart = "on-failure"; + ExecStart = "${cfg.frontend.package}/node_modules/.bin/next start"; + StateDirectory = mkIf (cfg.dataDir == "/var/lib/pingvin-share") "pingvin-share"; + WorkingDirectory = cfg.frontend.package; + }; + }; + + services.nginx = mkIf cfg.nginx.enable { + enable = lib.mkDefault true; + virtualHosts."${cfg.hostname}" = { + enableACME = cfg.https; + forceSSL = cfg.https; + + locations."/" = { + proxyPass = "http://localhost:${toString cfg.frontend.port}"; + recommendedProxySettings = true; + }; + locations."/api" = { + proxyPass = "http://localhost:${toString cfg.backend.port}"; + recommendedProxySettings = true; + }; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ ratcornu ]; + doc = ./pingvin-share.md; + }; +} diff --git a/nixos/modules/services/web-apps/weblate.nix b/nixos/modules/services/web-apps/weblate.nix index 398d634a2b92..4f13ad87ee03 100644 --- a/nixos/modules/services/web-apps/weblate.nix +++ b/nixos/modules/services/web-apps/weblate.nix @@ -42,9 +42,10 @@ let SESSION_COOKIE_SECURE = ENABLE_HTTPS DATA_DIR = "${dataDir}" CACHE_DIR = f"{DATA_DIR}/cache" - STATIC_ROOT = "${finalPackage.static}/static" + STATIC_ROOT = "${finalPackage.static}" MEDIA_ROOT = "/var/lib/weblate/media" - COMPRESS_ROOT = "${finalPackage.static}/compressor-cache" + COMPRESS_ROOT = "${finalPackage.static}" + COMPRESS_OFFLINE = True DEBUG = False DATABASES = { @@ -86,6 +87,13 @@ let VCS_BACKENDS = ("weblate.vcs.git.GitRepository",) + SITE_URL = "https://{}".format(SITE_DOMAIN) + + # WebAuthn + OTP_WEBAUTHN_RP_NAME = SITE_TITLE + OTP_WEBAUTHN_RP_ID = SITE_DOMAIN.split(":")[0] + OTP_WEBAUTHN_ALLOWED_ORIGINS = [SITE_URL] + '' + lib.optionalString cfg.smtp.enable '' ADMINS = (("Weblate Admin", "${cfg.smtp.user}"),) @@ -205,8 +213,7 @@ in locations = { "= /favicon.ico".alias = "${finalPackage}/${python.sitePackages}/weblate/static/favicon.ico"; - "/static/".alias = "${finalPackage.static}/static/"; - "/static/CACHE/".alias = "${finalPackage.static}/compressor-cache/CACHE/"; + "/static/".alias = "${finalPackage.static}/"; "/media/".alias = "/var/lib/weblate/media/"; "/".proxyPass = "http://unix:///run/weblate.socket"; }; diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 37c39608edae..ea771c358814 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -426,6 +426,7 @@ in # standard wordpress .htaccess contents RewriteEngine On + RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] RewriteBase / RewriteRule ^index\.php$ - [L] RewriteCond %{REQUEST_FILENAME} !-f diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 43fa93aadf1c..620e4167daa1 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -20,6 +20,7 @@ let "IPv6PrivacyExtensions" "IPv4Forwarding" "IPv6Forwarding" + "UseDomains" ]) (assertValueOneOf "SpeedMeter" boolValues) (assertInt "SpeedMeterIntervalSec") @@ -28,6 +29,7 @@ let (assertValueOneOf "IPv6PrivacyExtensions" (boolValues ++ ["prefer-public" "kernel"])) (assertValueOneOf "IPv4Forwarding" boolValues) (assertValueOneOf "IPv6Forwarding" boolValues) + (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) ]; sectionDHCPv4 = checkUnitConfig "DHCPv4" [ @@ -652,6 +654,7 @@ let "Address" "Gateway" "DNS" + "UseDomains" "Domains" "DNSDefaultRoute" "NTP" @@ -705,6 +708,7 @@ let (assertValueOneOf "DNSSEC" (boolValues ++ ["allow-downgrade"])) (assertValueOneOf "LLDP" (boolValues ++ ["routers-only"])) (assertValueOneOf "EmitLLDP" (boolValues ++ ["nearest-bridge" "non-tpmr-bridge" "customer-bridge"])) + (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) (assertValueOneOf "DNSDefaultRoute" boolValues) (assertRemoved "IPForward" "IPv4Forwarding and IPv6Forwarding in systemd.network(5) and networkd.conf(5)") (assertValueOneOf "IPv4Forwarding" boolValues) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 9e7387e40379..bb6fcc1d38ce 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -53,7 +53,6 @@ let "debug-shell.service" # Udev. - "systemd-tmpfiles-setup-dev-early.service" "systemd-udevd-control.socket" "systemd-udevd-kernel.socket" "systemd-udevd.service" diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 0caea104b1b5..2ccc964820fe 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -67,8 +67,6 @@ let "systemd-poweroff.service" "systemd-reboot.service" "systemd-sysctl.service" - "systemd-tmpfiles-setup-dev.service" - "systemd-tmpfiles-setup.service" "timers.target" "tpm2.target" "umount.target" @@ -103,8 +101,17 @@ let initrdBinEnv = pkgs.buildEnv { name = "initrd-bin-env"; paths = map getBin cfg.initrdBin; - pathsToLink = ["/bin"]; - postBuild = concatStringsSep "\n" (mapAttrsToList (n: v: "ln -sf '${v}' $out/bin/'${n}'") cfg.extraBin); + pathsToLink = ["/bin" "/sbin"]; + + # Make sure sbin and bin have the same contents, and add extraBin + postBuild = '' + find $out/bin -maxdepth 1 -type l -print0 | xargs --null cp --no-dereference --no-clobber -t $out/sbin/ + find $out/sbin -maxdepth 1 -type l -print0 | xargs --null cp --no-dereference --no-clobber -t $out/bin/ + ${concatStringsSep "\n" (mapAttrsToList (n: v: '' + ln -sf '${v}' $out/bin/'${n}' + ln -sf '${v}' $out/sbin/'${n}' + '') cfg.extraBin)} + ''; }; initialRamdisk = pkgs.makeInitrdNG { @@ -226,8 +233,8 @@ in { emergencyAccess = mkOption { type = with types; oneOf [ bool (nullOr (passwdEntry str)) ]; description = '' - Set to true for unauthenticated emergency access, and false for - no emergency access. + Set to true for unauthenticated emergency access, and false or + null for no emergency access. Can also be set to a hashed super user password to allow authenticated access to the emergency mode. @@ -408,7 +415,7 @@ in { fsck = "${cfg.package.util-linux}/bin/fsck"; }; - managerEnvironment.PATH = "/bin"; + managerEnvironment.PATH = "/bin:/sbin"; contents = { "/tmp/.keep".text = "systemd requires the /tmp mount point in the initrd cpio archive"; @@ -417,7 +424,7 @@ in { "/etc/systemd/system.conf".text = '' [Manager] - DefaultEnvironment=PATH=/bin + DefaultEnvironment=PATH=/bin:/sbin ${cfg.extraConfig} ManagerEnvironment=${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment)} ''; @@ -429,12 +436,17 @@ in { # We can use either ! or * to lock the root account in the # console, but some software like OpenSSH won't even allow you # to log in with an SSH key if you use ! so we use * instead - "/etc/shadow".text = "root:${if isBool cfg.emergencyAccess then optionalString (!cfg.emergencyAccess) "*" else cfg.emergencyAccess}:::::::"; + "/etc/shadow".text = let + ea = cfg.emergencyAccess; + access = ea != null && !(isBool ea && !ea); + passwd = if isString ea then ea else ""; + in + "root:${if access then passwd else "*"}:::::::"; "/bin".source = "${initrdBinEnv}/bin"; - "/sbin".source = "${initrdBinEnv}/bin"; + "/sbin".source = "${initrdBinEnv}/sbin"; - "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /bin/modprobe"; + "/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe"; "/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf"; "/etc/modprobe.d/ubuntu.conf".source = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { } '' ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out @@ -509,8 +521,6 @@ in { (v: let n = escapeSystemdPath v.where; in nameValuePair "${n}.automount" (automountToUnit v)) cfg.automounts); - # make sure all the /dev nodes are set up - services.systemd-tmpfiles-setup-dev.wantedBy = ["sysinit.target"]; services.initrd-nixos-activation = { after = [ "initrd-fs.target" ]; diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index af37fb07d29b..f609da314c86 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -1,10 +1,121 @@ -{ config, lib, pkgs, utils, ... }: +{ config, lib, pkgs, ... }: with lib; let cfg = config.systemd.tmpfiles; + initrdCfg = config.boot.initrd.systemd.tmpfiles; systemd = config.systemd.package; + + settingsOption = { + description = '' + Declare systemd-tmpfiles rules to create, delete, and clean up volatile + and temporary files and directories. + + Even though the service is called `*tmp*files` you can also create + persistent files. + ''; + example = { + "10-mypackage" = { + "/var/lib/my-service/statefolder".d = { + mode = "0755"; + user = "root"; + group = "root"; + }; + }; + }; + default = {}; + type = types.attrsOf (types.attrsOf (types.attrsOf (types.submodule ({ name, config, ... }: { + options.type = mkOption { + type = types.str; + default = name; + example = "d"; + description = '' + The type of operation to perform on the file. + + The type consists of a single letter and optionally one or more + modifier characters. + + Please see the upstream documentation for the available types and + more details: + + ''; + }; + options.mode = mkOption { + type = types.str; + default = "-"; + example = "0755"; + description = '' + The file access mode to use when creating this file or directory. + ''; + }; + options.user = mkOption { + type = types.str; + default = "-"; + example = "root"; + description = '' + The user of the file. + + This may either be a numeric ID or a user/group name. + + If omitted or when set to `"-"`, the user and group of the user who + invokes systemd-tmpfiles is used. + ''; + }; + options.group = mkOption { + type = types.str; + default = "-"; + example = "root"; + description = '' + The group of the file. + + This may either be a numeric ID or a user/group name. + + If omitted or when set to `"-"`, the user and group of the user who + invokes systemd-tmpfiles is used. + ''; + }; + options.age = mkOption { + type = types.str; + default = "-"; + example = "10d"; + description = '' + Delete a file when it reaches a certain age. + + If a file or directory is older than the current time minus the age + field, it is deleted. + + If set to `"-"` no automatic clean-up is done. + ''; + }; + options.argument = mkOption { + type = types.str; + default = ""; + example = ""; + description = '' + An argument whose meaning depends on the type of operation. + + Please see the upstream documentation for the meaning of this + parameter in different situations: + + ''; + }; + })))); + }; + + # generates a single entry for a tmpfiles.d rule + settingsEntryToRule = path: entry: '' + '${entry.type}' '${path}' '${entry.mode}' '${entry.user}' '${entry.group}' '${entry.age}' ${entry.argument} + ''; + + # generates a list of tmpfiles.d rules from the attrs (paths) under tmpfiles.settings. + pathsToRules = mapAttrsToList (path: types: + concatStrings ( + mapAttrsToList (_type: settingsEntryToRule path) types + ) + ); + + mkRuleFileContent = paths: concatStrings (pathsToRules paths); in { options = { @@ -20,101 +131,16 @@ in ''; }; - systemd.tmpfiles.settings = mkOption { + systemd.tmpfiles.settings = mkOption settingsOption; + + boot.initrd.systemd.tmpfiles.settings = mkOption (settingsOption // { description = '' - Declare systemd-tmpfiles rules to create, delete, and clean up volatile - and temporary files and directories. + Similar to {option}`systemd.tmpfiles.settings` but the rules are + only applied by systemd-tmpfiles before `initrd-switch-root.target`. - Even though the service is called `*tmp*files` you can also create - persistent files. + See {manpage}`bootup(7)`. ''; - example = { - "10-mypackage" = { - "/var/lib/my-service/statefolder".d = { - mode = "0755"; - user = "root"; - group = "root"; - }; - }; - }; - default = {}; - type = types.attrsOf (types.attrsOf (types.attrsOf (types.submodule ({ name, config, ... }: { - options.type = mkOption { - type = types.str; - default = name; - example = "d"; - description = '' - The type of operation to perform on the file. - - The type consists of a single letter and optionally one or more - modifier characters. - - Please see the upstream documentation for the available types and - more details: - - ''; - }; - options.mode = mkOption { - type = types.str; - default = "-"; - example = "0755"; - description = '' - The file access mode to use when creating this file or directory. - ''; - }; - options.user = mkOption { - type = types.str; - default = "-"; - example = "root"; - description = '' - The user of the file. - - This may either be a numeric ID or a user/group name. - - If omitted or when set to `"-"`, the user and group of the user who - invokes systemd-tmpfiles is used. - ''; - }; - options.group = mkOption { - type = types.str; - default = "-"; - example = "root"; - description = '' - The group of the file. - - This may either be a numeric ID or a user/group name. - - If omitted or when set to `"-"`, the user and group of the user who - invokes systemd-tmpfiles is used. - ''; - }; - options.age = mkOption { - type = types.str; - default = "-"; - example = "10d"; - description = '' - Delete a file when it reaches a certain age. - - If a file or directory is older than the current time minus the age - field, it is deleted. - - If set to `"-"` no automatic clean-up is done. - ''; - }; - options.argument = mkOption { - type = types.str; - default = ""; - example = ""; - description = '' - An argument whose meaning depends on the type of operation. - - Please see the upstream documentation for the meaning of this - parameter in different situations: - - ''; - }; - })))); - }; + }); systemd.tmpfiles.packages = mkOption { type = types.listOf types.package; @@ -140,8 +166,9 @@ in systemd.additionalUpstreamSystemUnits = [ "systemd-tmpfiles-clean.service" "systemd-tmpfiles-clean.timer" - "systemd-tmpfiles-setup.service" + "systemd-tmpfiles-setup-dev-early.service" "systemd-tmpfiles-setup-dev.service" + "systemd-tmpfiles-setup.service" ]; systemd.additionalUpstreamUserUnits = [ @@ -236,11 +263,7 @@ in ''; }) ] ++ (mapAttrsToList (name: paths: - pkgs.writeTextDir "lib/tmpfiles.d/${name}.conf" (concatStrings (mapAttrsToList (path: types: - concatStrings (mapAttrsToList (_type: entry: '' - '${entry.type}' '${path}' '${entry.mode}' '${entry.user}' '${entry.group}' '${entry.age}' ${entry.argument} - '') types) - ) paths )) + pkgs.writeTextDir "lib/tmpfiles.d/${name}.conf" (mkRuleFileContent paths) ) cfg.settings); systemd.tmpfiles.rules = [ @@ -256,5 +279,62 @@ in "R! /nix/var/nix/gcroots/tmp - - - - -" "R! /nix/var/nix/temproots - - - - -" ]; + + boot.initrd.systemd = { + additionalUpstreamUnits = [ + "systemd-tmpfiles-setup-dev-early.service" + "systemd-tmpfiles-setup-dev.service" + "systemd-tmpfiles-setup.service" + ]; + + # override to exclude the prefix /sysroot, because it is not necessarily set up when the unit starts + services.systemd-tmpfiles-setup.serviceConfig = { + ExecStart = [ + "" + "systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev --exclude-prefix=/sysroot" + ]; + }; + + # sets up files under the prefix /sysroot, after the hierarchy is available and before nixos activation + services.systemd-tmpfiles-setup-sysroot = { + description = "Create Volatile Files and Directories in the Real Root"; + after = [ "initrd-fs.target" ]; + before = [ + "initrd-nixos-activation.service" + "shutdown.target" "initrd-switch-root.target" + ]; + conflicts = [ "shutdown.target" "initrd-switch-root.target" ]; + wantedBy = [ "initrd.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev --prefix=/sysroot"; + SuccessExitStatus = [ "DATAERR CANTCREAT" ]; + ImportCredential = [ + "tmpfiles.*" + "login.motd" + "login.issue" + "network.hosts" + "ssh.authorized_keys.root" + ]; + }; + unitConfig = { + DefaultDependencies = false; + RefuseManualStop = true; + }; + + }; + + contents."/etc/tmpfiles.d" = mkIf (initrdCfg.settings != { }) { + source = pkgs.linkFarm "initrd-tmpfiles.d" ( + mapAttrsToList + (name: paths: { + name = "${name}.conf"; + path = pkgs.writeText "${name}.conf" (mkRuleFileContent paths); + } + ) + initrdCfg.settings); + }; + }; }; } diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix index f47fd771c659..ed9f50941771 100644 --- a/nixos/modules/system/etc/etc-activation.nix +++ b/nixos/modules/system/etc/etc-activation.nix @@ -64,7 +64,7 @@ ] ++ lib.optionals (!config.system.etc.overlay.mutable) [ "ro" ]); - wantedBy = [ "initrd-fs.target" ]; + requiredBy = [ "initrd-fs.target" ]; before = [ "initrd-fs.target" ]; requires = lib.mkIf config.system.etc.overlay.mutable [ "rw-etc.service" ]; after = lib.mkIf config.system.etc.overlay.mutable [ "rw-etc.service" ]; diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 69f4ab92548f..ae186467ee6b 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -279,7 +279,7 @@ in ${pkgs.move-mount-beneath}/bin/move-mount --move --beneath $tmpEtcMount /etc # Unmount the top /etc mount to atomically reveal the new mount. - umount --recursive /etc + umount --lazy --recursive /etc fi '' else '' # Set up the statically computed bits of /etc. diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 5ffec126d8f0..d6d775998119 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -256,7 +256,11 @@ in live-restore = mkDefault cfg.liveRestore; runtimes = mkIf cfg.enableNvidia { nvidia = { - path = "${pkgs.nvidia-docker}/bin/nvidia-container-runtime"; + # Use the legacy nvidia-container-runtime wrapper to allow + # the `--runtime=nvidia` approach to expose + # GPU's. Starting with Docker > 25, CDI can be used + # instead, removing the need for runtime wrappers. + path = lib.getExe' pkgs.nvidia-docker "nvidia-container-runtime.legacy"; }; }; }; diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index d0f4ac7f66da..bc77292ffee9 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -84,7 +84,7 @@ in description = '' **Deprecated**, please use hardware.nvidia-container-toolkit.enable instead. - Enable use of NVidia GPUs from within podman containers. + Enable use of Nvidia GPUs from within podman containers. ''; }; @@ -170,7 +170,7 @@ in lib.mkIf cfg.enable { warnings = lib.optionals cfg.enableNvidia [ '' - You have set virtualisation.podman.enableNvidia. This option is deprecated, please set virtualisation.containers.cdi.dynamic.nvidia.enable instead. + You have set virtualisation.podman.enableNvidia. This option is deprecated, please set hardware.nvidia-container-toolkit.enable instead. '' ]; @@ -189,11 +189,6 @@ in enable = true; # Enable common /etc/containers configuration containersConf.settings = { network.network_backend = "netavark"; - } // lib.optionalAttrs cfg.enableNvidia { - engine = { - conmon_env_vars = [ "PATH=${lib.makeBinPath [ pkgs.nvidia-podman ]}" ]; - runtimes.nvidia = [ "${pkgs.nvidia-podman}/bin/nvidia-container-runtime" ]; - }; }; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 10f69f3a744a..a1aed8c4e917 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -143,6 +143,7 @@ let --transform 'flags=rSh;s|/nix/store/||' \ --files-from ${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \ | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \ + --quiet \ --force-uid=0 \ --force-gid=0 \ -L ${nixStoreFilesystemLabel} \ diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7249889b34fb..8a1512d7a266 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -192,6 +192,7 @@ in { cfssl = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cfssl.nix {}; cgit = handleTest ./cgit.nix {}; charliecloud = handleTest ./charliecloud.nix {}; + chromadb = runTest ./chromadb.nix; chromium = (handleTestOn ["aarch64-linux" "x86_64-linux"] ./chromium.nix {}).stable or {}; chrony = handleTestOn ["aarch64-linux" "x86_64-linux"] ./chrony.nix {}; chrony-ptp = handleTestOn ["aarch64-linux" "x86_64-linux"] ./chrony-ptp.nix {}; @@ -545,6 +546,7 @@ in { lomiri-camera-app = runTest ./lomiri-camera-app.nix; lomiri-clock-app = runTest ./lomiri-clock-app.nix; lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix; + lomiri-gallery-app = runTest ./lomiri-gallery-app.nix; lomiri-system-settings = handleTest ./lomiri-system-settings.nix {}; lorri = handleTest ./lorri/default.nix {}; ly = handleTest ./ly.nix {}; @@ -770,6 +772,7 @@ in { php84 = handleTest ./php { php = pkgs.php84; }; phylactery = handleTest ./web-apps/phylactery.nix {}; pict-rs = handleTest ./pict-rs.nix {}; + pingvin-share = handleTest ./pingvin-share.nix {} ; pinnwand = handleTest ./pinnwand.nix {}; plantuml-server = handleTest ./plantuml-server.nix {}; plasma-bigscreen = handleTest ./plasma-bigscreen.nix {}; @@ -826,7 +829,7 @@ in { qgis = handleTest ./qgis.nix { qgisPackage = pkgs.qgis; }; qgis-ltr = handleTest ./qgis.nix { qgisPackage = pkgs.qgis-ltr; }; qownnotes = handleTest ./qownnotes.nix {}; - qtile = handleTestOn ["x86_64-linux" "aarch64-linux"] ./qtile.nix {}; + qtile = handleTestOn ["x86_64-linux" "aarch64-linux"] ./qtile/default.nix {}; quake3 = handleTest ./quake3.nix {}; quicktun = handleTest ./quicktun.nix {}; quickwit = handleTest ./quickwit.nix {}; diff --git a/nixos/tests/cgit.nix b/nixos/tests/cgit.nix index 3107e7b964a3..073b141b14e7 100644 --- a/nixos/tests/cgit.nix +++ b/nixos/tests/cgit.nix @@ -27,6 +27,12 @@ in { desc = "some-repo description"; }; }; + settings = { + readme = [ + ":README.md" + ":date.txt" + ]; + }; }; environment.systemPackages = [ pkgs.git ]; @@ -56,18 +62,42 @@ in { git init -b master reference cd reference git remote add origin /tmp/git/some-repo - date > date.txt + { echo -n "cgit NixOS Test at "; date; } > date.txt git add date.txt git -c user.name=test -c user.email=test@localhost commit -m 'add date' git push -u origin master ''}") + # test web download server.succeed( "curl -fsS 'http://localhost/%28c%29git/some-repo/plain/date.txt?id=master' | diff -u reference/date.txt -" ) + # test http clone server.succeed( "git clone http://localhost/%28c%29git/some-repo && diff -u reference/date.txt some-repo/date.txt" ) + + # test list settings by greping for the fallback readme + server.succeed( + "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'" + ) + + # add real readme + server.succeed("sudo -u cgit ${pkgs.writeShellScript "cgit-commit-readme" '' + set -e + echo '# cgit NixOS test README' > reference/README.md + git -C reference add README.md + git -C reference -c user.name=test -c user.email=test@localhost commit -m 'add readme' + git -C reference push + ''}") + + # test list settings by greping for the real readme + server.succeed( + "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F '# cgit NixOS test README'" + ) + server.fail( + "curl -fsS 'http://localhost/%28c%29git/some-repo/about/' | grep -F 'cgit NixOS Test at'" + ) ''; }) diff --git a/nixos/tests/chromadb.nix b/nixos/tests/chromadb.nix new file mode 100644 index 000000000000..be04d10e74de --- /dev/null +++ b/nixos/tests/chromadb.nix @@ -0,0 +1,26 @@ +{ lib, pkgs, ... }: + +let + lib = pkgs.lib; + +in +{ + name = "chromadb"; + meta.maintainers = [ lib.maintainers.drupol ]; + + nodes = { + machine = + { pkgs, ... }: + { + services.chromadb = { + enable = true; + }; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("chromadb.service") + machine.wait_for_open_port(8000) + ''; +} diff --git a/nixos/tests/dae.nix b/nixos/tests/dae.nix index 42a2eb5fe0be..4b856450d9e1 100644 --- a/nixos/tests/dae.nix +++ b/nixos/tests/dae.nix @@ -15,7 +15,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { services.dae = { enable = true; config = '' - global{} + global { disable_waiting_network: true } routing{} ''; }; diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix index bce14c1ddd5c..b82f09a07ed8 100644 --- a/nixos/tests/enlightenment.nix +++ b/nixos/tests/enlightenment.nix @@ -4,6 +4,9 @@ import ./make-test-python.nix ({ pkgs, ...} : meta = with pkgs.lib.maintainers; { maintainers = [ romildo ]; + timeout = 600; + # OCR tests are flaky + broken = true; }; nodes.machine = { ... }: diff --git a/nixos/tests/harmonia.nix b/nixos/tests/harmonia.nix index a9beac82f8e1..d97f0fb89ede 100644 --- a/nixos/tests/harmonia.nix +++ b/nixos/tests/harmonia.nix @@ -7,7 +7,7 @@ harmonia = { services.harmonia = { enable = true; - signKeyPath = pkgs.writeText "cache-key" "cache.example.com-1:9FhO0w+7HjZrhvmzT1VlAZw4OSAlFGTgC24Seg3tmPl4gZBdwZClzTTHr9cVzJpwsRSYLTu7hEAQe3ljy92CWg=="; + signKeyPaths = [(pkgs.writeText "cache-key" "cache.example.com-1:9FhO0w+7HjZrhvmzT1VlAZw4OSAlFGTgC24Seg3tmPl4gZBdwZClzTTHr9cVzJpwsRSYLTu7hEAQe3ljy92CWg==")]; settings.priority = 35; }; diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix index c96e9647b411..3bfdce6c912c 100644 --- a/nixos/tests/kanidm-provisioning.nix +++ b/nixos/tests/kanidm-provisioning.nix @@ -4,6 +4,13 @@ import ./make-test-python.nix ( certs = import ./common/acme/server/snakeoil-certs.nix; serverDomain = certs.domain; + # copy certs to store to work around mount namespacing + certsPath = pkgs.runCommandNoCC "snakeoil-certs" { } '' + mkdir $out + cp ${certs."${serverDomain}".cert} $out/snakeoil.crt + cp ${certs."${serverDomain}".key} $out/snakeoil.key + ''; + provisionAdminPassword = "very-strong-password-for-admin"; provisionIdmAdminPassword = "very-strong-password-for-idm-admin"; provisionIdmAdminPassword2 = "very-strong-alternative-password-for-idm-admin"; @@ -23,8 +30,8 @@ import ./make-test-python.nix ( domain = serverDomain; bindaddress = "[::]:443"; ldapbindaddress = "[::1]:636"; - tls_chain = certs."${serverDomain}".cert; - tls_key = certs."${serverDomain}".key; + tls_chain = "${certsPath}/snakeoil.crt"; + tls_key = "${certsPath}/snakeoil.key"; }; # So we can check whether provisioning did what we wanted enableClient = true; diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index a2f4b98a728c..7e2fce20857a 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -6,6 +6,13 @@ import ./make-test-python.nix ({ pkgs, ... }: testCredentials = { password = "Password1_cZPEwpCWvrReripJmAZdmVIZd8HHoHcl"; }; + + # copy certs to store to work around mount namespacing + certsPath = pkgs.runCommandNoCC "snakeoil-certs" { } '' + mkdir $out + cp ${certs."${serverDomain}".cert} $out/snakeoil.crt + cp ${certs."${serverDomain}".key} $out/snakeoil.key + ''; in { name = "kanidm"; @@ -19,8 +26,8 @@ import ./make-test-python.nix ({ pkgs, ... }: domain = serverDomain; bindaddress = "[::]:443"; ldapbindaddress = "[::1]:636"; - tls_chain = certs."${serverDomain}".cert; - tls_key = certs."${serverDomain}".key; + tls_chain = "${certsPath}/snakeoil.crt"; + tls_key = "${certsPath}/snakeoil.key"; }; }; diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index c75610723ea4..870142017a31 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -62,7 +62,7 @@ let # NOTE: what featureGates are useful for testing might change in # the future, see link below to find new ones # https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/ - featureGates = {CPUManager = true; AppArmor= false;}; + featureGates = {AnonymousAuthConfigurableEndpoints = true; ConsistentListFromCache = false;}; masterAddress = "${masterName}.${config.networking.domain}"; }; } diff --git a/nixos/tests/lemmy.nix b/nixos/tests/lemmy.nix index d93df3646837..66bdaffbe29e 100644 --- a/nixos/tests/lemmy.nix +++ b/nixos/tests/lemmy.nix @@ -51,8 +51,8 @@ in with subtest("the backend starts and responds"): server.wait_for_open_port(${toString backendPort}) - # wait until succeeds, it just needs few seconds for migrations, but lets give it 10s max - server.wait_until_succeeds("curl --fail localhost:${toString backendPort}/api/v3/site", 10) + # wait until succeeds, it just needs few seconds for migrations, but lets give it 50s max + server.wait_until_succeeds("curl --fail localhost:${toString backendPort}/api/v3/site", 50) with subtest("the UI starts and responds"): server.wait_for_unit("lemmy-ui.service") @@ -77,7 +77,7 @@ in server.execute("systemctl stop lemmy-ui.service") def assert_http_code(url, expected_http_code, extra_curl_args=""): - _, http_code = server.execute(f'curl --silent -o /dev/null {extra_curl_args} --fail --write-out "%{{http_code}}" {url}') + _, http_code = server.execute(f'curl --location --silent -o /dev/null {extra_curl_args} --fail --write-out "%{{http_code}}" {url}') assert http_code == str(expected_http_code), f"expected http code {expected_http_code}, got {http_code}" # Caddy responds with HTTP code 502 if it cannot handle the requested path diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix new file mode 100644 index 000000000000..d8cf7466656a --- /dev/null +++ b/nixos/tests/lomiri-gallery-app.nix @@ -0,0 +1,156 @@ +{ lib, ... }: +{ + name = "lomiri-gallery-app-standalone"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + + services.xserver.enable = true; + + environment = { + systemPackages = + with pkgs; + [ + ffmpeg # make a video from the image + (imagemagick.override { ghostscriptSupport = true; }) # example image creation + mpv # URI dispatching for video support + xdotool # mouse movement + ] + ++ (with pkgs.lomiri; [ + suru-icon-theme + lomiri-gallery-app + lomiri-thumbnailer # finds new images & generates thumbnails + ]); + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts = { + packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu-classic + ]; + }; + }; + + enableOCR = true; + + testScript = + let + imageLabel = "Image"; + in + '' + machine.wait_for_x() + + with subtest("lomiri gallery launches"): + machine.succeed("lomiri-gallery-app >&2 &") + machine.sleep(2) + machine.wait_for_text(r"(Albums|Events|Photos)") + machine.screenshot("lomiri-gallery_open") + + machine.succeed("pkill -f lomiri-gallery-app") + + machine.succeed("mkdir /root/Pictures /root/Videos") + # Setup example data, OCR-friendly: + # - White square, black text + # - uppercase extension + machine.succeed("magick -size 500x500 -background white -fill black canvas:white -pointsize 70 -annotate +100+300 '${imageLabel}' /root/Pictures/output.PNG") + + # Different image formats + machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.JPG") + machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.BMP") + machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.GIF") + + # Video for dispatching + machine.succeed("ffmpeg -loop 1 -r 1 -i /root/Pictures/output.PNG -t 100 -pix_fmt yuv420p /root/Videos/output.MP4") + + with subtest("lomiri gallery handles files"): + machine.succeed("lomiri-gallery-app >&2 &") + machine.sleep(2) + machine.wait_for_text(r"(Albums|Events|Photos|${imageLabel})") + + machine.succeed("xdotool mousemove 30 40 click 1") # burger menu for categories + machine.sleep(2) + machine.succeed("xdotool mousemove 30 180 click 1") # photos + machine.sleep(2) + machine.wait_for_text("${imageLabel}") # should see thumbnail of at least one of them + machine.screenshot("lomiri-gallery_photos") + + machine.succeed("xdotool mousemove 80 140 click 1") # select newest one + machine.sleep(2) + machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar + machine.sleep(2) + + with subtest("lomiri gallery handles mp4"): + machine.succeed("xdotool mousemove 870 50 click 1") # open media information + machine.sleep(2) + machine.wait_for_text("MP4") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_mp4_info") + machine.send_key("esc") + + machine.wait_for_text("${imageLabel}") # make sure thumbnail rendering worked + + machine.succeed("xdotool mousemove 450 350 click 1") # dispatch to system's video handler + machine.wait_until_succeeds("pgrep -u root -f mpv") # wait for video to start + machine.sleep(10) + machine.succeed("pgrep -u root -f mpv") # should still be playing + machine.screenshot("lomiri-gallery_mp4_dispatch") + + machine.send_key("q") + machine.wait_until_fails("pgrep mpv") # wait for video to stop + + machine.send_key("right") + + with subtest("lomiri gallery handles gif"): + machine.succeed("xdotool mousemove 870 50 click 1") # open media information + machine.sleep(2) + machine.wait_for_text("GIF") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_gif_info") + machine.send_key("esc") + + machine.wait_for_text("${imageLabel}") # make sure media shows fine + machine.send_key("right") + + with subtest("lomiri gallery handles bmp"): + machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location) + machine.sleep(2) + machine.wait_for_text("BMP") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_bmp_info") + machine.send_key("esc") + + machine.wait_for_text("${imageLabel}") # make sure media shows fine + machine.send_key("right") + + with subtest("lomiri gallery handles jpg"): + machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location) + machine.sleep(2) + machine.wait_for_text("JPG") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_jpg_info") + machine.send_key("esc") + + machine.wait_for_text("${imageLabel}") # make sure media shows fine + machine.send_key("right") + + with subtest("lomiri gallery handles png"): + machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location) + machine.sleep(2) + machine.wait_for_text("PNG") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_png_info") + machine.send_key("esc") + + machine.wait_for_text("${imageLabel}") # make sure media shows fine + + machine.succeed("pkill -f lomiri-gallery-app") + + with subtest("lomiri gallery localisation works"): + machine.succeed("env LANG=de_DE.UTF-8 lomiri-gallery-app >&2 &") + machine.wait_for_text(r"(Alben|Ereignisse|Fotos)") + machine.screenshot("lomiri-gallery_localised") + ''; +} diff --git a/nixos/tests/pingvin-share.nix b/nixos/tests/pingvin-share.nix new file mode 100644 index 000000000000..5b1ec55add20 --- /dev/null +++ b/nixos/tests/pingvin-share.nix @@ -0,0 +1,26 @@ +import ./make-test-python.nix ( + { lib, ... }: + { + name = "pingvin-share"; + meta.maintainers = with lib.maintainers; [ ratcornu ]; + + nodes.machine = + { ... }: + { + services.pingvin-share = { + enable = true; + + backend.port = 9010; + frontend.port = 9011; + }; + }; + + testScript = '' + machine.wait_for_unit("pingvin-share-frontend.service") + machine.wait_for_open_port(9010) + machine.wait_for_open_port(9011) + machine.succeed("curl --fail http://127.0.0.1:9010/api/configs") + machine.succeed("curl --fail http://127.0.0.1:9011/") + ''; + } +) diff --git a/nixos/tests/qtile/add-widget.patch b/nixos/tests/qtile/add-widget.patch new file mode 100644 index 000000000000..622ba35a1999 --- /dev/null +++ b/nixos/tests/qtile/add-widget.patch @@ -0,0 +1,19 @@ +--- a/config.py 2024-05-31 14:49:23.852287845 +0200 ++++ b/config.py 2024-05-31 14:51:00.935182266 +0200 +@@ -29,6 +29,8 @@ + from libqtile.lazy import lazy + from libqtile.utils import guess_terminal + ++from qtile_extras import widget ++ + mod = "mod4" + terminal = guess_terminal() + +@@ -162,6 +164,7 @@ + # NB Systray is incompatible with Wayland, consider using StatusNotifier instead + # widget.StatusNotifier(), + widget.Systray(), ++ widget.AnalogueClock(), + widget.Clock(format="%Y-%m-%d %a %I:%M %p"), + widget.QuickExit(), + ], diff --git a/nixos/tests/qtile/config.nix b/nixos/tests/qtile/config.nix new file mode 100644 index 000000000000..2536b9e2a8ae --- /dev/null +++ b/nixos/tests/qtile/config.nix @@ -0,0 +1,24 @@ +{ stdenvNoCC, fetchurl }: +stdenvNoCC.mkDerivation { + name = "qtile-config"; + version = "0.0.1"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/qtile/qtile/v0.28.1/libqtile/resources/default_config.py"; + hash = "sha256-Y5W277CWVNSi4BdgEW/f7Px/MMjnN9W9TDqdOncVwPc="; + }; + + prePatch = '' + cp $src config.py + ''; + + patches = [ ./add-widget.patch ]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out + cp config.py $out/config.py + ''; +} diff --git a/nixos/tests/qtile.nix b/nixos/tests/qtile/default.nix similarity index 57% rename from nixos/tests/qtile.nix rename to nixos/tests/qtile/default.nix index 96afaa342c52..718063fa8bb5 100644 --- a/nixos/tests/qtile.nix +++ b/nixos/tests/qtile/default.nix @@ -1,15 +1,26 @@ -import ./make-test-python.nix ({ lib, ...} : { +import ../make-test-python.nix ({ lib, ...} : { name = "qtile"; meta = { maintainers = with lib.maintainers; [ sigmanificient ]; }; - nodes.machine = { pkgs, lib, ... }: { - imports = [ ./common/x11.nix ./common/user-account.nix ]; + nodes.machine = { pkgs, lib, ... }: let + # We create a custom Qtile configuration file that adds a widget from + # qtile-extras to the bar. This ensure that the qtile-extras package + # also works, and that extraPackages behave as expected. + + config-deriv = pkgs.callPackage ./config.nix { }; + in { + imports = [ ../common/x11.nix ../common/user-account.nix ]; test-support.displayManager.auto.user = "alice"; - services.xserver.windowManager.qtile.enable = true; + services.xserver.windowManager.qtile = { + enable = true; + configFile = "${config-deriv}/config.py"; + extraPackages = ps: [ ps.qtile-extras ]; + }; + services.displayManager.defaultSession = lib.mkForce "qtile"; environment.systemPackages = [ pkgs.kitty ]; diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index c94050cf816a..ee724a63f67f 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -269,9 +269,9 @@ in ''; }; - memtest86 = makeTest { + memtest86 = with pkgs.lib; optionalAttrs (meta.availableOn { inherit system; } pkgs.memtest86plus) (makeTest { name = "systemd-boot-memtest86"; - meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ]; + meta.maintainers = with maintainers; [ julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; @@ -282,7 +282,7 @@ in machine.succeed("test -e /boot/loader/entries/memtest86.conf") machine.succeed("test -e /boot/efi/memtest86/memtest.efi") ''; - }; + }); netbootxyz = makeTest { name = "systemd-boot-netbootxyz"; diff --git a/nixos/tests/web-apps/mastodon/remote-databases.nix b/nixos/tests/web-apps/mastodon/remote-databases.nix index 55243658ec6a..8dc754fe9eb0 100644 --- a/nixos/tests/web-apps/mastodon/remote-databases.nix +++ b/nixos/tests/web-apps/mastodon/remote-databases.nix @@ -10,6 +10,9 @@ let 192.168.2.103 mastodon.local ''; + postgresqlPassword = "thisisnotasecret"; + redisPassword = "thisisnotasecrettoo"; + in { name = "mastodon-remote-postgresql"; @@ -19,9 +22,7 @@ in databases = { config, ... }: { environment = { etc = { - "redis/password-redis-db".text = '' - ogjhJL8ynrP7MazjYOF6 - ''; + "redis/password-redis-db".text = redisPassword; }; }; networking = { @@ -46,16 +47,19 @@ in services.postgresql = { enable = true; - # TODO remove once https://github.com/NixOS/nixpkgs/pull/266270 is resolved. - package = pkgs.postgresql_14; enableTCPIP = true; authentication = '' - hostnossl mastodon_local mastodon_test 192.168.2.201/32 md5 + hostnossl mastodon mastodon 192.168.2.201/32 md5 ''; + ensureDatabases = [ "mastodon" ]; + ensureUsers = [ + { + name = "mastodon"; + ensureDBOwnership = true; + } + ]; initialScript = pkgs.writeText "postgresql_init.sql" '' - CREATE ROLE mastodon_test LOGIN PASSWORD 'SoDTZcISc3f1M1LJsRLT'; - CREATE DATABASE mastodon_local TEMPLATE template0 ENCODING UTF8; - GRANT ALL PRIVILEGES ON DATABASE mastodon_local TO mastodon_test; + CREATE ROLE mastodon LOGIN PASSWORD '${postgresqlPassword}'; ''; }; }; @@ -100,12 +104,8 @@ in environment = { etc = { - "mastodon/password-redis-db".text = '' - ogjhJL8ynrP7MazjYOF6 - ''; - "mastodon/password-posgressql-db".text = '' - SoDTZcISc3f1M1LJsRLT - ''; + "mastodon/password-redis-db".text = redisPassword; + "mastodon/password-posgressql-db".text = postgresqlPassword; }; }; @@ -138,8 +138,8 @@ in createLocally = false; host = "192.168.2.102"; port = 5432; - name = "mastodon_local"; - user = "mastodon_test"; + name = "mastodon"; + user = "mastodon"; passwordFile = "/etc/mastodon/password-posgressql-db"; }; smtp = { diff --git a/nixos/tests/web-apps/mastodon/standard.nix b/nixos/tests/web-apps/mastodon/standard.nix index ddc764e2168c..cd720ce9f2bf 100644 --- a/nixos/tests/web-apps/mastodon/standard.nix +++ b/nixos/tests/web-apps/mastodon/standard.nix @@ -34,9 +34,6 @@ in pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; }; - # TODO remove once https://github.com/NixOS/nixpkgs/pull/266270 is resolved. - services.postgresql.package = pkgs.postgresql_14; - services.mastodon = { enable = true; configureNginx = true; diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 05d8af554a05..6f04afebaca7 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.38.0"; + version = "1.41.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - hash = "sha256-ZVSnLH2wLPcOHkU2pO0BgIdGmULMNiacIYMRmhN+bZ8="; + hash = "sha256-WHGdA0cEB1nu7vJ+pwjdl8aZzccJ232vsbSGmZohFVo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-tcn1tRuRlHVTYvc8T/ePfCEPNjih6B9lo/hdX+WwitQ="; + hash = "sha256-CRKaH8cA/EhXQna3zCU0Z06zkB9qu6QxPJ4No3NFcs0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ardour/7.nix b/pkgs/applications/audio/ardour/7.nix index 0466742b6198..d0554a21af18 100644 --- a/pkgs/applications/audio/ardour/7.nix +++ b/pkgs/applications/audio/ardour/7.nix @@ -3,6 +3,7 @@ , fetchgit , fetchzip , fetchpatch +, fetchpatch2 , alsa-lib , aubio , boost @@ -86,6 +87,12 @@ stdenv.mkDerivation rec { url = "https://github.com/Ardour/ardour/commit/e995daa37529715214c6c4a2587e4134aaaba02f.patch"; hash = "sha256-EpXOIIObOwwcNgNma0E3nvaBad3930sagDjBpa+78WI="; }) + + # Work around itstools bug #9648 + (fetchpatch2 { + url = "https://github.com/Ardour/ardour/commit/338cd09a4aa1b36b8095dfc14ab534395f9a4a92.patch?full_index=1"; + hash = "sha256-AvV4aLdkfrxPkE4NX2ETSagq4GjEC+sHCEqdcYvL+CY="; + }) ]; # Ardour's wscript requires git revision and date to be available. diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix index d8bdd4fec98d..0c7ea944a8bf 100644 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "listenbrainz-mpd"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitea { domain = "codeberg.org"; owner = "elomatreb"; repo = "listenbrainz-mpd"; rev = "v${version}"; - hash = "sha256-xnVhPiHhI7VqkSBBlrKJBpdS6kd51DMlKWVnJIo/OQQ="; + hash = "sha256-QBc0avci232UIxzTKlS0pjL7cCuvwAFgw6dSwdtYAtU="; }; - cargoHash = "sha256-Reglc7UtsFk+VIwg4Q9TIChVrWweuV6yPWxbtTDH6mU="; + cargoHash = "sha256-jnDS9tIJ387A2P9oUSYB3tXrXjwwVmQ26erIIlHBkao="; nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 75d5dc09a613..fda748573616 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,7 +1,5 @@ { lib -# Python 3.12 demonstrates a peculiar segmentation fault with pyqt5. Using -# pyqt6 with Python 3.12 should work, but this is not released yet. -, python311Packages +, python312Packages , fetchFromGitHub , chromaprint @@ -13,7 +11,7 @@ }: let - pythonPackages = python311Packages; + pythonPackages = python312Packages; pyqt5 = if enablePlayback then pythonPackages.pyqt5-multimedia @@ -23,19 +21,20 @@ in pythonPackages.buildPythonApplication rec { pname = "picard"; # nix-update --commit picard --version-regex 'release-(.*)' - version = "2.12"; + version = "2.12.1"; format = "setuptools"; src = fetchFromGitHub { owner = "metabrainz"; repo = "picard"; rev = "refs/tags/release-${version}"; - hash = "sha256-+++NDJzXw4tA5eQd24r+l3UK3YS8Jy1t9WNiEU9sH0Q="; + hash = "sha256-wKPE4lj3DIlY+X5A/MqhnwyrhPTXGjmUnLK1VWXUOas="; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook + pythonPackages.pytestCheckHook ] ++ lib.optionals (pyqt5.multimediaEnabled) [ gst_all_1.gst-libav gst_all_1.gst-plugins-base @@ -68,6 +67,7 @@ pythonPackages.buildPythonApplication rec { preCheck = '' export HOME=$(mktemp -d) ''; + doCheck = true; # In order to spare double wrapping, we use: preFixup = '' @@ -76,12 +76,13 @@ pythonPackages.buildPythonApplication rec { makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; - meta = with lib; { + meta = { homepage = "https://picard.musicbrainz.org"; changelog = "https://picard.musicbrainz.org/changelog"; description = "Official MusicBrainz tagger"; mainProgram = "picard"; - license = licenses.gpl2Plus; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index 9cf419f0b763..6a6f7efd612e 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -16,13 +16,13 @@ let in rustPlatform.buildRustPackage rec { pname = "psst"; - version = "unstable-2024-07-29"; + version = "unstable-2024-08-19"; src = fetchFromGitHub { owner = "jpochyla"; repo = pname; - rev = "d895cb94623d320f79b364a8f63ab518fddf697b"; - hash = "sha256-LsveuaDmRvC9TUON847QdzqQDUW1zd37++MbtXrfJjk="; + rev = "11bef15e66a3c9b0b991207d09a67c071b3dda02"; + hash = "sha256-lKxWIUDouUUul7CpuTy30z/cLJAjFE9e0J1zyZ/PnIo="; }; cargoLock = { diff --git a/pkgs/applications/audio/psst/make-build-reproducible.patch b/pkgs/applications/audio/psst/make-build-reproducible.patch index f6e55ce29718..866d08217590 100644 --- a/pkgs/applications/audio/psst/make-build-reproducible.patch +++ b/pkgs/applications/audio/psst/make-build-reproducible.patch @@ -54,7 +54,7 @@ index fcbd491..8f6e6f0 100644 -pub const GIT_VERSION: &str = git_version!(); -pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt")); -pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt")); -+pub const GIT_VERSION: &str = "d895cb94623d320f79b364a8f63ab518fddf697b"; ++pub const GIT_VERSION: &str = "11bef15e66a3c9b0b991207d09a67c071b3dda02"; +pub const BUILD_TIME: &str = "1970-01-01 00:00:00"; +pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst"; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 3ebe1375671f..d00a0e841ba6 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.69.2"; + version = "1.70"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Vy8b9rbYM/bK/mCUW4V4rPeAmoBN/wn7iVBANSboL2Q="; + sha256 = "sha256-oGdgvyVIqM4YVxyr5DFBJ+YLtH95vqbNv0arD9yskdo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index da77d6aeb5de..b134aa4b43d1 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -1,28 +1,28 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, python3Packages -, ffmpeg -, flac -, libjxl -, librsvg -, game-music-emu -, gobject-introspection -, gtk3 -, kissfft -, libappindicator -, libnotify -, libsamplerate -, libvorbis -, miniaudio -, mpg123 -, libopenmpt -, opusfile -, wavpack -, pango -, pulseaudio -, withDiscordRPC ? false +{ + lib, + stdenv, + fetchFromGitHub, + kissfft, + miniaudio, + pkg-config, + python3Packages, + gobject-introspection, + flac, + game-music-emu, + gtk3, + libappindicator, + libnotify, + libopenmpt, + librsvg, + libsamplerate, + libvorbis, + mpg123, + opusfile, + pango, + wavpack, + ffmpeg, + pulseaudio, + withDiscordRPC ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -46,26 +46,23 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace tauon.py \ - --replace 'install_mode = False' 'install_mode = True' \ - --replace 'install_directory = os.path.dirname(os.path.abspath(__file__))' 'install_directory = "${placeholder "out"}/share/tauon"' + --replace-fail 'install_mode = False' 'install_mode = True' \ + --replace-fail 'install_directory = os.path.dirname(os.path.abspath(__file__))' 'install_directory = "${placeholder "out"}/share/tauon"' substituteInPlace t_modules/t_main.py \ - --replace 'install_mode = False' 'install_mode = True' \ - --replace 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so' \ - --replace 'lib/libphazor.so' '../../lib/libphazor.so' + --replace-fail 'install_mode = False' 'install_mode = True' \ + --replace-fail 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so' substituteInPlace t_modules/t_phazor.py \ - --replace 'lib/libphazor.so' '../../lib/libphazor.so' + --replace-fail 'lib/libphazor.so' '../../lib/libphazor.so' - patchShebangs compile-phazor.sh + substituteInPlace compile-phazor.sh --replace-fail 'gcc' '${stdenv.cc.targetPrefix}cc' - substituteInPlace compile-phazor.sh --replace 'gcc' '${stdenv.cc.targetPrefix}cc' - - substituteInPlace extra/tauonmb.desktop --replace 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon' + substituteInPlace extra/tauonmb.desktop --replace-fail 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon' ''; postBuild = '' - ./compile-phazor.sh + bash ./compile-phazor.sh ''; nativeBuildInputs = [ @@ -90,32 +87,38 @@ stdenv.mkDerivation (finalAttrs: { wavpack ]; - pythonPath = with python3Packages; [ - beautifulsoup4 - gst-python - dbus-python - isounidecode - libjxl - musicbrainzngs - mutagen - natsort - pillow - plexapi - pycairo - pychromecast - pylast - pygobject3 - pylyrics - pysdl2 - requests - send2trash - setproctitle - ] ++ lib.optional withDiscordRPC pypresence + pythonPath = + with python3Packages; + [ + beautifulsoup4 + dbus-python + isounidecode + jxlpy + musicbrainzngs + mutagen + natsort + pillow + plexapi + pycairo + pychromecast + pylast + pygobject3 + pysdl2 + requests + send2trash + setproctitle + ] + ++ lib.optional withDiscordRPC pypresence ++ lib.optional stdenv.isLinux pulsectl; makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ffmpeg]}" - "--prefix LD_LIBRARY_PATH : ${pulseaudio}/lib" + "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + game-music-emu + pulseaudio + ] + }" "--prefix PYTHONPATH : $out/share/tauon" "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH" ]; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 0d02e5a686a1..db7cdf11ba9c 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -36,8 +36,8 @@ let pffft-source = fetchFromBitbucket { owner = "jpommier"; repo = "pffft"; - rev = "38946c766c1afecfa4c5945af77913e38b3cec31"; - sha256 = "1w6g9v9fy7bavqacb6qw1nxhcik2w36cvl2d7b0bh68w0pd70j5q"; + rev = "fbc4058602803f40dc554b8a5d2bcc694c005f2f"; + sha256 = "16biji3115232cr1j975hpxw68lfybajlspnhfjcwg8jz2d8ybrf"; }; fuzzysearchdatabase-source = fetchFromBitbucket { owner = "j_norberg"; @@ -64,28 +64,28 @@ let sha256 = "1d3058x6wgzw7b0wai792flk7s6ffw0z4n9sl016v91yjwv7ds3a"; }; oui-blendish-source = fetchFromGitHub { - owner = "AndrewBelt"; + owner = "VCVRack"; repo = "oui-blendish"; rev = "2fc6405883f8451944ed080547d073c8f9f31898"; - sha256 = "/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8="; + sha256 = "1bs0654312555vm7nzswsmky4l8759bjdk17pl22p49rw9k4a1px"; }; simde-source = fetchFromGitHub { owner = "simd-everywhere"; repo = "simde"; - rev = "b309d8951997201e493380a2fd09198c09ae1b4e"; - sha256 = "1hz8mfbhbiafvim4qrkyvh1yndlhydqkxwhls7cfqa48wkpxfip8"; + rev = "416091ebdb9e901b29d026633e73167d6353a0b0"; + sha256 = "064ygc6c737yjx04rydwwhkr4n4s4rbvj27swxwyzvp1h8nka6xf"; }; tinyexpr-source = fetchFromGitHub { owner = "codeplea"; repo = "tinyexpr"; - rev = "74804b8c5d296aad0866bbde6c27e2bc1d85e5f2"; - sha256 = "0z3r7wfw7p2wwl6wls2nxacirppr2147yz29whxmjaxy89ic1744"; + rev = "9907207e5def0fabdb60c443517b0d9e9d521393"; + sha256 = "0xbpd09zvrk2ppm1qm1skk6p50mqr9mzjixv3s0biqq6jpabs88l"; }; fundamental-source = fetchFromGitHub { owner = "VCVRack"; repo = "Fundamental"; - rev = "962547d7651260fb6a04f4d8aafd7c27f0221bee"; # tip of branch v2 - sha256 = "066gcjkni8ba98vv0di59x3f9piir0vyy5sb53cqrbrl51x853cg"; + rev = "5ed79544161e0fa9a55faa7c0a5f299e828e12ab"; # tip of branch v2 + sha256 = "0c6qpigyr0ppvra20hcy1fdcmqa212jckb9wkx4f6fgdby7565wv"; }; vcv-rtaudio = stdenv.mkDerivation rec { pname = "vcv-rtaudio"; @@ -112,7 +112,7 @@ let in stdenv.mkDerivation rec { pname = "vcv-rack"; - version = "2.4.1"; + version = "2.5.1"; desktopItems = [ (makeDesktopItem { @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - hash = "sha256-Gn/sFltLXX2mLv4dDqmr/UPd+JBXVkIZGwMI6Rm0Ih4="; + sha256 = "1q2bwjfn6crk9lyd6m3py0v754arw1xgpv5kkj6ka1bc2yz839qh"; }; patches = [ diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index a295994808e5..62a6ac58b7b4 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -23,16 +23,16 @@ rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.24.3"; + version = "0.25.0"; src = fetchFromGitHub { owner = "mtkennerly"; repo = "ludusavi"; rev = "v${version}"; - hash = "sha256-FtLLj5uFcKuRTCSsSuyj0XGzFMVWQvVk4dTmBCmzfNs="; + hash = "sha256-GjecssOc5xVni73uNRQ/GaZmIdM9r09I8GpPK+jwoAY="; }; - cargoHash = "sha256-xC6HiXt8cfrDtno9IrOe8SP7WBL79paLI223fjxPsbg="; + cargoHash = "sha256-9QaQjb7bdDl4NWKbV+dfu9BgFU8NO3CZEvKSXujMUtI="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 668ccbd31ae2..5384966db3a6 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -4124,7 +4124,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-storage-weight-reclaim" -version = "7.0.0" +version = "7.0.1" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-proof-size-hostfunction", @@ -4142,11 +4142,9 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" -version = "0.15.0" +version = "0.15.1" dependencies = [ "cumulus-primitives-core", - "futures", - "parity-scale-codec", "sp-inherents", "sp-timestamp", ] @@ -5961,7 +5959,7 @@ dependencies = [ [[package]] name = "frame-system" -version = "37.0.0" +version = "37.1.0" dependencies = [ "cfg-if", "criterion", @@ -8383,9 +8381,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memfd" @@ -12614,7 +12612,7 @@ dependencies = [ [[package]] name = "polkadot" -version = "16.0.0" +version = "16.0.1" dependencies = [ "assert_cmd", "color-eyre", @@ -12691,7 +12689,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "17.0.0" +version = "17.0.1" dependencies = [ "assert_matches", "derive_more", @@ -13084,7 +13082,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "17.0.0" +version = "17.1.0" dependencies = [ "assert_matches", "async-trait", @@ -13101,8 +13099,10 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-primitives-test-helpers", + "sp-application-crypto", "sp-core", "sp-keyring", + "sp-keystore", "sp-maybe-compressed-blob", "tracing-gum", ] @@ -13194,26 +13194,20 @@ dependencies = [ [[package]] name = "polkadot-node-core-prospective-parachains" -version = "16.0.0" +version = "16.1.0" dependencies = [ "assert_matches", - "bitvec", "fatality", "futures", - "parity-scale-codec", - "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", - "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "rand", "rstest", - "sc-keystore", - "sp-application-crypto", "sp-core", - "sp-keyring", - "sp-keystore", + "sp-tracing", "thiserror", "tracing-gum", ] @@ -13519,7 +13513,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "17.0.0" +version = "17.1.0" dependencies = [ "async-trait", "bitvec", @@ -13548,7 +13542,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "17.0.0" +version = "17.1.0" dependencies = [ "assert_matches", "async-trait", @@ -13868,7 +13862,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "16.0.0" +version = "16.0.1" dependencies = [ "assert_matches", "bitflags 1.3.2", @@ -14429,7 +14423,7 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "17.0.0" +version = "17.0.1" dependencies = [ "assert_matches", "async-trait", @@ -17189,7 +17183,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" -version = "0.29.0" +version = "0.29.1" dependencies = [ "ahash 0.8.11", "array-bytes", @@ -18642,12 +18636,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" dependencies = [ "indexmap 2.2.3", "itoa", + "memchr", "ryu", "serde", ] @@ -19690,7 +19685,7 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "37.0.0" +version = "37.0.1" dependencies = [ "futures", "parity-scale-codec", diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 65ce156ecef5..9a1aba5de6eb 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -1,5 +1,4 @@ { fetchFromGitHub -, fetchpatch , lib , openssl , pkg-config @@ -18,13 +17,13 @@ let in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "stable2407"; + version = "stable2407-1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-${version}"; - hash = "sha256-g+jReHOAkaWjr1yJILFL4mSYGEfRBlSCrUHp8ro22SA="; + hash = "sha256-IYRkXmFBjRAYSROL37EgEjC7wM1N97HabuSHtcSUxdg="; # 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. @@ -52,15 +51,6 @@ rustPlatform.buildRustPackage rec { }; }; - cargoPatches = [ - # NOTE: bump `time` dependency to be able to build with rust 1.80 - # should be removed on the next release - (fetchpatch { - url = "https://github.com/paritytech/polkadot-sdk/pull/5149.patch"; - hash = "sha256-FNG9XLeMRJOT6k7mcs6GemtQ3oUrH/hOYG0JNQP0akU="; - }) - ]; - buildType = "production"; cargoBuildFlags = [ "-p" "polkadot" ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index b6ac04e44502..77365da2b596 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -23,10 +23,6 @@ lib.packagesFromDirectoryRecursive { inherit (pkgs) basedpyright git go gopls python3; }; - matrix-client = callPackage ./manual-packages/matrix-client { - _map = self.map; - }; - structured-haskell-mode = self.shm; texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; }; @@ -48,5 +44,6 @@ lib.packagesFromDirectoryRecursive { ess-R-object-popup = throw "emacsPackages.ess-R-object-popup was deleted, since the upstream repo looks abandoned."; # Added 2024-07-15 ghc-mod = throw "emacsPackages.ghc-mod was deleted because it is deprecated, use haskell-language-server instead."; # Added 2024-07-17 haskell-unicode-input-method = throw "emacsPackages.haskell-unicode-input-method is contained in emacsPackages.haskell-mode, please use that instead."; # Added 2024-07-17 + matrix-client = throw "emacsPackages.matrix-client is deprecated in favor of emacsPackages.ement."; # Added 2024-08-17 perl-completion = throw "emacsPackages.perl-completion was removed, since it is broken."; # Added 2024-07-19 } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix index 07e909b34a68..f24a1e6682b7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix @@ -23,6 +23,8 @@ melpaBuild { popon ]; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix index 1e411af1a871..8a37b99d8b1d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix @@ -15,6 +15,8 @@ melpaBuild { files = ''("acm/*.el" "acm/icons")''; + ignoreCompilationError = false; + meta = { description = "Asynchronous Completion Menu"; homepage = "https://github.com/manateelazycat/lsp-bridge"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix index 5eec518036ea..d02b2b29ce6a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix @@ -8,6 +8,8 @@ melpaBuild { files = ''("src/data/emacs-mode/*.el")''; + ignoreCompilationError = false; + meta = { inherit (Agda.meta) homepage license; description = "Agda2-mode for Emacs extracted from Agda package"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix index 59be7f543d1c..de7c69fd4dd6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix @@ -25,6 +25,8 @@ melpaBuild { }) ]; + ignoreCompilationError = false; + passthru.updateScript = gitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix index 5a352c5c3bc4..058aa722ef8a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix @@ -13,6 +13,8 @@ melpaBuild { hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4="; }; + ignoreCompilationError = false; + meta = { homepage = "https://www.emacswiki.org/emacs/control-lock.el"; description = "Like caps-lock, but for your control key"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix index 2225dff0872d..37f8c81ce08e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -30,6 +30,8 @@ melpaBuild { propagatedUserEnvPkgs = [ nodejs ]; + ignoreCompilationError = false; + meta = { description = "Unofficial copilot plugin for Emacs"; homepage = "https://github.com/copilot-emacs/copilot.el"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index b6c53e26c5ed..d37153261edf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -13,6 +13,8 @@ melpaBuild rec { hash = "sha256-GFEDWT88Boz/DxEcmFgf7u2NOoMjAN05yRiYwoYtvXc="; }; + ignoreCompilationError = false; + meta = { homepage = "https://gitweb.gentoo.org/proj/ebuild-mode.git/"; description = "Major modes for Gentoo package files"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix index b69423e58331..fe4d9d33ee91 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix @@ -21,6 +21,8 @@ melpaBuild { files = ''(:defaults "msg")''; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix index 3bc5b686e548..59922d11a39e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix @@ -27,6 +27,8 @@ melpaBuild { make ''; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix index fea6905e6f31..aa5be89a9b3d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix index 57249b72fbb8..2140665296b6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix @@ -23,6 +23,8 @@ melpaBuild { markdown-mode ]; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix index 93d963a09e08..4c615d0e6cc8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix @@ -17,6 +17,8 @@ melpaBuild { hash = "sha256-er+knxqAejgKAtOnhqHfsGN286biHFdeMIUlbW7JyYw="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix index b1a490fb2c9b..66f6f8c59c7f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-xwVCAdxnIRHrFNWvtlM3u6CShsUiGgl1CiBTsp2x7IM="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix index 0b8b5108043c..cb81a81cc4a0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-3QDw4W3FbFvb2zpkDHAo9BJKxs3LaehyvUVJPKqS9RE="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix index 8e99b427cb44..4a03ad5d97df 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix @@ -22,6 +22,8 @@ melpaBuild { helm ]; + ignoreCompilationError = false; + meta = { homepage = "https://github.com/emacsmirror/helm-words"; description = "Helm extension for looking up words in dictionaries and thesauri"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix index efa79b9ebb05..d44afbeaf3e6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix @@ -16,6 +16,8 @@ melpaBuild { packageRequires = [ haskell-mode ]; + ignoreCompilationError = false; + meta = { inherit (hsc3.meta) homepage license; description = "Emacs mode for hsc3"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix index 59b584d9f9c8..0228bd8f414a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-Xbt0D9EgmvN1hDTeLbdxq1ARHObj8M4GfH2sbFILRTI="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix index 2a7b7b571d12..d9510a9c3e10 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix @@ -24,6 +24,8 @@ melpaBuild { prop-menu ]; + ignoreCompilationError = false; + passthru.updateScript = gitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix index 84dd7a194166..8bc3a667b109 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix @@ -17,6 +17,8 @@ melpaBuild { hash = "sha256-h/jkIWjkLFbtBp9F+lhA3CulYy2XaeloLmexR0CDm3E="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix index c97d3cc2d491..72f4141df79e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-Xli7TxBenl5cDMJv3Qz7ZELFpvJKStMploLpf9a+uoA="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix index 418f201fa933..74e25b096b2b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix @@ -27,6 +27,8 @@ melpaBuild rec { mv tmp.el jam-mode.el ''; + ignoreCompilationError = false; + meta = { description = "Emacs major mode for editing Jam files"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix index 045d3f759761..f1055f50f3dd 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix @@ -19,6 +19,8 @@ melpaBuild { files = ''("tools/emacs/ligo-mode.el")''; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix index 9fef79b3312d..befbf9df198b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix @@ -9,6 +9,8 @@ melpaBuild { "llvm/utils/emacs/README") ''; + ignoreCompilationError = false; + meta = { inherit (llvmPackages.llvm.meta) homepage license; description = "Major mode for the LLVM assembler language"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 86687a34b9fb..fca8127aedbb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -87,6 +87,8 @@ melpaBuild { __darwinAllowLocalNetworking = true; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix index 78325d90bf78..55a07cd66e68 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix @@ -24,6 +24,8 @@ melpaBuild { # to compile lspce.el, it needs lspce-module.so files = ''(:defaults "${lib.getLib lspce-module}/lib/lspce-module.*")''; + ignoreCompilationError = false; + passthru = { inherit lspce-module; updateScript = nix-update-script { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix deleted file mode 100644 index 59f4b8368139..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - melpaBuild, - fetchFromGitHub, - fetchpatch, - # Emacs packages - _map, - a, - anaphora, - cl-lib, - dash, - dash-functional, - esxml, - f, - frame-purpose, - ht, - ov, - rainbow-identifiers, - request, - s, - tracking, -}: - -melpaBuild { - pname = "matrix-client"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "alphapapa"; - repo = "matrix-client.el"; - rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed"; - hash = "sha256-GLM8oCbm6PdEZPsM0ogMtNJr8mWjCKoX6ed5AUrYjuk="; - }; - - patches = [ - # Fix: avatar loading when imagemagick support is not available - (fetchpatch { - url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch"; - hash = "sha256-dXUa/HKDe+UjaXYTvgwPdXDuDcHB2HLPGWHboE+Lex0="; - }) - ]; - - packageRequires = [ - _map - a - anaphora - cl-lib - dash - dash-functional - esxml - f - frame-purpose - ht - ov - rainbow-identifiers - request - s - tracking - ]; - - meta = { - description = "Chat client and API wrapper for Matrix.org"; - license = lib.licenses.gpl3Plus; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix index 430b8af291a4..99cd5c6aa9e3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix @@ -27,6 +27,8 @@ elpaBuild { popd ''; + ignoreCompilationError = false; + meta = mu.meta // { description = "Full-featured e-mail client"; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix index fbcd006d666b..f5e5f7cf9278 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix @@ -59,6 +59,8 @@ melpaBuild { install -D --target-directory=$out/bin source/notdeft-xapian ''; + ignoreCompilationError = false; + passthru = { updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix index ac208e29dbf4..94499d71521e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix @@ -15,6 +15,8 @@ melpaBuild { popd ''; + ignoreCompilationError = false; + meta = { description = "Emacs ott mode (from ott sources)"; inherit (ott.meta) homepage license; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix index 51c4fb1f8b1f..3a42b349c51c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix @@ -26,6 +26,8 @@ melpaBuild { install -Dm644 -t ''${!outputDoc}/share/doc/pod-mode/ $sourceRoot/ChangeLog $sourceRoot/README ''; + ignoreCompilationError = false; + meta = { homepage = "https://metacpan.org/dist/pod-mode"; description = "Major mode for editing .pod-files"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix index 41ce7957e758..c5e20aae5e22 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix @@ -3,13 +3,17 @@ fetchFromGitHub, melpaBuild, js2-mode, + lsp-mode, }: melpaBuild { pname = "prisma-mode"; version = "0-unstable-2021-12-07"; - packageRequires = [ js2-mode ]; + packageRequires = [ + js2-mode + lsp-mode + ]; src = fetchFromGitHub { owner = "pimeys"; @@ -18,6 +22,8 @@ melpaBuild { hash = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I="; }; + ignoreCompilationError = false; + meta = { description = "Major mode for Prisma Schema Language"; license = lib.licenses.gpl2Only; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix index 41c9363fbf4a..817598551977 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix @@ -19,6 +19,8 @@ melpaBuild { --replace-fail ";; prolog.el ---" ";;; prolog.el ---" ''; + ignoreCompilationError = false; + meta = { homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/"; description = "Prolog mode for Emacs"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix index aee5c8ba2dbf..b44b2281d59c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix @@ -19,6 +19,8 @@ melpaBuild { hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM="; }; + ignoreCompilationError = false; + passthru.updateScript = gitUpdater { }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix index 7cf5a63f4b6c..ee50bda060bf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix @@ -17,6 +17,8 @@ melpaBuild { hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix index 0227fcefc152..8454c581e24a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix @@ -13,6 +13,8 @@ melpaBuild { hash = "sha256-VXz3pO6N94XM8FzLSAoYrj3NEh4wp0UiuG6ad8M7nVU="; }; + ignoreCompilationError = false; + meta = { homepage = "https://www.emacswiki.org/emacs/sv-kalender.el"; description = "Swedish calendar for Emacs"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix index ca83eb04a336..f92bfed79c34 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix @@ -10,6 +10,8 @@ melpaBuild { files = ''("emacs/*.el")''; + ignoreCompilationError = false; + meta = { inherit (texpresso.meta) homepage license; description = "Emacs mode for TeXpresso"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix index 5f04332db117..a0e8969f466b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix @@ -44,6 +44,8 @@ melpaStablePackages.tree-sitter-langs.overrideAttrs(old: { fi '') plugins); + ignoreCompilationError = false; + passthru = old.passthru or {} // { inherit plugins; withPlugins = fn: final.tree-sitter-langs.override { plugins = fn tree-sitter-grammars; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/Cargo.lock b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/Cargo.lock new file mode 100644 index 000000000000..7565a59cf88c --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/Cargo.lock @@ -0,0 +1,285 @@ +# 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 = "cc" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "ctor" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "darling" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "emacs" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6797a940189d353de79bec32abe717aeeecd79a08236e84404c888354e040665" +dependencies = [ + "anyhow", + "ctor", + "emacs-macros", + "emacs_module", + "once_cell", + "rustc_version", + "thiserror", +] + +[[package]] +name = "emacs-macros" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69656fdfe7c2608b87164964db848b5c3795de7302e3130cce7131552c6be161" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "emacs-tree-sitter" +version = "0.18.0" +dependencies = [ + "emacs", + "libloading", + "once_cell", + "tree-sitter", +] + +[[package]] +name = "emacs_module" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3067bc974045ed2c6db333bd4fc30d3bdaafa6421a9a889fa7b2826b6f7f2fa" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "libloading" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "once_cell" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + +[[package]] +name = "proc-macro2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + +[[package]] +name = "syn" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "thiserror" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tree-sitter" +version = "0.20.0" +source = "git+https://github.com/ubolonton/tree-sitter?branch=improve-text-provider#475b822f47bdc58d832533448b6f6d9818554f37" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix index d69a2f16247b..cb020bc7efaf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix @@ -1,70 +1,52 @@ { lib -, symlinkJoin , melpaBuild , fetchFromGitHub , rustPlatform - -, runtimeShell -, writeScript -, python3 -, nix-prefetch-github -, nix +, stdenv +, nix-update-script }: let + libExt = stdenv.hostPlatform.extensions.sharedLibrary; - srcMeta = lib.importJSON ./src.json; - inherit (srcMeta) version; - - src = fetchFromGitHub srcMeta.src; - - tsc = melpaBuild { - inherit src; - inherit version; - - pname = "tsc"; - - sourceRoot = "${src.name}/core"; - }; - - tsc-dyn = rustPlatform.buildRustPackage { - inherit version; - inherit src; - + tsc-dyn = rustPlatform.buildRustPackage rec { pname = "tsc-dyn"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "emacs-tree-sitter"; + repo = "emacs-tree-sitter"; + rev = version; + hash = "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tree-sitter-0.20.0" = "sha256-hGiJZFrQpO+xHXosbEKV2k64e2D8auNGEtdrFk2SsOU="; + }; + }; - nativeBuildInputs = [ rustPlatform.bindgenHook ]; sourceRoot = "${src.name}/core"; postInstall = '' - LIB=($out/lib/libtsc_dyn.*) - TSC_PATH=$out/share/emacs/site-lisp/elpa/tsc-${version} - install -d $TSC_PATH - install -m444 $out/lib/libtsc_dyn.* $TSC_PATH/''${LIB/*libtsc_/tsc-} - echo -n $version > $TSC_PATH/DYN-VERSION - rm -r $out/lib + pushd $out/lib + mv --verbose libtsc_dyn${libExt} tsc-dyn${libExt} + echo -n $version > DYN-VERSION + popd ''; - - inherit (srcMeta) cargoHash; }; +in melpaBuild { + pname = "tsc"; + inherit (tsc-dyn) version src; -in symlinkJoin { - name = "tsc-${version}"; - paths = [ tsc tsc-dyn ]; + files = ''("core/*.el" "${tsc-dyn}/lib/*")''; + + ignoreCompilationError = false; passthru = { - updateScript = let - pythonEnv = python3.withPackages(ps: [ ps.requests ]); - in writeScript "tsc-update" '' - #!${runtimeShell} - set -euo pipefail - export PATH=${lib.makeBinPath [ - nix-prefetch-github - nix - pythonEnv - ]}:$PATH - exec python3 ${builtins.toString ./update.py} ${builtins.toString ./.} - ''; + inherit tsc-dyn; + updateScript = nix-update-script { attrPath = "emacsPackages.tsc.tsc-dyn"; }; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json deleted file mode 100644 index b3ac6a030644..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "src": { - "owner": "emacs-tree-sitter", - "repo": "elisp-tree-sitter", - "rev": "909717c685ff5a2327fa2ca8fb8a25216129361c", - "hash": "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=" - }, - "version": "0.18.0", - "cargoHash": "sha256-IRCZqszBkGF8anF/kpcPOzHdOP4lAtJBAp6FS5tAOx8=" -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py deleted file mode 100644 index 77ef632ded6e..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/env python3 -from textwrap import dedent -from os.path import ( - abspath, - dirname, - join, -) -from typing import ( - Dict, - Any, -) -import subprocess -import tempfile -import json -import sys -import re - -import requests - - -def eval_drv(nixpkgs: str, expr: str) -> Any: - expr = "\n".join( - ( - "with (import %s {});" % nixpkgs, - expr, - ) - ) - - with tempfile.NamedTemporaryFile(mode="w") as f: - f.write(dedent(expr)) - f.flush() - p = subprocess.run( - ["nix-instantiate", "--json", f.name], stdout=subprocess.PIPE, check=True - ) - - return p.stdout.decode().strip() - - -def get_src(tag_name: str) -> Dict[str, str]: - p = subprocess.run( - [ - "nix-prefetch-github", - "--rev", - tag_name, - "--json", - "emacs-tree-sitter", - "elisp-tree-sitter", - ], - stdout=subprocess.PIPE, - check=True, - ) - src = json.loads(p.stdout) - - fields = ["owner", "repo", "rev", "hash"] - - return {f: src[f] for f in fields} - - -def get_cargo_hash(drv_path: str): - # Note: No check=True since we expect this command to fail - p = subprocess.run(["nix-store", "-r", drv_path], stderr=subprocess.PIPE) - - stderr = p.stderr.decode() - lines = iter(stderr.split("\n")) - - for l in lines: - if l.startswith("error: hash mismatch in fixed-output derivation"): - break - else: - raise ValueError("Did not find expected hash mismatch message") - - for l in lines: - m = re.match(r"\s+got:\s+(.+)$", l) - if m: - return m.group(1) - - raise ValueError("Could not extract actual hash: ", stderr) - - -if __name__ == "__main__": - cwd = sys.argv[1] - - # This should point to the root default.nix of Nixpkgs tree - nixpkgs = abspath(join(cwd, "../../../../../../..")) - - tag_name = requests.get( - "https://api.github.com/repos/emacs-tree-sitter/elisp-tree-sitter/releases/latest" - ).json()["tag_name"] - - src = get_src(tag_name) - - with tempfile.NamedTemporaryFile(mode="w") as f: - json.dump(src, f) - f.flush() - - drv_path = eval_drv( - nixpkgs, - """ - rustPlatform.buildRustPackage rec { - pname = "tsc-dyn"; - version = "%s"; - nativeBuildInputs = [ clang ]; - src = fetchFromGitHub (lib.importJSON %s); - sourceRoot = "${src.name}/core"; - cargoHash = lib.fakeHash; - } - """ - % (tag_name, f.name), - ) - - cargo_hash = get_cargo_hash(drv_path) - - with open(join(cwd, "src.json"), mode="w") as f: - json.dump( - { - "src": src, - "version": tag_name, - "cargoHash": cargo_hash, - }, - f, - indent=2, - ) - f.write("\n") diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix index d5b597bdf47b..0d000a43d738 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix @@ -20,6 +20,8 @@ melpaBuild { dontConfigure = true; + ignoreCompilationError = false; + meta = { description = "Major mode for editing Ur/Web"; inherit (urweb.meta) license homepage; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix index dbbec44f9ccc..94e3d17828f2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix @@ -15,6 +15,7 @@ porthole, unstableGitUpdater, yasnippet, + el-patch, }: melpaBuild { @@ -45,8 +46,11 @@ melpaBuild { nav-flash porthole yasnippet + el-patch ]; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix index e4bb260d14b4..da9bde05eba9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-jV5V3TRY+D3cPSz3yFwVWn9yInhGOYIaUTPEhsOBxto="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix index 2981cb8f4711..41c0fcc1fdad 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix @@ -13,6 +13,8 @@ melpaBuild { hash = "sha256-ceCOBFfixmGVB3kaSvOv1YZThC2pleYnS8gXhLrjhA8="; }; + ignoreCompilationError = false; + meta = { homepage = "https://www.emacswiki.org/emacs/yes-no.el"; description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix index d3e5a5cfbbb3..b8bb5cd8dc33 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix @@ -16,6 +16,8 @@ melpaBuild { hash = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4="; }; + ignoreCompilationError = false; + passthru.updateScript = unstableGitUpdater { }; meta = { diff --git a/pkgs/applications/editors/heh/default.nix b/pkgs/applications/editors/heh/default.nix index cf36720b33f2..bd7907f7682c 100644 --- a/pkgs/applications/editors/heh/default.nix +++ b/pkgs/applications/editors/heh/default.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "heh"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "ndd7xv"; repo = pname; rev = "v${version}"; - hash = "sha256-P3EZSe5Zv7pJ2QwKvtBh5kz93y6DBWkj6s8v3+8Xp9Q="; + hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit ]); - cargoHash = "sha256-l3XR6srs6RmvcGjMFni6wYLLqXE8mMUq59WFLKGQl3U="; + cargoHash = "sha256-rLZgKLL28/ZrXzHVI6m4YeV2mk4E9W58HjTzRl2bMOw="; meta = with lib; { description = "Cross-platform terminal UI used for modifying file data in hex or ASCII"; diff --git a/pkgs/applications/editors/jetbrains/bin/linux.nix b/pkgs/applications/editors/jetbrains/bin/linux.nix index d9f0391ba8da..b1ddb8f5cb62 100644 --- a/pkgs/applications/editors/jetbrains/bin/linux.nix +++ b/pkgs/applications/editors/jetbrains/bin/linux.nix @@ -59,6 +59,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { startupWMClass = wmClass; }; + vmoptsIDE = if hiName == "WEBSTORM" then "WEBIDE" else hiName; vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts); nativeBuildInputs = [ makeWrapper patchelf unzip autoPatchelfHook ]; @@ -103,7 +104,14 @@ with stdenv; lib.makeOverridable mkDerivation (rec { jdk=${jdk.home} item=${desktopItem} - wrapProgram "$out/$pname/bin/${loName}.sh" \ + launcher="$out/$pname/bin/${loName}" + if [ -e "$launcher" ]; then + rm "$launcher".sh # We do not wrap the old script-style launcher anymore. + else + launcher+=.sh + fi + + wrapProgram "$launcher" \ --prefix PATH : "${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --suffix PATH : "${lib.makeBinPath [ python3 ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \ @@ -114,9 +122,9 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set-default JETBRAINS_CLIENT_JDK "$jdk" \ --set-default ${hiName}_JDK "$jdk" \ --set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \ - --set-default ${hiName}_VM_OPTIONS ${vmoptsFile} + --set-default ${vmoptsIDE}_VM_OPTIONS ${vmoptsFile} - ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname + ln -s "$launcher" $out/bin/$pname rm -rf $out/$pname/plugins/remote-dev-server/selfcontained/ echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh chmod +x $out/$pname/bin/remote-dev-server-wrapped.sh diff --git a/pkgs/applications/editors/jetbrains/bin/update_bin.py b/pkgs/applications/editors/jetbrains/bin/update_bin.py index 604499203363..25616e2321fe 100755 --- a/pkgs/applications/editors/jetbrains/bin/update_bin.py +++ b/pkgs/applications/editors/jetbrains/bin/update_bin.py @@ -6,6 +6,8 @@ import logging import requests import subprocess import sys +from urllib.error import HTTPError +import urllib.request import xmltodict from packaging import version @@ -57,6 +59,19 @@ def download_sha256(url): channels = download_channels() +def get_url(template, version_or_build_number, version_number): + release = [str(n) for n in version.parse(version_number).release] + for k in range(len(release), 0, -1): + s = ".".join(release[0:k]) + url = template.format(version=version_or_build_number, versionMajorMinor=s) + try: + if urllib.request.urlopen(url).getcode() == 200: + return url + except HTTPError: + pass + return None + + def update_product(name, product): update_channel = product["update-channel"] logging.info("Updating %s", name) @@ -78,7 +93,9 @@ def update_product(name, product): else: version_or_build_number = new_build_number version_number = new_version.split(' ')[0] - download_url = product["url-template"].format(version=version_or_build_number, versionMajorMinor=version_number) + download_url = get_url(product["url-template"], version_or_build_number, version_number) + if not download_url: + raise Exception(f"No valid url for {name} version {version_or_build_number}") product["url"] = download_url if "sha256" not in product or product.get("build_number") != new_build_number: fromVersions[name] = product["version"] diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index abaeba3d63b1..de428ae5775c 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -1,558 +1,558 @@ { "x86_64-linux": { "aqua": { - "update-channel": "Aqua EAP licensing:EAP", + "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.tar.gz", - "version": "2024.1 Public Preview", - "sha256": "027cac4bfab747ef97f055b63eff8a69cefc32751fcca9510c3eccaf7c36b2be", - "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28.tar.gz", - "build_number": "241.15989.28" + "version": "2024.2", + "sha256": "63a6357cef1bb3772939abd8d13c05e265b5492643b080dd235d170584e0b636", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2.tar.gz", + "build_number": "242.20224.331" }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "4c7a0de431e93af748d1b695952809d4de43d9185d26c115c29aad683f511b8e", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4.tar.gz", - "build_number": "241.18034.45" + "version": "2024.2.0.1", + "sha256": "1363dcf718597aefacf2beca887e71a19c9b733cc044b24ff8b8db1253b643cd", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.0.1.tar.gz", + "build_number": "242.20224.413" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "16b918fc53004726454e0c08e2a77adbabae34c6852eb1c0612635d3667e73a5", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.4.tar.gz", - "build_number": "241.17890.24" + "version": "2024.2.1", + "sha256": "dc6bae6c5ca4daa6d3eefd131d48f20810540f75ac635ed56eea7d00de9c0ee1", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.1.tar.gz", + "build_number": "242.20224.385" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "aee5e18c44b9ed4e5c3ac13c0f2c8e5765105e7c12a8553e85ea8e64d5bb3d8c", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.3.tar.gz", - "build_number": "241.18034.23" + "version": "2024.2", + "sha256": "fcf6d8269ef1e652da003b3cdb212b4bd06a66d6432c574b0b99f47c27eea950", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.tar.gz", + "build_number": "242.20224.354" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2024.1.2", - "sha256": "d0ca5471d4e445ea931b25d1ee55cec0c40bb455de1aec861d5aa5ca0bbc176d", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2.tar.gz", - "build_number": "241.17011.87" + "version": "2024.2", + "sha256": "a397ec10b27ed309ddc7287d43c89f6cddb55f129ea5bd5c298483dd2c33bffb", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.tar.gz", + "build_number": "242.20224.368" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "f982476c9d870f1f354ab15135094cbde5c25c851ec21f424d0cd24149a12be6", - "url": "https://download.jetbrains.com/go/goland-2024.1.4.tar.gz", - "build_number": "241.18034.61" + "version": "2024.2.0.1", + "sha256": "d55c87c1bd1b886841e807098d4c3c2575ad21f838f6920c86f84c647915f62e", + "url": "https://download.jetbrains.com/go/goland-2024.2.0.1.tar.gz", + "build_number": "242.20224.424" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "7d5e4cdb5a7cb1c376ca66957481350571561edadc3f45e6fce422e14af0fc16", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4.tar.gz", - "build_number": "241.18034.62" + "version": "2024.2.0.2", + "sha256": "acca1c3dde049895a11069f1c3245f69cfe64fdfc520ab0a0ea8b684b53b50cd", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2.tar.gz", + "build_number": "242.20224.419" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "cda20bbbc052c2b8e87ea8607235ee0f7b5775728e8648c0a603889a3efa685f", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4.tar.gz", - "build_number": "241.18034.62" + "version": "2024.2.0.2", + "sha256": "cf2159b9ea61ea910d27ad0e661cdd93575f65cdb443f99bd15600f5960b7f4b", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2.tar.gz", + "build_number": "242.20224.419" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2023.3.1", - "sha256": "52a40fe05dd8d53a3f68faa7a6e40b73f72f80db5976d8ebd781955493a65fe1", - "url": "https://download.jetbrains.com/mps/2023.3.1/MPS-2023.3.1.tar.gz", - "build_number": "233.13135.1068" + "version": "2024.1", + "sha256": "aa537596103545021726b72d53a46726e4834d1c57af383ca1a94afc14a25642", + "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.tar.gz", + "build_number": "241.18034.1093" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "c6a9b57ecd8f588af512a1cba389738bd461531cab4f984ed9758abfdada822d", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.tar.gz", - "build_number": "241.18034.69", + "version": "2024.2.0.1", + "sha256": "182392496510eed42c7b1f4616e6c9e5b546348ea8c235cc74da131bcbd56d29", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.0.1.tar.gz", + "build_number": "242.20224.427", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "043c33371cb5fb31fdeab6deccc809189efdc6d404f771c541d4dd779adcd2fa", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.4.tar.gz", - "build_number": "241.18034.82" + "version": "2024.2.0.1", + "sha256": "d9befc260f48b9809f84cefd05761848ee8be643b49c595e13fd1443c967eb25", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1.tar.gz", + "build_number": "242.20224.428" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "3a12ada098a839ba3c32820071ecc04cb71e8e1066d0753397399c2e52941de9", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.4.tar.gz", - "build_number": "241.18034.82" + "version": "2024.2.0.1", + "sha256": "7d2bfb2449e85ca66ffaf40901a2c4b1498d43c16229bdad08c51a5b0571dc02", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1.tar.gz", + "build_number": "242.20224.428" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "e277c2636383c023f00bd7833be86ffe1f8f67cf98cb719bbb4293aa42ba8ad0", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.tar.gz", - "build_number": "241.18034.76" + "version": "2024.2.1", + "sha256": "2d14917d527120a98c1d71b94ba430fe9bb7f2358290710d74fd121426cffa4e", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1.tar.gz", + "build_number": "242.20224.418" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "84b96e1f6cdbb5497fcce1a036044e5c51002006ac8926be72d37ec48b1ceb52", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4.tar.gz", - "build_number": "241.18034.63" + "version": "2024.2.0.1", + "sha256": "9e3ca43d2cd0c22b254033c9fea4c54707310a39a2b4b1ff270a480b53fd3518", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.0.1.tar.gz", + "build_number": "242.20224.425" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.1.6", - "sha256": "42cf845a9159ab5ab182f501cb95154a27701af04ea01e309308ef6a5bb9ebfa", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.6.tar.gz", - "build_number": "241.17890.43" + "version": "2024.1.8", + "sha256": "c4b6a3f1eb23a17c4a09344073f4039d0cd51c5a6991fe7bdfd761edc422b703", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.8.tar.gz", + "build_number": "241.18968.39" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.1.5", - "sha256": "339ac8fc3ecc20afdef05b1782cb861d52eb09336d6a20cc4aa487c1bd108522", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5.tar.gz", - "build_number": "241.18034.50" + "version": "2024.2.0.1", + "sha256": "52a196f8f144b1445e3345285762acb1d2f87c29cb7f4a9005bcde4289443258", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1.tar.gz", + "build_number": "242.20224.426" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz", "version": "2024.1 EAP", - "sha256": "47b3323fc18e6f8c9edc71ed309b95f09385123d9b9c9492b55ad6a77b2925ee", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.98.tar.gz", - "build_number": "241.18775.98" + "sha256": "7da1531fc7f1f3995957729b412bf43e5757b0029ffcdf858270e64ae30ee462", + "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101.tar.gz", + "build_number": "241.18775.101" } }, "aarch64-linux": { "aqua": { - "update-channel": "Aqua EAP licensing:EAP", + "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.tar.gz", - "version": "2024.1 Public Preview", - "sha256": "ec59ff6e259ce0f03441e30a9d8bce8334d11c3ae858705d2f17375565adb80c", - "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28-aarch64.tar.gz", - "build_number": "241.15989.28" + "version": "2024.2", + "sha256": "5a28826c97c2c09988d57eefe1e2c1b0cdb746399844a7a207d289c2c4d4922e", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2-aarch64.tar.gz", + "build_number": "242.20224.331" }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "1e707c5409fd4a8490893ce23ff427d8e96d2cb6c31f1457a363e3127f0d1319", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.45" + "version": "2024.2.0.1", + "sha256": "9a8d26655b264cfbbf25fe4a20d9fdf36e1f091420407f9e367983165dec0068", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.0.1-aarch64.tar.gz", + "build_number": "242.20224.413" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "e9ec44d7a219c3d6d1ae7cd2fd59bd67f62997f403f17154d9de3f700b52c412", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.4-aarch64.tar.gz", - "build_number": "241.17890.24" + "version": "2024.2.1", + "sha256": "6ca837be2f61e1db0d1a84b6c2a98d963d3625aa70fbdf6dfa9f73a9eb0c0b4d", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.1-aarch64.tar.gz", + "build_number": "242.20224.385" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "d7d7647e2e6c398148d87690c0224cac2212bb56e1c9d802bd79748df77f1b24", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.3-aarch64.tar.gz", - "build_number": "241.18034.23" + "version": "2024.2", + "sha256": "aa9fda7ffdd7348bd34b98fee8f4d0904edf30ea08ae57e64ac7b6e247b567a8", + "url": "https://download.jetbrains.com/python/dataspell-2024.2-aarch64.tar.gz", + "build_number": "242.20224.354" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2024.1.2", - "sha256": "ca3983e280d2184ce806741d47c72fb9d8e3610c89ee7e56940960a8385b473b", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2-aarch64.tar.gz", - "build_number": "241.17011.87" + "version": "2024.2", + "sha256": "b184c5f06755fcd849071da93f2046fec20f8183691663cbac817f52ae418e76", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2-aarch64.tar.gz", + "build_number": "242.20224.368" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "b5b9efc087c71369c85080b9159e268bcf16a493e69e359b67108f71a474dd61", - "url": "https://download.jetbrains.com/go/goland-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.61" + "version": "2024.2.0.1", + "sha256": "52756190f5c26d82a2ed17168483aaddc11ae052c12bae5055faeac6b2230e5a", + "url": "https://download.jetbrains.com/go/goland-2024.2.0.1-aarch64.tar.gz", + "build_number": "242.20224.424" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "d4991c6041bfbe9958b55e876a45672d90ddcaf7aae18ac1c9134747a102eddf", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.62" + "version": "2024.2.0.2", + "sha256": "1f8bc10d63e0878fcc95aa787f7859e106f144fae2334bc71b2514a5189f7b45", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2-aarch64.tar.gz", + "build_number": "242.20224.419" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "35057b24047c719102f08a22754bba1c66098f0d410b21ab178d7b6b9a8f7882", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.62" + "version": "2024.2.0.2", + "sha256": "0da7909451157394d190b5041aaa61475ab30afd7af16a77651b40b90b78ef0e", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2-aarch64.tar.gz", + "build_number": "242.20224.419" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2023.3.1", - "sha256": "7f40c6a9b29e17e29fd2acb2e0d1d31d3353e28fce31a479dd81dd1b66c1fa8c", - "url": "https://download.jetbrains.com/mps/2023.3.1/MPS-2023.3.1.tar.gz", - "build_number": "233.13135.1068" + "version": "2024.1", + "sha256": "aa537596103545021726b72d53a46726e4834d1c57af383ca1a94afc14a25642", + "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.tar.gz", + "build_number": "241.18034.1093" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "45a11309799d23b1638a87ee4580bd5e8d4f50ea07d5467e99e416ae45a23b06", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.69", + "version": "2024.2.0.1", + "sha256": "727e654db648da159e9f2ff013fc612cb2b2034dc8090af6b12b22ddc39e53f4", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.0.1-aarch64.tar.gz", + "build_number": "242.20224.427", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "40dc15c31f44afd8ea5b42de54863253036b0d0f41b20612d0abd937e36af267", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.82" + "version": "2024.2.0.1", + "sha256": "3c954950fb616dc85dc0da6475feee6d67363a537df451ee8fe25aeb6e473b86", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1-aarch64.tar.gz", + "build_number": "242.20224.428" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "a90c657a333e1825c934d524cb426115c85d19d7aebfa4a149fda5062be29fab", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.82" + "version": "2024.2.0.1", + "sha256": "84cb34fd2ae9d96dc544f7e326015081e6186dbf7fc3f67a271d76107494f933", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1-aarch64.tar.gz", + "build_number": "242.20224.428" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "e0f8ac64b87c093c7f97ea6ee340c7f518d14d4c68c17d0a2b7a9f079d2fcd62", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.76" + "version": "2024.2.1", + "sha256": "cd969fc84eaa87dfa1de2587b3ba974e6d8961895541732e9c1617c260ce8450", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1-aarch64.tar.gz", + "build_number": "242.20224.418" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "b4d51afd0cf8ef19e6eae5a401836a89164215cf532a08a33824895229dba321", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.63" + "version": "2024.2.0.1", + "sha256": "41f71e86c944ad6d5111402afdd4567387ce6099a3c8000739919dc58199f259", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.0.1-aarch64.tar.gz", + "build_number": "242.20224.425" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.1.6", - "sha256": "4671d426dfbf89f614c1ce367c7afba0ef64b7058b4777b72ce145715a352fd1", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.6-aarch64.tar.gz", - "build_number": "241.17890.43" + "version": "2024.1.8", + "sha256": "1dc44db7d7f83c1e41dfd7739ac58743e0201d0a348e601248fe6ec59e4a9834", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.8-aarch64.tar.gz", + "build_number": "241.18968.39" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.1.5", - "sha256": "20db531cecada0fdd1947234ac120d0cf2a40037a3af825f1cf2ac066709fb44", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5-aarch64.tar.gz", - "build_number": "241.18034.50" + "version": "2024.2.0.1", + "sha256": "c83491b11662beeda45df0fb333034a9e875d61e6bb6790f102186d218934ca0", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1-aarch64.tar.gz", + "build_number": "242.20224.426" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz", "version": "2024.1 EAP", - "sha256": "937c30cdfd1431bcdde10bf47f1236ea57c10eca8cd1210a04629a64b383c054", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.98-aarch64.tar.gz", - "build_number": "241.18775.98" + "sha256": "2f8d90582f19eee4c1b83d9c61846baa7ec3f4e75dde10ba069712e9677b2a60", + "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101-aarch64.tar.gz", + "build_number": "241.18775.101" } }, "x86_64-darwin": { "aqua": { - "update-channel": "Aqua EAP licensing:EAP", + "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.dmg", - "version": "2024.1 Public Preview", - "sha256": "e90b3cc44efcabd3f31025bae506ec87da138f0a06f5cd4eaf7f96bb57db123a", - "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28.dmg", - "build_number": "241.15989.28" + "version": "2024.2", + "sha256": "0ea9875335a53d60722f91a7059847d1da857788fe3362685bf1e66dfe9aafed", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2.dmg", + "build_number": "242.20224.331" }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.1.4", - "sha256": "1d1d03a19aba6f941703ca5724317464e670a1ab63d70882448cf0364bc13c8b", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4.dmg", - "build_number": "241.18034.45" + "version": "2024.2.0.1", + "sha256": "3f5c90de4ed523bc090ec6ab7bb199c5609f9dc58146c7c164fc716a4aeca20c", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.0.1.dmg", + "build_number": "242.20224.413" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2024.1.4", - "sha256": "2221288ed33060d67368aa9d56a8d7c25df8158b5d38bb26ddf145ef58de8721", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.4.dmg", - "build_number": "241.17890.24" + "version": "2024.2.1", + "sha256": "2053c1305fbabee20cf8a26aee2b939ff8965b2f7402639c09652798ebd37da6", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.1.dmg", + "build_number": "242.20224.385" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2024.1.3", - "sha256": "132c1e67c18d676844a26ad95fcd68942965157222f7dc931c15117e96d29a84", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.3.dmg", - "build_number": "241.18034.23" + "version": "2024.2", + "sha256": "3e066588e8123c1842a03a0030c8d5a72c60a9710a759d5f10f89ae1a9633772", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.dmg", + "build_number": "242.20224.354" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2024.1.2", - "sha256": "be7e34b5a4a4e28b90c3d90f5761767d3d6e996cdc5846d3f8bd0e05d3ee0f1a", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2.dmg", - "build_number": "241.17011.87" + "version": "2024.2", + "sha256": "630ee3bfb6537c5da26aa7907027788f287d4e42fe24ba1f6eca037eb6afea42", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.dmg", + "build_number": "242.20224.368" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.1.4", - "sha256": "e2b2ae8d52700335d539b28179410b2567c78f6c8121a742e4df208180b55884", - "url": "https://download.jetbrains.com/go/goland-2024.1.4.dmg", - "build_number": "241.18034.61" + "version": "2024.2.0.1", + "sha256": "5454717fe28e3b8377b4d58844e039717c1fd3a5b9eaa430c30185dce5280c19", + "url": "https://download.jetbrains.com/go/goland-2024.2.0.1.dmg", + "build_number": "242.20224.424" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.1.4", - "sha256": "2420493df5796e47836d3dfd579006f25aa88f1252db4fd6999591529022e925", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4.dmg", - "build_number": "241.18034.62" + "version": "2024.2.0.2", + "sha256": "3b5d0f9de135e681cbbe06fc3e1ed00a798102174a7baba6edf7061582ea8d7b", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2.dmg", + "build_number": "242.20224.419" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.1.4", - "sha256": "30396377e163ba7f8d5c4ef112e9c8abb064897dd337f059357feecaa6c53b6e", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4.dmg", - "build_number": "241.18034.62" + "version": "2024.2.0.2", + "sha256": "fde5ffcba501bd94139115266b71dff76ec199ea35ff0673e7b7afea73aeb80b", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2.dmg", + "build_number": "242.20224.419" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2023.3.1", - "sha256": "c1e46dcb3429772b164f423cedc644f388217d1e7310d682b2341f9e744333bf", - "url": "https://download.jetbrains.com/mps/2023.3.1/MPS-2023.3.1-macos.dmg", - "build_number": "233.13135.1068" + "version": "2024.1", + "sha256": "93510db63ab6f3d7b6e139730f90836ba772032526d77e3de207e848c808d398", + "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1-macos.dmg", + "build_number": "241.18034.1093" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.1.4", - "sha256": "ce844a947a96d819a59b35705fd1007c5193a444c3bb5d237179bfb3ceb2ed8b", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.dmg", - "build_number": "241.18034.69", + "version": "2024.2.0.1", + "sha256": "4913211a8e2b52407b003f5fab5b268b7211d57df96cc17ae64f87293184698e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.0.1.dmg", + "build_number": "242.20224.427", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.1.4", - "sha256": "22558efc74b2d10fcde02650765cc3b500841d71796dba48d018fc8f794cfd5f", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.4.dmg", - "build_number": "241.18034.82" + "version": "2024.2.0.1", + "sha256": "2735841aa3d5544a53bcc2d9bac86e1a452c8e29b434b0591c0db13f40347868", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1.dmg", + "build_number": "242.20224.428" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.1.4", - "sha256": "99f22cba7855dbe8acaa0ec222dfaa75cea2ebe5975f1adca6c7b52c7fa763a5", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.4.dmg", - "build_number": "241.18034.82" + "version": "2024.2.0.1", + "sha256": "e98c3d13f67ed3ad3abf512189a1d3e331ee48ac1beefb2843e652f2c4b59878", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1.dmg", + "build_number": "242.20224.428" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2024.1.4", - "sha256": "2fc9e3063278e510b28eea0b2823b0c2309d08728d53261b48cbac093255cbfe", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.dmg", - "build_number": "241.18034.76" + "version": "2024.2.1", + "sha256": "5631e697ed41713df06c1fe71d6d5e0b39360afb2a1babd103b876f83dff7aa1", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1.dmg", + "build_number": "242.20224.418" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.1.4", - "sha256": "a4619da76349319b45a7bacbc49c3c53b8bd0769692e30f84f78a5c61ccd552b", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4.dmg", - "build_number": "241.18034.63" + "version": "2024.2.0.1", + "sha256": "bb51be85686deef7cf665a5bf8a461a846e2b69d64817d43c9c47a184ad98a24", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.0.1.dmg", + "build_number": "242.20224.425" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.1.6", - "sha256": "c5f079356ae9e38424be3257734b8665393146c831bddc917a4b1086321682cf", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.6.dmg", - "build_number": "241.17890.43" + "version": "2024.1.8", + "sha256": "1bfada79e7ec2166c43a6dcc65bf2387f70422e35b6511623e48ed66bbbdcdb1", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.8.dmg", + "build_number": "241.18968.39" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.1.5", - "sha256": "45475fda7a66ba5da23091a7d9ec3314c9482b0a31fe9cc40a3a02f243c86e48", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5.dmg", - "build_number": "241.18034.50" + "version": "2024.2.0.1", + "sha256": "2533f260a7ac04ffc4e0711a21e6cdb2819ab2e1e99f3d02ce447efd3c4dc5b6", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1.dmg", + "build_number": "242.20224.426" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg", "version": "2024.1 EAP", - "sha256": "0e97d9a2ef53f18930b63a48d7303783aca7422c5d6818543f4805c01991ba41", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.98.dmg", - "build_number": "241.18775.98" + "sha256": "fad7fbf6fec147556b53b75adb02f22df038822f4cb0662dd4748dcc1ffd0969", + "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101.dmg", + "build_number": "241.18775.101" } }, "aarch64-darwin": { "aqua": { - "update-channel": "Aqua EAP licensing:EAP", + "update-channel": "Aqua RELEASE", "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.dmg", - "version": "2024.1 Public Preview", - "sha256": "29b975e6845b62ed466d26920fec4c9e5e74588b5ff5cf384d672b98bb602549", - "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28-aarch64.dmg", - "build_number": "241.15989.28" + "version": "2024.2", + "sha256": "2da73b2896cf8c7114291f7ab64730d494ed1adca83542b56702a6fb2fcaa92d", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2-aarch64.dmg", + "build_number": "242.20224.331" }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "9eed7144d482a4fc9d6cc639c04c0b99cc6831aa73c5998ac9d1e1bd23f7ab66", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4-aarch64.dmg", - "build_number": "241.18034.45" + "version": "2024.2.0.1", + "sha256": "92f17a4cad5f027f940e59146fe626c421ad5be585e1f37c0e9879b49e99834e", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.0.1-aarch64.dmg", + "build_number": "242.20224.413" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "329bc223f5a3d16c68c2d271f2576f9e174ab88a9871b928f1dd8601b2d2cf70", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.4-aarch64.dmg", - "build_number": "241.17890.24" + "version": "2024.2.1", + "sha256": "6b8505ef67de19f312ce78bdbc067093aa95f78407a863b6baa16c7df98a6a98", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.1-aarch64.dmg", + "build_number": "242.20224.385" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "fa8f9c77b2fab31ea383a492c7a061e4b297e6581df4a5c116de9aec4a52c86d", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.3-aarch64.dmg", - "build_number": "241.18034.23" + "version": "2024.2", + "sha256": "a575b901eb706e197d05d2523f74a66528a225eb50ead1d43c2fbbc2231584b0", + "url": "https://download.jetbrains.com/python/dataspell-2024.2-aarch64.dmg", + "build_number": "242.20224.354" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2024.1.2", - "sha256": "70aab722715cb1abbab01e25109b6ca967588bcf3c1cec666986e42b825b0d9d", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2-aarch64.dmg", - "build_number": "241.17011.87" + "version": "2024.2", + "sha256": "a66f93350e9251ba34a1d3cf6061fc9ad5c5351b328a15be906a8706b8be2ded", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2-aarch64.dmg", + "build_number": "242.20224.368" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "6dd71b3993b005e3557ad6ddb4d9ed87068be5225df19422e4b0e3fdd0fbbd10", - "url": "https://download.jetbrains.com/go/goland-2024.1.4-aarch64.dmg", - "build_number": "241.18034.61" + "version": "2024.2.0.1", + "sha256": "100cbfc7ac2955869f933ff61c73001d6255b69dc3f8cd36d2018a9ba939b367", + "url": "https://download.jetbrains.com/go/goland-2024.2.0.1-aarch64.dmg", + "build_number": "242.20224.424" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "0c2e9a534d8f84acf8a17412d73e3f161864268acefee5130259489e2575d246", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4-aarch64.dmg", - "build_number": "241.18034.62" + "version": "2024.2.0.2", + "sha256": "fbf6e1f8dd19d5a467426c1ca174b21cb71deaaf1f4dd5a3cfdf6cf2a54ba5ce", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.0.2-aarch64.dmg", + "build_number": "242.20224.419" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "0d6dd0ebc97a61920721fb6c9663a905df1edea976f62b32bdf8ff879c02c7d0", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4-aarch64.dmg", - "build_number": "241.18034.62" + "version": "2024.2.0.2", + "sha256": "03866cf637bc0698e6764fe18d2af98a7065c9c9ca0b847953df0ccc42d65b3d", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.0.2-aarch64.dmg", + "build_number": "242.20224.419" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2023.3.1", - "url": "https://download.jetbrains.com/mps/2023.3.1/MPS-2023.3.1-macos-aarch64.dmg", - "sha256": "133e5bae81d675a6ee7780efec18dd96dfed059dbfdd2ad4a1028d9956a1ec6e", - "build_number": "233.13135.1068" + "version": "2024.1", + "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1-macos-aarch64.dmg", + "sha256": "2b070b9eb87fc910ef8b2ff96479e724f64864b6825375c272e1f7c604bbc4e7", + "build_number": "241.18034.1093" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "8e5bffb20b1606195afe6818429e99b31c56f2e8f390c81cd6d92ff3de80de68", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4-aarch64.dmg", - "build_number": "241.18034.69", + "version": "2024.2.0.1", + "sha256": "fa6e248516f3936abca873d9c99783d7fc826e36995bd9c0b57b407bf7144463", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.0.1-aarch64.dmg", + "build_number": "242.20224.427", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "63c0a14bbad81ab0c1c733802eaf86328e46ebc2de4e7bc0e240f76aefbdf54e", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.4-aarch64.dmg", - "build_number": "241.18034.82" + "version": "2024.2.0.1", + "sha256": "53ed528b86e7f0eeeefbbe590fb5918ad6b4a1b9f750843c2ac0dbebc7a96d5c", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.0.1-aarch64.dmg", + "build_number": "242.20224.428" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "ecfd340566f8c9ed6afcd42331568db5d91fa3a036c511ae8427f573199c3a44", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.4-aarch64.dmg", - "build_number": "241.18034.82" + "version": "2024.2.0.1", + "sha256": "f3ecb2fc630d357e5e3879c6ba1361d78fd45714cc9311a19ac754f70fd79e68", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.0.1-aarch64.dmg", + "build_number": "242.20224.428" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "0682ca85bb61534e39426d9f397eeb3c383dfd0a2e9dc4e8052d9e6408741fdb", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4-aarch64.dmg", - "build_number": "241.18034.76" + "version": "2024.2.1", + "sha256": "2e6307f1d4f5456ce8660331f16127111b819d41c907f9cd1134180828edc4a4", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.1-aarch64.dmg", + "build_number": "242.20224.418" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "ad3ebd40266f40f5aadb152fc5e845bda1eb8de75923cf598072458dc92b8194", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4-aarch64.dmg", - "build_number": "241.18034.63" + "version": "2024.2.0.1", + "sha256": "982773ca00ef81795b71137db98fce476fd554e13ef226ed86eb4d5abfc47f3c", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.0.1-aarch64.dmg", + "build_number": "242.20224.425" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.1.6", - "sha256": "5216ea7e5e994a3df4f1095772f5a44e999d7ca0ac02a21698149c8023c46893", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.6-aarch64.dmg", - "build_number": "241.17890.43" + "version": "2024.1.8", + "sha256": "533bb27ab515989b946bd5c72d0fa36417b248a8d2ec9f16a6ca32cc98e56048", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.8-aarch64.dmg", + "build_number": "241.18968.39" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.1.5", - "sha256": "e55e4671316ad2c2bfc5564516e261b59d139267c18d06d7a62b8f665d86da5e", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5-aarch64.dmg", - "build_number": "241.18034.50" + "version": "2024.2.0.1", + "sha256": "6d7a12184f46f3693b9f33ececeed0dde272fdd5ba8e06107869ae1731b694ff", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.0.1-aarch64.dmg", + "build_number": "242.20224.426" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg", "version": "2024.1 EAP", - "sha256": "956fc3d39a2aa34648c272780843729356a20c0a4a1ceb20e69a9f86a562278c", - "url": "https://download.jetbrains.com/writerside/writerside-241.18775.98-aarch64.dmg", - "build_number": "241.18775.98" + "sha256": "dc1d01915ff31d14828b668b71cfc92529d389af122adca06d785f7cc3a9d784", + "url": "https://download.jetbrains.com/writerside/writerside-241.18775.101-aarch64.dmg", + "build_number": "241.18775.101" } } } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index b3dbbfa8f235..8188a82c2c80 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -46,6 +46,8 @@ let description = meta.description + lib.optionalString meta.isOpenSource (if fromSource then " (built from source)" else " (patched binaries from jetbrains)"); maintainers = map (x: lib.maintainers."${x}") meta.maintainers; license = if meta.isOpenSource then lib.licenses.asl20 else lib.licenses.unfree; + sourceProvenance = if fromSource then [ lib.sourceTypes.fromSource ] else + (if stdenv.isDarwin then [ lib.sourceTypes.binaryNativeCode ] else [ lib.sourceTypes.binaryBytecode ]); }; mkJetBrainsProduct = diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index d5a2a085770a..62c1df496362 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -17,17 +17,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip" }, "name": "ideavim" }, @@ -36,7 +36,7 @@ "idea-ultimate" ], "builds": { - "241.18034.62": "https://plugins.jetbrains.com/files/631/559769/python-241.18034.62.zip" + "242.20224.419": "https://plugins.jetbrains.com/files/631/590930/python-242.20224.419.zip" }, "name": "python" }, @@ -46,7 +46,7 @@ "idea-ultimate" ], "builds": { - "241.18034.62": "https://plugins.jetbrains.com/files/1347/572480/scala-intellij-bin-2024.1.25.zip" + "242.20224.419": "https://plugins.jetbrains.com/files/1347/581524/scala-intellij-bin-2024.2.20.zip" }, "name": "scala" }, @@ -67,17 +67,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" }, "name": "string-manipulation" }, @@ -98,17 +98,17 @@ "webstorm" ], "builds": { - "233.13135.1068": null, - "241.17890.24": null, - "241.17890.43": null, - "241.18034.45": null, - "241.18034.50": null, - "241.18034.61": null, - "241.18034.62": null, - "241.18034.63": null, - "241.18034.69": null, - "241.18034.76": null, - "241.18034.82": null + "241.18034.1093": null, + "241.18968.39": null, + "242.20224.385": null, + "242.20224.413": null, + "242.20224.418": null, + "242.20224.419": null, + "242.20224.424": null, + "242.20224.425": null, + "242.20224.426": null, + "242.20224.427": null, + "242.20224.428": null }, "name": "kotlin" }, @@ -129,17 +129,17 @@ "webstorm" ], "builds": { - "233.13135.1068": null, - "241.17890.24": null, - "241.17890.43": null, - "241.18034.45": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip" + "241.18034.1093": null, + "241.18968.39": "https://plugins.jetbrains.com/files/6981/582754/ini-241.18968.32.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip" }, "name": "ini" }, @@ -160,17 +160,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" }, @@ -180,8 +180,8 @@ "phpstorm" ], "builds": { - "241.18034.62": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip" + "242.20224.419": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip" }, "name": "symfony-support" }, @@ -191,8 +191,8 @@ "phpstorm" ], "builds": { - "241.18034.62": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" + "242.20224.419": "https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip" }, "name": "php-annotations" }, @@ -208,13 +208,13 @@ "rust-rover" ], "builds": { - "241.17890.24": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip" + "241.18968.39": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip" }, "name": "python-community-edition" }, @@ -235,17 +235,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip" }, "name": "asciidoc" }, @@ -265,16 +265,16 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "241.17890.24": null, - "241.18034.45": null, - "241.18034.50": null, - "241.18034.61": null, - "241.18034.62": null, - "241.18034.63": null, - "241.18034.69": null, - "241.18034.76": null, - "241.18034.82": null + "241.18034.1093": null, + "242.20224.385": null, + "242.20224.413": null, + "242.20224.418": null, + "242.20224.419": null, + "242.20224.424": null, + "242.20224.425": null, + "242.20224.426": null, + "242.20224.427": null, + "242.20224.428": null }, "name": "-deprecated-rust" }, @@ -294,16 +294,16 @@ "webstorm" ], "builds": { - "233.13135.1068": null, - "241.17890.24": null, - "241.18034.45": null, - "241.18034.50": null, - "241.18034.61": null, - "241.18034.62": null, - "241.18034.63": null, - "241.18034.69": null, - "241.18034.76": null, - "241.18034.82": null + "241.18034.1093": null, + "242.20224.385": null, + "242.20224.413": null, + "242.20224.418": null, + "242.20224.419": null, + "242.20224.424": null, + "242.20224.425": null, + "242.20224.426": null, + "242.20224.427": null, + "242.20224.428": null }, "name": "-deprecated-rust-beta" }, @@ -317,10 +317,10 @@ "ruby-mine" ], "builds": { - "241.18034.61": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip" + "242.20224.419": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip" }, "name": "ide-features-trainer" }, @@ -341,17 +341,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip" }, "name": "nixidea" }, @@ -361,8 +361,8 @@ "idea-ultimate" ], "builds": { - "241.18034.61": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip" + "242.20224.419": "https://plugins.jetbrains.com/files/9568/583036/go-plugin-242.20224.300.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/9568/583036/go-plugin-242.20224.300.zip" }, "name": "go" }, @@ -383,17 +383,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip" }, "name": "csv-editor" }, @@ -414,17 +414,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/11349/578646/aws-toolkit-jetbrains-standalone-3.20-233.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/11349/589129/aws-toolkit-jetbrains-standalone-3.23-241.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/11349/589129/aws-toolkit-jetbrains-standalone-3.23-241.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip" }, "name": "aws-toolkit" }, @@ -445,17 +445,17 @@ "webstorm" ], "builds": { - "233.13135.1068": null, - "241.17890.24": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip" }, "name": "vscode-keymap" }, @@ -476,17 +476,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip" }, "name": "eclipse-keymap" }, @@ -507,17 +507,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip" }, "name": "visual-studio-keymap" }, @@ -538,17 +538,17 @@ "webstorm" ], "builds": { - "233.13135.1068": null, - "241.17890.24": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", - "241.17890.43": "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", - "241.18034.82": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip" }, "name": "protocol-buffers" }, @@ -569,17 +569,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.43": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.45": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.50": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.61": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.62": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.63": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.69": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.76": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.82": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "241.18034.1093": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18968.39": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.20224.385": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.20224.413": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.20224.418": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.20224.419": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.20224.424": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.20224.425": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.20224.426": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.20224.427": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.20224.428": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -600,17 +600,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip" }, "name": "github-copilot" }, @@ -631,17 +631,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -662,17 +662,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17890.43": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.82": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18968.39": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.20224.385": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.20224.418": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.20224.424": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.20224.425": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.20224.426": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.20224.427": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.20224.428": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" }, "name": "mermaid" }, @@ -683,45 +683,47 @@ "rust-rover" ], "builds": { - "241.17890.43": "https://plugins.jetbrains.com/files/22407/578199/intellij-rust-241.37890.44.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/22407/578199/intellij-rust-241.37890.44.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/22407/578199/intellij-rust-241.37890.44.zip" + "241.18968.39": "https://plugins.jetbrains.com/files/22407/591052/intellij-rust-241.38968.39.zip", + "242.20224.413": "https://plugins.jetbrains.com/files/22407/591053/intellij-rust-242.20224.421.zip", + "242.20224.419": "https://plugins.jetbrains.com/files/22407/591053/intellij-rust-242.20224.421.zip" }, "name": "rust" } }, "files": { - "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip": "sha256-P8AFMVp/rFi7zTh9f/i45q/QalvI37itnK57Dz/W/z4=", - "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip": "sha256-C3l3Z9a7maCrMjc2Fk/wf3AoExRbvN+fn2mAtXigt0A=", - "https://plugins.jetbrains.com/files/11349/578646/aws-toolkit-jetbrains-standalone-3.20-233.zip": "sha256-Xa+swM/llXNDTg5ol5Li25VPKZuZQYpboCnaxIQuVLI=", - "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip": "sha256-M4xEhew2p2fPrEuVgnrkfuWs8HYQwi89dSda5o0f9/s=", + "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip": "sha256-QwguD4ENrL7GxmX+CGEyCPowbAPNpYgntVGAbHxOlyQ=", + "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip": "sha256-CpIsmOIblkC5xMnKidbI+G+2QcZtXczu0rOSMtUcJPs=", + "https://plugins.jetbrains.com/files/11349/589129/aws-toolkit-jetbrains-standalone-3.23-241.zip": "sha256-0aom3D5qpgh4Z1wicsK8881JVt+0r/vTocm/ysxzJZs=", + "https://plugins.jetbrains.com/files/11349/589131/aws-toolkit-jetbrains-standalone-3.23-242.zip": "sha256-g2LhztIyWeG4u7HtOTPLeoY8B0K+LRJgFVNoSWdrAfI=", "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=", - "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip": "sha256-IsmoWuUroAp1LLuphp4F1dun4tQOOitZxoG+Nxs5pYk=", + "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip": "sha256-LpooujwYaX339yZJVe7HPYIOw+YdJLeEtRgwPxLJ9eI=", "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip": "sha256-/hEx0gIFvUXD799tRmMHAt9Z5ziFgaQs1RX0zQwTJIA=", - "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip": "sha256-Nb2tSxL+mAY1qJ3waipgV8ep+0R/BaYnzz7zfwtLHmk=", + "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip": "sha256-bAN0ifNiUqj51TYc7RLKwTMtv9OxjzqEQwXa6KtFlsU=", "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=", - "https://plugins.jetbrains.com/files/1347/572480/scala-intellij-bin-2024.1.25.zip": "sha256-hyg9YS3XgvAxouVnn+v1+fk6kF6M6I560e9LqLVKgdw=", + "https://plugins.jetbrains.com/files/13017/579739/keymap-visualStudio-242.20224.204.zip": "sha256-xpH8/hUkz73t3q/F5AgWaZpMi7QEBu/gyGMPC/Gkkfo=", + "https://plugins.jetbrains.com/files/1347/581524/scala-intellij-bin-2024.2.20.zip": "sha256-lBj8IKW1dC586hd/Z9happeoj2rV4x4Y/hbtrw/xCxQ=", "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip": "sha256-cltbHY5OOvf29otDNsF9Q2shJHDdW6UMbzDdZ6OATtI=", + "https://plugins.jetbrains.com/files/14004/579472/protoeditor-242.20224.155.zip": "sha256-z3y3mcQRScZY4VD/9onMCvgHD/xECldBogX5VxMiR0c=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", - "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip": "sha256-6ibo1vdwO4olQTCWpWAefT3QCwgtzTo1ojilDes8Rvg=", - "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip": "sha256-87U5KPVLKQ76UfXS021+lhuaWLcxGdBdZeH4l/ccFPU=", - "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip": "sha256-oIH+bJ9ucU+tIs3m0tz5Mr2oqE6BeA4x9RjxJ95OZR0=", + "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=", + "https://plugins.jetbrains.com/files/17718/590469/github-copilot-intellij-1.5.20.6554.zip": "sha256-QNVo6sLKwj+jJ2PMcJ3P5cAr1LwhFpH2+uglWO9ncQE=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=", "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip": "sha256-OqeQCqFe8iW/8NPg+9i+UKh+twIPQ9uLZrItMukCi7k=", - "https://plugins.jetbrains.com/files/22407/578199/intellij-rust-241.37890.44.zip": "sha256-p9A3RzGg0cTX6zgqSIX1qxlrroypIdPkSoW12leI2Hs=", - "https://plugins.jetbrains.com/files/631/559769/python-241.18034.62.zip": "sha256-DnjjUcwRL9dbNrHTnZacQYPE0biRFLmq6lR2ApRGgXI=", - "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip": "sha256-PdS+qm3vG4JB5J/kNc9/hsVvjO/gMl/RZTg69jCNWlQ=", + "https://plugins.jetbrains.com/files/22407/591052/intellij-rust-241.38968.39.zip": "sha256-Pgtj1czuScTmog7oh/2aME9jv4KlhT/ep6hwjSB73Ak=", + "https://plugins.jetbrains.com/files/22407/591053/intellij-rust-242.20224.421.zip": "sha256-Ux89pA9Gi9iVC3AWfVunW3vrzRbFc1Oyk9plFgo9ync=", + "https://plugins.jetbrains.com/files/631/590930/python-242.20224.419.zip": "sha256-zZIHP2qhUy6uG506H05/zBGHEdQhS+dVRRvtmoPjgnQ=", + "https://plugins.jetbrains.com/files/6981/582754/ini-241.18968.32.zip": "sha256-GrWML6iPJ9Vp20T5ftNaPqAzhrqsDiV7zkWQDevSXFY=", + "https://plugins.jetbrains.com/files/6981/591962/ini-242.20224.428.zip": "sha256-jE51Cj9R2DcKm0aT2O8Kbq8MEDHlfr60D5vJdfXt+Cc=", "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", - "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip": "sha256-92uUIFz5kEjrbgPnomi0VXc9Du17evzGsO5ApsrtHrA=", - "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip": "sha256-JIZ6Iq3sOcAm8fBXnjRrG9dqCZuD/WajyVmn1JjYMBA=", - "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip": "sha256-njHcuJmpc/5JsfZ6mmjcRK2j78J0E4bu68T1A0DNdVU=", + "https://plugins.jetbrains.com/files/7219/585969/Symfony_Plugin-2024.1.275.zip": "sha256-2E3Hk8JdhZH+JFHF725Z9vGncx6HSKgd+LYlCpmh1KY=", + "https://plugins.jetbrains.com/files/7320/586859/PHP_Annotations-11.0.2.zip": "sha256-zQ/nEESHNiNyXwKyohy8ENWVkRavDVJpqmHvkzD3VjE=", "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip": "sha256-e+MewymlNWzbut8eADe8jwqco921ULe83eLEGpDf1GY=", - "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip": "sha256-icVvR79Ut6RopPKqvUQf4ZHKg14LV8/KWUZfQh/BYV8=", + "https://plugins.jetbrains.com/files/7322/583040/python-ce-242.20224.300.zip": "sha256-bkjB/o5gnDAuyuGxtMQsr1lH9fohwVbDV27gRj1rCr0=", "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=", - "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip": "sha256-+Lc/avYBLpyIV63DlbhAJtieHDv4HdggqdGFDw9iqN0=", - "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip": "sha256-p26GW1NyVI8OR1VypeWUFWW8qlwB+LtzrEoKyXBwiCw=", - "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip": "sha256-oP/tvAqzMSDLJ0Jah1eLJDZIm9WhOZas7lPWrvjWFMM=", - "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip": "sha256-6+VdZVI/U+UxxNZM1/Va8RsiHG0ZnR6PpoOAhaOqk9U=" + "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip": "sha256-AGP8YY6NG/hy7xIDoiJy3GZHRB9stVNYYoHtqOmYCx0=", + "https://plugins.jetbrains.com/files/8554/579645/featuresTrainer-242.20224.175.zip": "sha256-5gYFQjYWFro/nDxCn8q51GkLLv3JkJDS7jr70xhM0Q0=", + "https://plugins.jetbrains.com/files/8607/587258/NixIDEA-0.4.0.15.zip": "sha256-j5/LgTrFJ4OEIlocX4jcjgYzHlBId1nh1NfE2qLc1HQ=", + "https://plugins.jetbrains.com/files/9568/583036/go-plugin-242.20224.300.zip": "sha256-cbbAfatj1KkByLrLKZVNoIZSLjaSregK+0eany4pYWY=" } } diff --git a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix index e6e00962c9de..dcd6554c791d 100644 --- a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix +++ b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix @@ -38,7 +38,10 @@ # Github Copilot # Modified version of https://github.com/ktor/nixos/commit/35f4071faab696b2a4d86643726c9dd3e4293964 buildPhase = '' - agent="copilot-agent/bin/copilot-agent-linux" + agent='copilot-agent/native/${lib.toLower stdenv.hostPlatform.uname.system}${{ + x86_64 = "-x64"; + aarch64 = "-arm64"; + }.${stdenv.hostPlatform.uname.processor} or ""}/copilot-language-server' orig_size=$(stat --printf=%s $agent) patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $agent patchelf --set-rpath ${lib.makeLibraryPath [glibc gcc-unwrapped]} $agent diff --git a/pkgs/applications/editors/lapce/Cargo.lock b/pkgs/applications/editors/lapce/Cargo.lock index 4937cc7d645f..8627ad183022 100644 --- a/pkgs/applications/editors/lapce/Cargo.lock +++ b/pkgs/applications/editors/lapce/Cargo.lock @@ -58,30 +58,20 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "alacritty_terminal" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d1ea4484c8676f295307a4892d478c70ac8da1dbd8c7c10830a504b7f1022f" +version = "0.24.1-dev" +source = "git+https://github.com/alacritty/alacritty?rev=cacdb5bb3b72bad2c729227537979d95af75978f#cacdb5bb3b72bad2c729227537979d95af75978f" dependencies = [ "base64 0.22.0", - "bitflags 2.5.0", + "bitflags 2.6.0", "home", "libc", "log", @@ -95,15 +85,9 @@ dependencies = [ "signal-hook", "unicode-width", "vte", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] -[[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.16" @@ -123,7 +107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "052ad56e336bcc615a214bffbeca6c181ee9550acec193f0327e0b103b033a4d" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", @@ -208,11 +192,11 @@ checksum = "2d5f312b0a56c5cdf967c0aeb67f6289603354951683bc97ddc595ab974ba9aa" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -267,7 +251,7 @@ dependencies = [ "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", + "fastrand", "futures-lite", "slab", ] @@ -397,12 +381,6 @@ dependencies = [ "syn 2.0.57", ] -[[package]] -name = "atomic" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - [[package]] name = "atomic-waker" version = "1.1.2" @@ -453,18 +431,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bitflags" @@ -474,9 +452,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", ] @@ -521,23 +499,29 @@ 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]] 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.1", "futures-io", "futures-lite", "piper", - "tracing 0.1.37", ] [[package]] @@ -565,9 +549,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" dependencies = [ "bytemuck_derive", ] @@ -601,7 +585,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", "polling", "rustix", @@ -704,12 +688,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[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]] @@ -738,9 +723,9 @@ checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -952,9 +937,9 @@ dependencies = [ [[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", @@ -962,9 +947,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -981,16 +966,38 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", "core-foundation", - "foreign-types 0.3.2", "libc", ] +[[package]] +name = "cosmic-text" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fd57d82eb4bfe7ffa9b1cec0c05e2fd378155b47f255a67983cb4afe0e80c2" +dependencies = [ + "bitflags 2.6.0", + "fontdb", + "log", + "rangemap", + "rayon", + "rustc-hash", + "rustybuzz 0.14.1", + "self_cell", + "swash", + "sys-locale", + "ttf-parser 0.21.1", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + [[package]] name = "cpp_demangle" version = "0.3.5" @@ -1234,12 +1241,12 @@ dependencies = [ [[package]] name = "d3d12" -version = "0.19.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.1", + "bitflags 2.6.0", + "libloading", "winapi", ] @@ -1385,7 +1392,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.1", + "libloading", ] [[package]] @@ -1398,6 +1405,15 @@ dependencies = [ "plist", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "downcast-rs" version = "1.2.0" @@ -1410,7 +1426,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "drm-ffi", "drm-fourcc", @@ -1463,15 +1479,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1611,15 +1627,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - [[package]] name = "fastrand" version = "2.0.1" @@ -1660,9 +1667,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", @@ -1677,15 +1684,14 @@ checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" [[package]] name = "floem" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "copypasta", "crossbeam-channel", "downcast-rs", "educe", "floem-editor-core", - "floem-peniko", "floem-winit", "floem_reactive", "floem_renderer", @@ -1695,15 +1701,16 @@ dependencies = [ "im-rc", "image", "indexmap", - "kurbo 0.9.5", "lapce-xi-rope", "once_cell", "parking_lot", + "peniko", "raw-window-handle 0.6.0", "rfd", "rustc-hash", "serde", "sha2", + "slotmap", "smallvec", "strum", "strum_macros", @@ -1712,37 +1719,12 @@ dependencies = [ "wgpu", ] -[[package]] -name = "floem-cosmic-text" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d74a7975acd84233e843c26da850aa43b39f1e64503fd46d6af9be4ea498dd" -dependencies = [ - "floem-peniko", - "fontdb", - "libm", - "log", - "once_cell", - "ouroboros", - "parking_lot", - "rangemap", - "rustybuzz", - "stretto", - "swash", - "sys-locale", - "ttf-parser 0.20.0", - "unicode-bidi", - "unicode-linebreak", - "unicode-script", - "unicode-segmentation", -] - [[package]] name = "floem-editor-core" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "itertools 0.12.1", "lapce-xi-rope", "memchr", @@ -1752,24 +1734,14 @@ dependencies = [ "strum_macros", ] -[[package]] -name = "floem-peniko" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f505394c816e710e2b664647a7a1a4ffdf45e3b3493ad6560d9489f23100430" -dependencies = [ - "kurbo 0.9.5", - "smallvec", -] - [[package]] name = "floem-vger" -version = "0.2.8" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef11c9c2f1668ec58b1712f85afec989caaae19273b653aaad1964575f8871c" +checksum = "d384ed3dafa48c991166ed519da1a26dc3324ada418cd966f59a0770255e2518" dependencies = [ + "cosmic-text", "euclid", - "floem-cosmic-text", "fontdue", "rect_packer", "wgpu", @@ -1784,7 +1756,7 @@ dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "calloop", "cfg_aliases 0.1.1", @@ -1795,10 +1767,10 @@ dependencies = [ "js-sys", "libc", "log", - "memmap2 0.9.0", + "memmap2", "ndk", "ndk-sys", - "objc2", + "objc2 0.4.1", "once_cell", "orbclient", "percent-encoding", @@ -1828,7 +1800,7 @@ dependencies = [ [[package]] name = "floem_reactive" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" dependencies = [ "smallvec", ] @@ -1836,25 +1808,27 @@ dependencies = [ [[package]] name = "floem_renderer" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" dependencies = [ - "floem-cosmic-text", - "floem-peniko", + "cosmic-text", "image", + "parking_lot", + "peniko", "resvg", + "swash", ] [[package]] name = "floem_tiny_skia_renderer" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" dependencies = [ "anyhow", "bytemuck", - "floem-peniko", "floem_renderer", "futures", "image", + "peniko", "raw-window-handle 0.6.0", "resvg", "softbuffer", @@ -1864,14 +1838,14 @@ dependencies = [ [[package]] name = "floem_vger_renderer" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=54f0d1bcf0e1a91d82492ee7300a526adb60eb5c#54f0d1bcf0e1a91d82492ee7300a526adb60eb5c" dependencies = [ "anyhow", - "floem-peniko", "floem-vger", "floem_renderer", "futures", "image", + "peniko", "raw-window-handle 0.6.0", "resvg", "swash", @@ -1885,12 +1859,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "fontconfig-parser" -version = "0.5.3" +name = "font-types" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" dependencies = [ - "roxmltree 0.18.0", + "bytemuck", +] + +[[package]] +name = "fontconfig-parser" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +dependencies = [ + "roxmltree", ] [[package]] @@ -1901,7 +1884,7 @@ checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.0", + "memmap2", "slotmap", "tinyvec", "ttf-parser 0.20.0", @@ -2048,7 +2031,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -2111,7 +2094,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "debugid", "fxhash", "serde", @@ -2181,11 +2164,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -2205,23 +2188,17 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - [[package]] name = "globset" version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ - "aho-corasick 1.1.2", + "aho-corasick", "bstr", "log", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] @@ -2238,9 +2215,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] @@ -2251,7 +2228,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -2261,14 +2238,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -2279,61 +2256,59 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", "hashbrown", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "grep-matcher" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319" +checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02" dependencies = [ "memchr", ] [[package]] name = "grep-regex" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f" +checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d" dependencies = [ - "aho-corasick 0.7.19", "bstr", "grep-matcher", "log", - "regex", - "regex-syntax 0.6.27", - "thread_local", + "regex-automata", + "regex-syntax", ] [[package]] name = "grep-searcher" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5601c4b9f480f0c9ebb40b1f6cbf447b8a50c5369223937a6c5214368c58779f" +checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54" dependencies = [ "bstr", - "bytecount", "encoding_rs", "encoding_rs_io", "grep-matcher", "log", - "memmap2 0.5.10", + "memchr", + "memmap2", ] [[package]] @@ -2369,9 +2344,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[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", @@ -2383,10 +2358,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.8.1", + "libloading", "thiserror", "widestring", "winapi", @@ -2427,11 +2402,11 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2475,9 +2450,9 @@ source = "git+https://github.com/dragazo/human-sort?rev=1e74db1e09e8194ba88ad983 [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -2490,7 +2465,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.7", + "socket2", "tokio", "tower-service", "tracing 0.1.37", @@ -2529,9 +2504,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]] @@ -2635,26 +2610,21 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "include_dir" -version = "0.6.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b56e147e6187d61e9d0f039f10e070d0c0a887e24fe0bb9ca3f29bfde62cab" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" dependencies = [ - "glob", - "include_dir_impl", - "proc-macro-hack", + "include_dir_macros", ] [[package]] -name = "include_dir_impl" -version = "0.6.2" +name = "include_dir_macros" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a0c890c85da4bab7bce4204c707396bbd3c6c8a681716a51c8814cfc2b682df" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ - "anyhow", - "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.109", ] [[package]] @@ -2688,15 +2658,6 @@ dependencies = [ "libc", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "interprocess" version = "1.2.1" @@ -2843,9 +2804,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2883,7 +2844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.1", + "libloading", "pkg-config", ] @@ -2920,7 +2881,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ "arrayvec", - "serde", ] [[package]] @@ -2933,9 +2893,20 @@ dependencies = [ "smallvec", ] +[[package]] +name = "kurbo" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" +dependencies = [ + "arrayvec", + "serde", + "smallvec", +] + [[package]] name = "lapce" -version = "0.4.0" +version = "0.4.1" dependencies = [ "lapce-app", "lapce-proxy", @@ -2943,7 +2914,7 @@ dependencies = [ [[package]] name = "lapce-app" -version = "0.4.0" +version = "0.4.1" dependencies = [ "Inflector", "alacritty_terminal", @@ -2956,7 +2927,6 @@ dependencies = [ "config", "criterion", "crossbeam-channel", - "directories", "dmg", "flate2", "floem", @@ -2977,10 +2947,12 @@ dependencies = [ "once_cell", "open", "parking_lot", + "percent-encoding", "pulldown-cmark", "rayon", "regex", "reqwest", + "semver", "serde", "serde_json", "sha2", @@ -2989,6 +2961,7 @@ dependencies = [ "strum", "strum_macros", "tar", + "tempfile", "thiserror", "toml", "toml_edit 0.20.2", @@ -3000,49 +2973,44 @@ dependencies = [ "url", "windows-sys 0.36.1", "zip", + "zstd", ] [[package]] name = "lapce-core" -version = "0.4.0" +version = "0.4.1" dependencies = [ + "ahash", "anyhow", "arc-swap", "directories", "floem-editor-core", + "git2", + "hashbrown", "include_dir", "itertools 0.12.1", "lapce-rpc", "lapce-xi-rope", - "libloading 0.8.1", + "libloading", "lsp-types", "once_cell", + "regex", + "remain", "slotmap", "strum", "strum_macros", "thiserror", "tracing 0.2.0", "tree-sitter", - "tree-sitter-bash", - "tree-sitter-c", - "tree-sitter-cpp", - "tree-sitter-javascript", - "tree-sitter-json", - "tree-sitter-md", - "tree-sitter-python", - "tree-sitter-rust", - "tree-sitter-toml", - "tree-sitter-yaml", ] [[package]] name = "lapce-proxy" -version = "0.4.0" +version = "0.4.1" dependencies = [ "alacritty_terminal", "anyhow", "clap", - "cocoa", "crossbeam-channel", "directories", "dyn-clone", @@ -3064,8 +3032,6 @@ dependencies = [ "locale_config", "lsp-types", "notify", - "objc", - "once_cell", "parking_lot", "polling", "psp-types", @@ -3073,11 +3039,8 @@ dependencies = [ "reqwest", "serde", "serde_json", - "strum", - "strum_macros", "tar", "toml", - "toml_edit 0.20.2", "tracing 0.2.0", "tracing-log", "trash", @@ -3092,7 +3055,7 @@ dependencies = [ [[package]] name = "lapce-rpc" -version = "0.4.0" +version = "0.4.1" dependencies = [ "anyhow", "crossbeam-channel", @@ -3140,15 +3103,15 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[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 = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -3158,16 +3121,6 @@ dependencies = [ "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 = "libloading" version = "0.8.1" @@ -3229,14 +3182,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" [[package]] -name = "locale_config" -version = "0.3.0" +name = "litrs" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + +[[package]] +name = "locale_config" +version = "0.3.1-alpha.0" +source = "git+https://github.com/lapce/locale_config.git?branch=lapce#54c9fe6a247c3618c224ec57e6c3a747bc3a96e4" dependencies = [ "lazy_static", - "objc", - "objc-foundation", + "objc2 0.5.2", + "objc2-foundation", "regex", "winapi", ] @@ -3308,15 +3266,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - [[package]] name = "memmap2" version = "0.9.0" @@ -3335,15 +3284,6 @@ dependencies = [ "autocfg", ] -[[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.0" @@ -3355,11 +3295,11 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3413,17 +3353,18 @@ dependencies = [ [[package]] name = "naga" -version = "0.19.2" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" +checksum = "09eeccb9b50f4f7839b214aa3e08be467159506a986c18e0702170ccf720a453" dependencies = [ + "arrayvec", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", "rustc-hash", "spirv", "termcolor", @@ -3455,7 +3396,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", "ndk-sys", @@ -3480,25 +3421,13 @@ 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.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", "libc", "memoffset 0.9.0", @@ -3617,7 +3546,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -3633,9 +3561,9 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" @@ -3644,7 +3572,17 @@ 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]] @@ -3654,12 +3592,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-encode" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "cc", + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", ] [[package]] @@ -3697,9 +3644,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[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", @@ -3712,7 +3659,7 @@ version = "0.10.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3779,31 +3726,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "ouroboros" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c" -dependencies = [ - "aliasable", - "ouroboros_macro", - "static_assertions", -] - -[[package]] -name = "ouroboros_macro" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33" -dependencies = [ - "heck", - "itertools 0.12.1", - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn 2.0.57", -] - [[package]] name = "overload" version = "0.1.1" @@ -3827,9 +3749,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[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", @@ -3860,6 +3782,18 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +[[package]] +name = "peniko" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c28d7294093837856bb80ad191cc46a2fcec8a30b43b7a3b0285325f0a917a9" +dependencies = [ + "kurbo 0.11.0", + "serde", + "serde_bytes", + "smallvec", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -3891,7 +3825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] @@ -4004,12 +3938,6 @@ dependencies = [ "toml_edit 0.19.15", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro2" version = "1.0.79" @@ -4019,19 +3947,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "proc-macro2-diagnostics" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.57", - "version_check", - "yansi", -] - [[package]] name = "profiling" version = "1.0.10" @@ -4059,11 +3974,11 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c" +checksum = "8746739f11d39ce5ad5c2520a9b75285310dbfe78c541ccf832d38615765aec0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "getopts", "memchr", "pulldown-cmark-escape", @@ -4072,9 +3987,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-escape" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" [[package]] name = "quick-xml" @@ -4141,9 +4056,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "rangemap" -version = "1.3.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" [[package]] name = "raw-window-handle" @@ -4177,6 +4092,16 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "read-fonts" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" +dependencies = [ + "bytemuck", + "font-types", +] + [[package]] name = "rect_packer" version = "0.2.1" @@ -4203,11 +4128,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] @@ -4235,14 +4160,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 1.1.2", + "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] @@ -4251,17 +4176,11 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ - "aho-corasick 1.1.2", + "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -4269,19 +4188,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "remain" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +checksum = "46aef80f842736de545ada6ec65b81ee91504efd6853f4b96de7414c42ae7443" dependencies = [ - "winapi", + "proc-macro2", + "quote", + "syn 2.0.57", ] [[package]] name = "renderdoc-sys" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "reqwest" @@ -4373,15 +4294,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "roxmltree" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" -dependencies = [ - "xmlparser", -] - [[package]] name = "roxmltree" version = "0.19.0" @@ -4415,7 +4327,7 @@ version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "itoa", "libc", @@ -4456,13 +4368,29 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ - "bitflags 2.5.0", + "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.20.0", - "unicode-bidi-mirroring", - "unicode-ccc", + "ttf-parser 0.21.1", + "unicode-bidi-mirroring 0.2.0", + "unicode-ccc 0.2.0", "unicode-properties", "unicode-script", ] @@ -4484,12 +4412,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.52.0", ] [[package]] @@ -4512,17 +4439,11 @@ checksum = "1729a30a469de249c6effc17ec8d039b0aa29b3af79b819b7f51cb6ab8046a90" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.0", + "memmap2", "smithay-client-toolkit", "tiny-skia", ] -[[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.7.0" @@ -4547,25 +4468,40 @@ dependencies = [ ] [[package]] -name = "semver" -version = "1.0.20" +name = "self_cell" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[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.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" +name = "serde_bytes" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.204" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -4574,11 +4510,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -4705,6 +4642,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "skrifa" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" +dependencies = [ + "bytemuck", + "read-fonts", +] + [[package]] name = "slab" version = "0.4.9" @@ -4734,6 +4681,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "smithay-client-toolkit" @@ -4741,13 +4691,13 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", - "memmap2 0.9.0", + "memmap2", "rustix", "thiserror", "wayland-backend", @@ -4782,29 +4732,19 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.7" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "softbuffer" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071916a85d1db274b4ed57af3a14afb66bd836ae7f82ebb6f1fd3455107830d9" +checksum = "61d5d17f23326fe0d9b0af282f73f3af666699420fd5f42629efd9c6e7dc166f" dependencies = [ "as-raw-xcb-connection", "bytemuck", @@ -4812,14 +4752,14 @@ dependencies = [ "cocoa", "core-graphics", "drm", - "fastrand 2.0.1", + "fastrand", "foreign-types 0.5.0", "js-sys", "log", - "memmap2 0.9.0", + "memmap2", "objc", "raw-window-handle 0.6.0", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "rustix", "tiny-xlib", "wasm-bindgen", @@ -4846,7 +4786,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -4867,23 +4807,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stretto" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63eada6d62b660f5c1d4862c180ae70193de86df12386eee74da694ae2177583" -dependencies = [ - "atomic", - "crossbeam-channel", - "parking_lot", - "rand", - "seahash", - "thiserror", - "tracing 0.1.37", - "wg", - "xxhash-rust", -] - [[package]] name = "strict-num" version = "0.1.1" @@ -4902,7 +4825,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structdesc" version = "0.1.0" -source = "git+https://github.com/lapce/structdesc#47d8201fb13240166f4d842c718d63c1e24f0236" +source = "git+https://github.com/lapce/structdesc?rev=bb56969f22fdb2c2d6c03f158fd4a2bdc983b659#bb56969f22fdb2c2d6c03f158fd4a2bdc983b659" dependencies = [ "darling", "proc-macro2", @@ -4912,9 +4835,9 @@ dependencies = [ [[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" [[package]] name = "strum_macros" @@ -4941,10 +4864,11 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.8" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" dependencies = [ + "skrifa", "yazi", "zeno", ] @@ -4979,15 +4903,11 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sys-locale" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" dependencies = [ - "js-sys", "libc", - "wasm-bindgen", - "web-sys", - "windows-sys 0.45.0", ] [[package]] @@ -5017,7 +4937,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27ce32341b2c0b70c144bbf35627fdc1ef18c76ced5e5e7b3ee8b5ba6b2ab6a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cap-fs-ext", "cap-std", "fd-lock", @@ -5042,9 +4962,9 @@ dependencies = [ [[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", @@ -5059,16 +4979,14 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 1.8.0", - "libc", - "redox_syscall 0.2.16", - "remove_dir_all", - "winapi", + "fastrand", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -5082,18 +5000,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -5111,9 +5029,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", "itoa", @@ -5132,9 +5050,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -5174,7 +5092,7 @@ checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" dependencies = [ "as-raw-xcb-connection", "ctor", - "libloading 0.8.1", + "libloading", "tracing 0.1.37", ] @@ -5211,9 +5129,9 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[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", @@ -5223,16 +5141,16 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] [[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", @@ -5436,121 +5354,14 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.20.10" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" dependencies = [ "cc", "regex", ] -[[package]] -name = "tree-sitter-bash" -version = "0.19.0" -source = "git+https://github.com/tree-sitter/tree-sitter-bash?rev=4488aa41406547e478636a4fcfd24f5bbc3f2f74#4488aa41406547e478636a4fcfd24f5bbc3f2f74" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-c" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bbd5f3d8658c08581f8f2adac6c391c2e9fa00fe9246bf6c5f52213b9cc6b72" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-cpp" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46b04a5ada71059afb9895966a6cc1094acc8d2ea1971006db26573e7dfebb74" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-javascript" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d015c02ea98b62c806f7329ff71c383286dfc3a7a7da0cc484f6e42922f73c2c" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-json" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9a38a9c679b55cc8d17350381ec08d69fa1a17a53fcf197f344516e485ed4d" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-md" -version = "0.1.2" -source = "git+https://github.com/MDeiml/tree-sitter-markdown.git?rev=272e080bca0efd19a06a7f4252d746417224959e#272e080bca0efd19a06a7f4252d746417224959e" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-python" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c93b1b1fbd0d399db3445f51fd3058e43d0b4dcff62ddbdb46e66550978aa5" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-rust" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-toml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca517f578a98b23d20780247cc2688407fa81effad5b627a5a364ec3339b53e8" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-yaml" -version = "0.0.1" -source = "git+https://github.com/panekj/tree-sitter-yaml?rev=80c8d76847f03e772c5c524cf29bafb56858a8d1#80c8d76847f03e772c5c524cf29bafb56858a8d1" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "triomphe" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f" -dependencies = [ - "serde", - "stable_deref_trait", -] - [[package]] name = "try-lock" version = "0.2.3" @@ -5569,6 +5380,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.15.0" @@ -5607,12 +5424,24 @@ 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.4" @@ -5648,9 +5477,9 @@ checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-vo" @@ -5660,9 +5489,9 @@ 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 = "unicode-xid" @@ -5672,9 +5501,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[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", @@ -5702,8 +5531,8 @@ dependencies = [ "kurbo 0.9.5", "log", "pico-args", - "roxmltree 0.19.0", - "rustybuzz", + "roxmltree", + "rustybuzz 0.12.1", "simplecss", "siphasher", "strict-num", @@ -5745,7 +5574,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40eb22ae96f050e0c0d6f7ce43feeae26c348fc4dea56928ca81537cfaa6188b" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "log", "serde", @@ -5819,7 +5648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6efb2e9d72c6a070d62cf7b698acebab6faca9aacf26412bdecb9fabab79fd09" dependencies = [ "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "cap-rand", "cap-std", "io-extras", @@ -6226,7 +6055,7 @@ checksum = "1022616613f6279243392b00990ac81135f0c46018eba620538392342fc93df9" dependencies = [ "anyhow", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "cap-fs-ext", "cap-net-ext", @@ -6320,13 +6149,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" dependencies = [ "cc", "downcast-rs", - "nix 0.26.4", + "rustix", "scoped-tls", "smallvec", "wayland-sys", @@ -6334,12 +6163,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.1" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" dependencies = [ - "bitflags 2.5.0", - "nix 0.26.4", + "bitflags 2.6.0", + "rustix", "wayland-backend", "wayland-scanner", ] @@ -6350,18 +6179,18 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.0" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" dependencies = [ - "nix 0.26.4", + "rustix", "wayland-client", "xcursor", ] @@ -6372,7 +6201,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -6384,7 +6213,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6397,7 +6226,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6406,9 +6235,9 @@ 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", @@ -6417,9 +6246,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", "log", @@ -6454,26 +6283,15 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" -[[package]] -name = "wg" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f390449c16e0679435fc97a6b49d24e67f09dd05fea1de54db1b60902896d273" -dependencies = [ - "atomic-waker", - "parking_lot", - "triomphe", -] - [[package]] name = "wgpu" -version = "0.19.3" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb" +checksum = "c87e07e87a179614940ad845397e03201847453a37b43a31a3b54eee2e6e32ce" dependencies = [ "arrayvec", - "cfg-if", "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", @@ -6492,15 +6310,15 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.3" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78" +checksum = "e0f191908a21968991463fcf3b42cb6c9648c0fb7fa301b8fc733bc21a9ed9bd" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases 0.1.1", - "codespan-reporting", + "document-features", "indexmap", "log", "naga", @@ -6511,22 +6329,21 @@ dependencies = [ "rustc-hash", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.19.3" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "cfg_aliases 0.1.1", "core-graphics-types", @@ -6540,7 +6357,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.1", + "libloading", "log", "metal", "naga", @@ -6563,11 +6380,11 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.2" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] @@ -6586,7 +6403,7 @@ checksum = "334709283558d9ebb0206cd1842c4fa619ff467d68c71eff982376d9c999d636" dependencies = [ "anyhow", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "thiserror", "tracing 0.1.37", "wasmtime", @@ -6961,7 +6778,7 @@ version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357bb8e2932df531f83b052264b050b81ba0df90ee5a59b2d1d3949f344f81e5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "windows-sys 0.48.0", ] @@ -7024,7 +6841,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.1", + "libloading", "once_cell", "rustix", "x11rb-protocol", @@ -7072,7 +6889,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -7091,30 +6908,12 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" -[[package]] -name = "xmlparser" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" - [[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" - -[[package]] -name = "yansi" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" - [[package]] name = "yazi" version = "0.1.6" @@ -7144,7 +6943,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.27.1", + "nix", "ordered-stream", "rand", "serde", diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index ad29e72fad15..2a80d416195e 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -39,28 +39,27 @@ let in rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "lapce"; repo = "lapce"; rev = "refs/tags/v${version}"; - sha256 = "sha256-x/EObvrMZ3bkdHk5SbfQEarXA7jcQ9rEFZINQrHjcl4="; + sha256 = "sha256-Bwo6twEi9m3T5OybWkWGAyTRumusCWW7mkx/OAJkfXs="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "floem-0.1.1" = "sha256-/RUsi0LUJ/LjDj8xjoiF+f4MeUjFASL0TDS0eDUEHio="; + "alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI="; + "floem-0.1.1" = "sha256-zV2nk3cvmw8lzqL4Xx5SCTX156tiN6sUAEdfy0dJvDY="; "human-sort-0.2.2" = "sha256-tebgIJGXOY7pwWRukboKAzXY47l4Cn//0xMKQTaGu8w="; + "locale_config-0.3.1-alpha.0" = "sha256-cCEO+dmU05TKkpH6wVK6tiH94b7k2686xyGxlhkcmAM="; "lsp-types-0.95.1" = "sha256-+tWqDBM5x/gvQOG7V3m2tFBZB7smgnnZHikf9ja2FfE="; "psp-types-0.1.0" = "sha256-/oFt/AXxCqBp21hTSYrokWsbFYTIDCrHMUBuA2Nj5UU="; "regalloc2-0.9.3" = "sha256-tzXFXs47LDoNBL1tSkLCqaiHDP5vZjvh250hz0pbEJs="; - "structdesc-0.1.0" = "sha256-gMTnRudc3Tp9JRa+Cob5Ke23aqajP8lSun5CnT13+eQ="; + "structdesc-0.1.0" = "sha256-KiR0R2YWZ7BucXIIeziu2FPJnbP7WNSQrxQhcNlpx2Q="; "tracing-0.2.0" = "sha256-31jmSvspNstOAh6VaWie+aozmGu4RpY9Gx2kbBVD+CI="; - "tree-sitter-bash-0.19.0" = "sha256-gTsA874qpCI/N5tmBI5eT8KDaM25gXM4VbcCbUU2EeI="; - "tree-sitter-md-0.1.2" = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; - "tree-sitter-yaml-0.0.1" = "sha256-bQ/APnFpes4hQLv37lpoADyjXDBY7J4Zg+rLyUtbra4="; "wasi-experimental-http-wasmtime-0.10.0" = "sha256-FuF3Ms1bT9bBasbLK+yQ2xggObm/lFDRyOvH21AZnQI="; }; }; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 1aa995d88051..de4cd6e26dfe 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { dontBuild = true; nativeBuildInputs = [ wrapQtAppsHook makeWrapper python3 ]; - propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ]; + propagatedBuildInputs = with python3.pkgs; [ pyqt6 docutils ]; desktopItem = makeDesktopItem { name = "leo-editor"; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c1ba4c7f533d..4d80030d7aa3 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2417,6 +2417,18 @@ final: prev: meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; + comment-box-nvim = buildVimPlugin { + pname = "comment-box.nvim"; + version = "v1.0.2"; + src = fetchFromGitHub { + owner = "LudoPinelli"; + repo = "comment-box.nvim"; + rev = "e04635ed2b423448b87ddb2f35c26d1a7b7b3f1c"; + sha256 = "sha256-2P8Zyd5ucOvihZdjgSmr7YlV0yuCn+LyHkCj9gPx/CY="; + }; + meta.homepage = "https://github.com/LudoPinelli/comment-box.nvim/"; + }; + committia-vim = buildVimPlugin { pname = "committia.vim"; version = "2023-11-25"; @@ -4690,6 +4702,19 @@ final: prev: meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; + helpview-nvim = buildVimPlugin { + pname = "helpview.nvim"; + version = "2024-08-12"; + src = fetchFromGitHub { + owner = "OXY2DEV"; + repo = "helpview.nvim"; + rev = "49398d628d74283c5a389a6ced40bd8d2daaf56c"; + sha256 = "0b1z3gz1jpqzf71kjpkw9q3fxbjcdykxi65an6npci0acia49ga2"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/OXY2DEV/helpview.nvim/"; + }; + hex-nvim = buildVimPlugin { pname = "hex.nvim"; version = "2024-03-03"; @@ -5987,6 +6012,18 @@ final: prev: meta.homepage = "https://github.com/mkasa/lushtags/"; }; + luvit-meta = buildVimPlugin { + pname = "luvit-meta"; + version = "2024-01-20"; + src = fetchFromGitHub { + owner = "Bilal2453"; + repo = "luvit-meta"; + rev = "ce76f6f6cdc9201523a5875a4471dcfe0186eb60"; + sha256 = "0a0n67day3zpfxck7yiqb496bz79gwhcvdn60b0f4bp8bysjj06c"; + }; + meta.homepage = "https://github.com/Bilal2453/luvit-meta/"; + }; + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-07-04"; @@ -9449,6 +9486,18 @@ final: prev: meta.homepage = "https://github.com/frigoeu/psc-ide-vim/"; }; + pum-vim = buildVimPlugin { + pname = "pum.vim"; + version = "2024-08-17"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "pum.vim"; + rev = "d9995c8f134ee84322d3dc6f12ea7f061dcacf3f"; + sha256 = "19akkaqja5khb3nqcm7yj84735vzkwqlr37k18bj34ncm60z9knw"; + }; + meta.homepage = "https://github.com/Shougo/pum.vim/"; + }; + purescript-vim = buildVimPlugin { pname = "purescript-vim"; version = "2023-02-06"; @@ -9629,6 +9678,18 @@ final: prev: meta.homepage = "https://github.com/winston0410/range-highlight.nvim/"; }; + ranger-nvim = buildVimPlugin { + pname = "ranger.nvim"; + version = "2024-02-09"; + src = fetchFromGitHub { + owner = "kelly-lin"; + repo = "ranger.nvim"; + rev = "d3b032feee6b3b0cf923222f260523e2bd7f3ad3"; + sha256 = "07c0rri7v0z9hjdj3vqsqjms43y2a9kqqac2s5is7ksz2hqi5yzj"; + }; + meta.homepage = "https://github.com/kelly-lin/ranger.nvim/"; + }; + ranger-vim = buildVimPlugin { pname = "ranger.vim"; version = "2021-12-13"; @@ -10435,6 +10496,18 @@ final: prev: meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; + stay-centered-nvim = buildVimPlugin { + pname = "stay-centered.nvim"; + version = "2024-04-13"; + src = fetchFromGitHub { + owner = "arnamak"; + repo = "stay-centered.nvim"; + rev = "91113bd82ac34f25c53d53e7c1545cb5c022ade8"; + sha256 = "030xikkr06lslp77z1i1xn6pgndnc12z3q2i8xd9vv8jmzylaf0c"; + }; + meta.homepage = "https://github.com/arnamak/stay-centered.nvim/"; + }; + styler-nvim = buildVimPlugin { pname = "styler.nvim"; version = "2024-07-22"; @@ -11232,6 +11305,18 @@ final: prev: meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; + themed-tabs-nvim = buildVimPlugin { + pname = "themed-tabs.nvim"; + version = "2023-11-09"; + src = fetchFromGitHub { + owner = "vhsconnect"; + repo = "themed-tabs.nvim"; + rev = "2ab0e463b929d717b58d10d600589e1ef642f7a4"; + sha256 = "04i76ndixdi2vpavqb6dy0pf72a7gya4dsr6l1vyjmray45jbda0"; + }; + meta.homepage = "https://github.com/vhsconnect/themed-tabs.nvim/"; + }; + thesaurus_query-vim = buildVimPlugin { pname = "thesaurus_query.vim"; version = "2022-12-11"; @@ -13646,6 +13731,18 @@ final: prev: meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; + vim-habamax = buildVimPlugin { + pname = "vim-habamax"; + version = "2024-01-22"; + src = fetchFromGitHub { + owner = "habamax"; + repo = "vim-habamax"; + rev = "8b4e045b711c7e90235a601ba2a923cdfacb2f46"; + sha256 = "02973qssq450d4411zjscsjvwz4fc2lpqvimah06k87skp8inp47"; + }; + meta.homepage = "https://github.com/habamax/vim-habamax/"; + }; + vim-hardtime = buildVimPlugin { pname = "vim-hardtime"; version = "2022-05-06"; @@ -15149,6 +15246,18 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-pencil/"; }; + vim-pets = buildVimPlugin { + pname = "vim-pets"; + version = "2024-07-26"; + src = fetchFromGitHub { + owner = "MeF0504"; + repo = "vim-pets"; + rev = "17d33f160c8fd3fb6492e7cd76f397ddaa26ad8d"; + sha256 = "0zn6kf088kqfdf5y0x6sd8rr3skrjwppsdfxmf044qk1h07lcgcc"; + }; + meta.homepage = "https://github.com/MeF0504/vim-pets/"; + }; + vim-phabricator = buildVimPlugin { pname = "vim-phabricator"; version = "2021-11-06"; @@ -17672,6 +17781,18 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; }; + vim-emacs-bindings = buildVimPlugin { + pname = "vim-emacs-bindings"; + version = "2016-10-07"; + src = fetchFromGitHub { + owner = "kentarosasaki"; + repo = "vim-emacs-bindings"; + rev = "a8037ef1b0cc0eca9aca15d4e2cab6d462aa57ee"; + sha256 = "18bhcvs5vnrr394waz9mg2fdnrycsc2ng589s2jw892pap9zxq36"; + }; + meta.homepage = "https://github.com/kentarosasaki/vim-emacs-bindings/"; + }; + vim-docbk-snippets = buildVimPlugin { pname = "vim-docbk-snippets"; version = "2023-09-29"; @@ -17684,5 +17805,17 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; + nvim-dap-rr = buildVimPlugin { + pname = "nvim-dap-rr"; + version = "2024-07-10"; + src = fetchFromGitHub { + owner = "jonboh"; + repo = "nvim-dap-rr"; + rev = "1682c13a2096a4a6394c803e14f009f121400acf"; + sha256 = "sha256-QtOY6gg2grsxF6KTn75hZ+BZGWK2ahzVu9k2SIIFeJU="; + }; + meta.homepage = "https://github.com/jonboh/nvim-dap-rr/"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 08cb334796f2..5c34c77a3f91 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -40,6 +40,7 @@ , pandoc , parinfer-rust , phpactor +, ranger , ripgrep , skim , sqlite @@ -142,6 +143,11 @@ dependencies = with super; [ telescope-nvim vim-fugitive vim-rhubarb ]; }; + animation-nvim = super.animation-nvim.overrideAttrs { + dependencies = with self; [ middleclass ]; + nvimRequireCheck = "animation"; + }; + autosave-nvim = super.autosave-nvim.overrideAttrs { dependencies = with super; [ plenary-nvim ]; }; @@ -783,7 +789,7 @@ ''; }; - fzf-hoogle-vim = super.fzf-hoogle-vim.overrideAttrs { + fzf-hoogle-vim = super.fzf-hoogle-vim.overrideAttrs (oa: { # add this to your lua config to prevent the plugin from trying to write in the # nix store: # vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json' @@ -792,7 +798,11 @@ gawk ]; dependencies = with self; [ fzf-vim ]; - }; + passthru = oa.passthru // { + + initLua = "vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json"; + }; + }); fzf-lua = super.fzf-lua.overrideAttrs { propagatedBuildInputs = [ fzf ]; @@ -1000,6 +1010,8 @@ lz-n = neovimUtils.buildNeovimPlugin { luaAttr = "lz-n"; }; + lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = "lzn-auto-require"; }; + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-03-13"; @@ -1073,6 +1085,11 @@ meta.maintainers = with lib.maintainers; [ vcunat ]; }; + middleclass = neovimUtils.buildNeovimPlugin { + luaAttr = "middleclass"; + nvimRequireCheck = "middleclass"; + }; + minimap-vim = super.minimap-vim.overrideAttrs { preFixup = '' substituteInPlace $out/plugin/minimap.vim \ @@ -1185,6 +1202,10 @@ nvimRequireCheck = "dapui"; }; + nvim-dap-rr = super.nvim-dap-rr.overrideAttrs { + dependencies = [ self.nvim-dap ]; + }; + nvim-genghis = super.nvim-genghis.overrideAttrs { dependencies = [ self.dressing-nvim ]; @@ -1377,6 +1398,14 @@ dependencies = with self; [ cmd-parser-nvim ]; }; + ranger-nvim = super.ranger-nvim.overrideAttrs { + patches = [ ./patches/ranger.nvim/fix-paths.patch ]; + + postPatch = '' + substituteInPlace lua/ranger-nvim.lua --replace '@ranger@' ${ranger} + ''; + }; + refactoring-nvim = super.refactoring-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter plenary-nvim ]; }; @@ -1397,6 +1426,8 @@ dependencies = with self; [ nvim-lspconfig ]; }; + rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rtp-nvim"; }; + rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = "rustaceanvim"; }; sg-nvim = super.sg-nvim.overrideAttrs (old: @@ -1506,7 +1537,7 @@ meta.homepage = "https://github.com/ackyshake/Spacegray.vim/"; }; - sqlite-lua = super.sqlite-lua.overrideAttrs { + sqlite-lua = super.sqlite-lua.overrideAttrs (oa: { postPatch = let libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -1515,7 +1546,11 @@ substituteInPlace lua/sqlite/defs.lua \ --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}" ''; - }; + + passthru = oa.passthru // { + initLua = ''vim.g.sqlite_clib_path = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"''; + }; + }); ssr = super.ssr-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter ]; @@ -1699,14 +1734,19 @@ sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; }; in - super.unicode-vim.overrideAttrs { + super.unicode-vim.overrideAttrs (oa: { # redirect to /dev/null else changes terminal color buildPhase = '' cp "${unicode-data}" autoload/unicode/UnicodeData.txt echo "Building unicode cache" ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null ''; - }; + + passthru = oa.passthru // { + + initLua = ''vim.g.Unicode_data_directory="${self.unicode-vim}/autoload/unicode"''; + }; + }); unison = super.unison.overrideAttrs { # Editor stuff isn't at top level @@ -2077,7 +2117,8 @@ }; windows-nvim = super.windows-nvim.overrideAttrs { - dependencies = with self; [ luaPackages.middleclass animation-nvim ]; + dependencies = with self; [ middleclass animation-nvim ]; + nvimRequireCheck = "windows"; }; wtf-nvim = super.wtf-nvim.overrideAttrs { diff --git a/pkgs/applications/editors/vim/plugins/patches/ranger.nvim/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/ranger.nvim/fix-paths.patch new file mode 100644 index 000000000000..496df312b4c7 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/ranger.nvim/fix-paths.patch @@ -0,0 +1,22 @@ +diff --git a/lua/ranger-nvim.lua b/lua/ranger-nvim.lua +index 3b18880..78eb9db 100644 +--- a/lua/ranger-nvim.lua ++++ b/lua/ranger-nvim.lua +@@ -109,7 +109,7 @@ local function build_ranger_cmd(select_current_file) + end + local selectfile_flag = select_current_file and " --selectfile=" .. selected_file or "" + return string.format( +- "ranger --choosefiles=%s %s %s", ++ "@ranger@ --choosefiles=%s %s %s", + SELECTED_FILEPATH, + selectfile_flag, + create_ranger_cmd_flags(create_cmd_values(opts.keybinds)) +@@ -182,7 +182,7 @@ end + ---Opens ranger and open selected files on exit. + ---@param select_current_file boolean|nil open ranger and select the current file. Defaults to true. + function M.open(select_current_file) +- if vim.fn.executable("ranger") ~= 1 then ++ if vim.fn.executable("@ranger@") ~= 1 then + vim.api.nvim_err_write( + "ranger executable not found, please check that ranger is installed and is in your path\n" + ) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index f44607c9cb71..64b5a4776d05 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -201,6 +201,7 @@ https://github.com/lilydjwg/colorizer/,, https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD, https://github.com/wincent/command-t/,, https://github.com/numtostr/comment.nvim/,, +https://github.com/LudoPinelli/comment-box.nvim/,HEAD, https://github.com/rhysd/committia.vim/,, https://github.com/hrsh7th/compe-conjure/,, https://github.com/GoldsteinE/compe-latex-symbols/,, @@ -392,6 +393,7 @@ https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, https://github.com/lukas-reineke/headlines.nvim/,HEAD, https://github.com/rebelot/heirline.nvim/,, +https://github.com/OXY2DEV/helpview.nvim/,HEAD, https://github.com/RaafatTurki/hex.nvim/,HEAD, https://github.com/Yggdroot/hiPairs/,, https://github.com/tzachar/highlight-undo.nvim/,HEAD, @@ -501,6 +503,7 @@ https://github.com/l3mon4d3/luasnip/,, https://github.com/alvarosevilla95/luatab.nvim/,, https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, +https://github.com/Bilal2453/luvit-meta/,HEAD, https://github.com/WhiteBlackGoose/magma-nvim-goose/,HEAD, https://github.com/winston0410/mark-radar.nvim/,HEAD, https://github.com/iamcco/markdown-preview.nvim/,, @@ -660,6 +663,7 @@ https://github.com/yamatsum/nvim-cursorline/,, https://github.com/mfussenegger/nvim-dap/,, https://github.com/leoluz/nvim-dap-go/,HEAD, https://github.com/mfussenegger/nvim-dap-python/,HEAD, +https://github.com/jonboh/nvim-dap-rr/,HEAD, https://github.com/rcarriga/nvim-dap-ui/,, https://github.com/theHamsta/nvim-dap-virtual-text/,, https://github.com/kndndrj/nvim-dbee/,HEAD, @@ -794,6 +798,7 @@ https://github.com/vim-scripts/prev_indent/,, https://github.com/ahmedkhalf/project.nvim/,, https://github.com/kevinhwang91/promise-async/,HEAD, https://github.com/frigoeu/psc-ide-vim/,, +https://github.com/Shougo/pum.vim/,HEAD, https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, https://github.com/vim-python/python-syntax/,, @@ -809,6 +814,7 @@ https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD, https://github.com/kien/rainbow_parentheses.vim/,, https://github.com/vim-scripts/random.vim/,, https://github.com/winston0410/range-highlight.nvim/,, +https://github.com/kelly-lin/ranger.nvim/,, https://github.com/rafaqz/ranger.vim/,, https://github.com/vim-scripts/rcshell.vim/,, https://github.com/ryvnf/readline.vim/,, @@ -877,6 +883,7 @@ https://github.com/josegamez82/starrynight/,HEAD, https://github.com/darfink/starsearch.vim/,, https://github.com/startup-nvim/startup.nvim/,HEAD, https://github.com/luukvbaal/statuscol.nvim/,, +https://github.com/arnamak/stay-centered.nvim/,HEAD, https://github.com/folke/styler.nvim/,, https://github.com/teto/stylish.nvim/,HEAD, https://github.com/gbprod/substitute.nvim/,HEAD, @@ -942,6 +949,7 @@ https://github.com/ternjs/tern_for_vim/,, https://github.com/KeitaNakamura/tex-conceal.vim/,, https://github.com/let-def/texpresso.vim/,HEAD, https://github.com/johmsalas/text-case.nvim/,HEAD, +https://github.com/vhsconnect/themed-tabs.nvim/,HEAD, https://github.com/ron89/thesaurus_query.vim/,, https://github.com/itchyny/thumbnail.vim/,, https://github.com/vim-scripts/timestamp.vim/,, @@ -1104,6 +1112,7 @@ https://github.com/xolox/vim-easytags/,, https://github.com/justincampbell/vim-eighties/,, https://github.com/elixir-editors/vim-elixir/,, https://github.com/andys8/vim-elm-syntax/,, +https://github.com/kentarosasaki/vim-emacs-bindings/,HEAD, https://github.com/junegunn/vim-emoji/,, https://github.com/tpope/vim-endwise/,, https://github.com/Olical/vim-enmasse/,HEAD, @@ -1150,6 +1159,7 @@ https://github.com/mhinz/vim-grepper/,, https://github.com/lifepillar/vim-gruvbox8/,, https://github.com/brennanfee/vim-gui-position/,, https://github.com/ludovicchabant/vim-gutentags/,, +https://github.com/habamax/vim-habamax/,HEAD, https://github.com/takac/vim-hardtime/,, https://github.com/chkno/vim-haskell-module-name/,, https://github.com/enomsg/vim-haskellConcealPlus/,, @@ -1276,6 +1286,7 @@ https://github.com/sickill/vim-pasta/,, https://github.com/tpope/vim-pathogen/,, https://github.com/junegunn/vim-peekaboo/,, https://github.com/preservim/vim-pencil/,, +https://github.com/MeF0504/vim-pets/,HEAD, https://github.com/jparise/vim-phabricator/,, https://github.com/justinj/vim-pico8-syntax/,, https://github.com/junegunn/vim-plug/,, diff --git a/pkgs/applications/emulators/86box/darwin.patch b/pkgs/applications/emulators/86box/darwin.patch new file mode 100644 index 000000000000..b63649c19d12 --- /dev/null +++ b/pkgs/applications/emulators/86box/darwin.patch @@ -0,0 +1,15 @@ +diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp +index 824f71023..1f38e4b5f 100644 +--- a/src/qt/qt_platform.cpp ++++ b/src/qt/qt_platform.cpp +@@ -673,6 +673,10 @@ plat_init_rom_paths(void) + rom_add_path(QDir(path).filePath("86Box/roms").toUtf8().constData()); + #endif + } ++ ++ #ifdef __APPLE__ ++ rom_add_path("@out@/share/86Box/roms/"); ++ #endif + } + + void diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index 00f7290a49ca..5633eb64af5a 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -1,5 +1,6 @@ { stdenv, + darwin, lib, fetchFromGitHub, cmake, @@ -42,29 +43,43 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ioE0EVIXv/biXXvLqwhmtZ/RJM0nLqcE+i+CU+WXBY4="; }; - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - qt5.wrapQtAppsHook - ] ++ lib.optionals enableWayland [ extra-cmake-modules wayland-scanner ]; + patches = [ ./darwin.patch ]; - buildInputs = [ - freetype - fluidsynth - SDL2 - glib - openal - rtmidi - pcre2 - jack2 - libpcap - libslirp - qt5.qtbase - qt5.qttools - ] ++ lib.optional stdenv.isLinux alsa-lib + postPatch = '' + substituteAllInPlace src/qt/qt_platform.cpp + ''; + + nativeBuildInputs = + [ + cmake + pkg-config + makeWrapper + qt5.wrapQtAppsHook + ] + ++ lib.optionals enableWayland [ + extra-cmake-modules + wayland-scanner + ]; + + buildInputs = + [ + freetype + fluidsynth + SDL2 + glib + openal + rtmidi + pcre2 + jack2 + libpcap + libslirp + qt5.qtbase + qt5.qttools + ] + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional enableWayland wayland - ++ lib.optional enableVncRenderer libvncserver; + ++ lib.optional enableVncRenderer libvncserver + ++ lib.optional stdenv.isDarwin darwin.apple_sdk_11_0.libs.xpc; cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" @@ -108,12 +123,17 @@ stdenv.mkDerivation (finalAttrs: { makeWrapperArgs+=(--prefix ${libPathVar} : "${libPath}") ''; - meta = with lib; { + meta = { description = "Emulator of x86-based machines based on PCem"; mainProgram = "86Box"; homepage = "https://86box.net/"; - license = with licenses; [ gpl2Only ] ++ optional (unfreeEnableDiscord || unfreeEnableRoms) unfree; - maintainers = [ maintainers.jchw ]; - platforms = platforms.linux; + license = + with lib.licenses; + [ gpl2Only ] ++ lib.optional (unfreeEnableDiscord || unfreeEnableRoms) unfree; + maintainers = with lib.maintainers; [ + jchw + matteopacini + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch b/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch deleted file mode 100644 index 0edc6281a7ef..000000000000 --- a/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 351be6b3f2ad10d86ec4ae711db5a1067acc592a Mon Sep 17 00:00:00 2001 -From: Zane van Iperen -Date: Sun, 7 Nov 2021 15:17:07 +1000 -Subject: [PATCH] libpcsxcore: fix build with ffmpeg 4 - ---- - libpcsxcore/cdriso.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c -index f89678e..6314482 100644 ---- a/libpcsxcore/cdriso.c -+++ b/libpcsxcore/cdriso.c -@@ -266,14 +266,14 @@ static int decode_compressed_cdda_track(FILE* outfile, const char* infilepath, s - } - - if (!decoded_frame) { -- if (!(decoded_frame = avcodec_alloc_frame())) { -+ if (!(decoded_frame = av_frame_alloc())) { - SysMessage(_(" -> Error allocating audio frame buffer. This track will not be available.")); - avformat_close_input(&inAudioFormat); -- avcodec_free_frame(&decoded_frame); -+ av_frame_free(&decoded_frame); - return 1; // error decoding frame - } - } else { -- avcodec_get_frame_defaults(decoded_frame); -+ av_frame_unref(decoded_frame); - } - len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt); - if (len > 0 && got_frame) { -@@ -285,7 +285,7 @@ static int decode_compressed_cdda_track(FILE* outfile, const char* infilepath, s - fwrite(decoded_frame->data[0], 1, data_size, outfile); - } - av_free_packet(&avpkt); -- //avcodec_free_frame(&decoded_frame); -+ //av_frame_free(&decoded_frame); - } while (moreFrames >= 0); // TODO: check for possible leaks - - // file will be closed later on, now just flush it -@@ -294,7 +294,7 @@ static int decode_compressed_cdda_track(FILE* outfile, const char* infilepath, s - avformat_close_input(&inAudioFormat); - //avcodec_close(c); - //av_free(c); -- avcodec_free_frame(&decoded_frame); -+ av_frame_free(&decoded_frame); - return 0; - } - #endif -@@ -340,12 +340,12 @@ static int decode_compressed_cdda_track(FILE* outfile, FILE* infile, enum AVCode - while (avpkt.size > 0) { - int got_frame = 0; - if (!decoded_frame) { -- if (!(decoded_frame = avcodec_alloc_frame())) { -+ if (!(decoded_frame = av_frame_alloc())) { - SysPrintf(" -> Error allocating audio frame buffer. Track will not be available."); - return 1; // error decoding frame - } - } else { -- avcodec_get_frame_defaults(decoded_frame); -+ av_frame_unref(decoded_frame); - } - - len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt); -@@ -383,7 +383,7 @@ static int decode_compressed_cdda_track(FILE* outfile, FILE* infile, enum AVCode - - avcodec_close(c); - av_free(c); -- avcodec_free_frame(&decoded_frame); -+ av_frame_free(&decoded_frame); - return 0; - } - #endif --- -2.31.1 - diff --git a/pkgs/applications/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix deleted file mode 100644 index 06559af0e732..000000000000 --- a/pkgs/applications/emulators/pcsxr/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, intltool, pkg-config, gtk3, SDL2, xorg -, wrapGAppsHook3, libcdio, nasm, ffmpeg_4, file -, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "pcsxr"; - version = "1.9.94"; - - # codeplex does not support direct downloading - src = fetchurl { - url = "mirror://debian/pool/main/p/pcsxr/pcsxr_${version}.orig.tar.xz"; - sha256 = "0q7nj0z687lmss7sgr93ij6my4dmhkm2nhjvlwx48dn2lxl6ndla"; - }; - - patches = [ - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/01_fix-i386-exec-stack.patch"; - sha256 = "17497wjxd6b92bj458s2769d9bpp68ydbvmfs9gp51yhnq4zl81x"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/02_disable-ppc-auto-dynarec.patch"; - sha256 = "0v8n79z034w6cqdrzhgd9fkdpri42mzvkdjm19x4asz94gg2i2kf"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/03_fix-plugin-dir.patch"; - sha256 = "0vkl0mv6whqaz79kvvvlmlmjpynyq4lh352j3bbxcr0vjqffxvsy"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/04_update-homedir-symlinks.patch"; - sha256 = "18r6n025ybr8fljfsaqm4ap31wp8838j73lrsffi49fkis60dp4j"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/05_format-security.patch"; - sha256 = "03m4kfc9bk5669hf7ji1anild08diliapx634f9cigyxh72jcvni"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/06_warnings.patch"; - sha256 = "0iz3g9ihnhisfgrzma9l74y4lhh57na9h41bmiam1millb796g71"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/07_non-linux-ip-addr.patch"; - sha256 = "14vb9l0l4nzxcymhjjs4q57nmsncmby9qpdr7c19rly5wavm4k77"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/08_reproducible.patch"; - sha256 = "1cx9q59drsk9h6l31097lg4aanaj93ysdz5p88pg9c7wvxk1qz06"; - }) - - ./uncompress2.patch - ./0001-libpcsxcore-fix-build-with-ffmpeg-4.patch - ]; - - nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook3 ]; - buildInputs = [ - gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg_4 file - xorg.libXxf86vm - ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: AboutDlg.o:/build/pcsxr/gui/Linux.h:42: multiple definition of `cfgfile'; - # LnxMain.o:/build/pcsxr/gui/Linux.h:42: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - dynarecTarget = - if stdenv.isx86_64 then "x86_64" - else if stdenv.isi686 then "x86" - else "no"; #debian patch 2 says ppc doesn't work - - configureFlags = [ - "--enable-opengl" - "--enable-ccdda" - "--enable-libcdio" - "--enable-dynarec=${dynarecTarget}" - ]; - - postInstall = '' - mkdir -p "$out/share/doc/${pname}-${version}" - cp README \ - AUTHORS \ - doc/keys.txt \ - doc/tweaks.txt \ - ChangeLog.df \ - ChangeLog \ - "$out/share/doc/${pname}-${version}" - ''; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Playstation 1 emulator"; - homepage = "https://github.com/iCatButler/pcsxr"; - maintainers = with maintainers; [ rardiol ]; - license = licenses.gpl2Plus; - platforms = platforms.all; - mainProgram = "pcsxr"; - }; -} diff --git a/pkgs/applications/emulators/pcsxr/uncompress2.patch b/pkgs/applications/emulators/pcsxr/uncompress2.patch deleted file mode 100644 index 356868ce7a8b..000000000000 --- a/pkgs/applications/emulators/pcsxr/uncompress2.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/libpcsxcore/cdriso.c -+++ b/libpcsxcore/cdriso.c -@@ -1219,7 +1219,7 @@ - return ret; - } - --static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) -+static int uncompress3(void *out, unsigned long *out_size, void *in, unsigned long in_size) - { - static z_stream z; - int ret = 0; -@@ -1298,7 +1298,7 @@ - if (is_compressed) { - cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift; - cdbuffer_size = cdbuffer_size_expect; -- ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); -+ ret = uncompress3(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); - if (ret != 0) { - SysPrintf("uncompress failed with %d for block %d, sector %d\n", - ret, block, sector); diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 7e7090a87a64..83cb0b2bbc63 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -8,7 +8,7 @@ , alsa-lib , dbus , fetchFromGitHub -, ffmpeg_4 +, ffmpeg_7 , flac , freetype , gamemode @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { lib.optional (runtimeLibs != [ ]) makeWrapper; buildInputs = [ - ffmpeg_4 + ffmpeg_7 flac freetype libGL diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 5e55f8c75e3e..8b47329cd4a2 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -78,14 +78,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.9"; + version = "3.34.10"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-4ZgCvg3VSa1LJQ8yr45nY4ZI7tyVVdW7WPK/jwBI+HU="; + hash = "sha256-E2Ak14h1kWdGq+JNbCeh5YJkr/S9g/0HD834MtgACSA="; }; passthru = { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 4ac26a0c804b..d7c743e36a53 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -79,14 +79,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.38.1"; + version = "3.38.2"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-8fwLn77CK8w4srJNUilfJumDt2wCcQLs9D5/4tzpzPA="; + hash = "sha256-lArwRtHR/KAsgjpjid6YnPA9BkcG1Mg/KeIIOWN75Kg="; }; passthru = { diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index 3f3d39769f81..a3eee31d7877 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.8.22"; + version = "0.8.23"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-hsXrpHT+B1Oev+ygXj/2Ma3zszMuW6csgQGJGeYCiAM="; + hash = "sha256-Dg1FFB9WVB4SWInSyOYb1TCPAtCa9gwsFLUX+UhL4DY="; }; - cargoHash = "sha256-X6KR+h+f/mdazqxo8xQK5geeZC12h8uQ3ENMKyaw7aw="; + cargoHash = "sha256-Ze3ACs9WyoxNsaeJlZWhR0g+aFsntwNLLYbw2RnmwfE="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 41c51787d7e4..4470ccfec421 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -8,18 +8,25 @@ , python3 , makeWrapper +, backward-cpp +, curl +, enet +, freetype , glm +, gtest +, libbfd +, libdwarf +, libjpeg +, libuuid +, libuv , lua5_4 +, lzfse +, opencl-headers , SDL2 , SDL2_mixer -, enet -, libuv -, libuuid , wayland-protocols , Carbon , CoreServices -# optionals -, opencl-headers , OpenCL , callPackage @@ -28,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vengi-tools"; - version = "0.0.32"; + version = "0.0.33"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${finalAttrs.version}"; - hash = "sha256-3oL+hRFATdJmBmZK55Ui2blj8LTqt/zJWJ85kSUFCY4="; + hash = "sha256-ljB36A5b8K1KBBuQVISb1fkWxb/tTTwojE31KPMg1xQ="; }; nativeBuildInputs = [ @@ -46,32 +53,33 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libbfd + libdwarf + backward-cpp + curl + enet + freetype glm + libjpeg + libuuid + libuv lua5_4 + lzfse SDL2 SDL2_mixer - enet - libuv - libuuid - # Only needed for the game - #postgresql - #libpqxx - #mosquitto ] ++ lib.optional stdenv.isLinux wayland-protocols ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices OpenCL ] ++ lib.optional (!stdenv.isDarwin) opencl-headers; - cmakeFlags = [ - # Disable tests due to a problem in linking gtest: - # ld: /build/vengi-tests-core.LDHlV1.ltrans0.ltrans.o: in function `main': - # :(.text.startup+0x3f): undefined reference to `testing::InitGoogleMock(int*, char**)' - "-DUNITTESTS=OFF" - "-DVISUALTESTS=OFF" - # We're only interested in the generic tools - "-DGAMES=OFF" - "-DMAPVIEW=OFF" - "-DAIDEBUG=OFF" - ] ++ lib.optional stdenv.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; + cmakeFlags = + lib.optional stdenv.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; + + # error: "The plain signature for target_link_libraries has already been used" + doCheck = false; + + checkInputs = [ + gtest + ]; # Set the data directory for each executable. We cannot set it at build time # with the PKGDATADIR cmake variable because each executable needs a specific @@ -105,5 +113,6 @@ stdenv.mkDerivation (finalAttrs: { license = [ licenses.mit licenses.cc-by-sa-30 ]; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; }) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index ba33c8baa85b..6baa2bac220d 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.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - hash = "sha256-eowsQhaS9RGfsw157HahENuWUWtwkwyPNSFw135MW0c="; + hash = "sha256-OdRx8fev0weXgSMEUhSm7aESN2W3BVnJpgtrlEUo+L0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index 7428453a20cc..353252dfea17 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, bambu-studio, - opencv2, + opencv, }: bambu-studio.overrideAttrs ( finalAttrs: previousAttrs: { @@ -28,7 +28,7 @@ bambu-studio.overrideAttrs ( buildInputs = previousAttrs.buildInputs ++ [ - opencv2 + opencv ]; preFixup = '' diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix index a8d252adfb7d..5105abd271c6 100644 --- a/pkgs/applications/misc/chatblade/default.nix +++ b/pkgs/applications/misc/chatblade/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "chatblade"; - version = "0.4.0"; + version = "0.6.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-AjE+1MkSkZOtEUPKEPBKQ3n+aOB8cwsorBpL5skNskU="; + hash = "sha256-N4YzXOlD1ULhiHrqA6CLOwBStQSEbz8yqtOt5mCRWLQ="; }; doCheck = false; # there are no tests @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec { openai platformdirs pygments + pylatexenc pyyaml regex requests diff --git a/pkgs/applications/misc/dmenu-rs/default.nix b/pkgs/applications/misc/dmenu-rs/default.nix index 37ddb8922a83..87d484c2e9bf 100644 --- a/pkgs/applications/misc/dmenu-rs/default.nix +++ b/pkgs/applications/misc/dmenu-rs/default.nix @@ -18,13 +18,13 @@ # See: https://github.com/Shizcow/dmenu-rs#plugins stdenv.mkDerivation rec { pname = "dmenu-rs"; - version = "5.5.3"; + version = "5.5.4"; src = fetchFromGitHub { owner = "Shizcow"; repo = "dmenu-rs"; rev = version; - hash = "sha256-05Ia+GHeL8PzOwR7H+NEVhKJVMPhlIaQLwGfvwOAl0g="; + hash = "sha256-LdbTvuq1IbzWEoASscIh3j3VAHm+W3UekJNiMHTxSQI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 815a482a216f..a3cccb9f859f 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -11,13 +11,13 @@ python3Packages.buildPythonApplication rec { pname = "dockbarx"; - version = "1.0-beta2"; + version = "1.0-beta4"; src = fetchFromGitHub { owner = "xuzhen"; repo = "dockbarx"; rev = version; - sha256 = "sha256-WMRTtprDHUbOOYVHshx7WpBlYshbiDjI12Rw3tQQuPI="; + sha256 = "sha256-J/5KpHptGzgRF1qIGrgjkRR3in5pE0ffkiYVTR3iZKY="; }; nativeBuildInputs = [ @@ -46,23 +46,6 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; - postPatch = '' - substituteInPlace setup.py \ - --replace /usr/ "" \ - --replace '"/", "usr", "share",' '"share",' - - for f in \ - dbx_preference \ - dockbarx/applets.py \ - dockbarx/dockbar.py \ - dockbarx/iconfactory.py \ - dockbarx/theme.py \ - mate_panel_applet/dockbarx_mate_applet - do - substituteInPlace $f --replace /usr/share/ $out/share/ - done - ''; - postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas ''; diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 813869496cb9..256892aa0c99 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -17,6 +17,8 @@ , json-glib , libgudev , dbus +, gmobile +, umockdev }: let @@ -24,13 +26,13 @@ let domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd-device-themes"; - rev = "v0.1.0"; - sha256 = "sha256-YK9fJ3awmhf1FAhdz95T/POivSO93jsNApm+u4OOZ80="; + rev = "v0.4.0"; + hash = "sha256-kY/+DyRxKEUzq7ctl6Va14AKUCpWU7NRQhJOwhtkJp8="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "feedbackd"; - version = "0.2.0"; + version = "0.4.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -38,9 +40,8 @@ stdenv.mkDerivation rec { domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd"; - rev = "v${version}"; - hash = "sha256-l5rfMx3ElW25A5WVqzfKBp57ebaNC9msqV7mvnwv10s="; - fetchSubmodules = true; + rev = "v${finalAttrs.version}"; + hash = "sha256-ta14DYqkid8Cp8fx9ZMGOOJroCBszN9/VrTN6mrpTZg="; }; depsBuildBuild = [ @@ -66,22 +67,26 @@ stdenv.mkDerivation rec { gsound json-glib libgudev + gmobile ]; mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" + # Make compiling work when doCheck = false + "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; nativeCheckInputs = [ dbus + umockdev ]; doCheck = true; postInstall = '' mkdir -p $out/lib/udev/rules.d - sed "s|/usr/libexec/|$out/libexec/|" < $src/debian/feedbackd.udev > $out/lib/udev/rules.d/90-feedbackd.rules + sed "s|/usr/libexec/|$out/libexec/|" < $src/data/90-feedbackd.rules > $out/lib/udev/rules.d/90-feedbackd.rules cp ${themes}/data/* $out/share/feedbackd/themes/ ''; @@ -103,4 +108,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ pacman99 ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/applications/misc/flashprint/default.nix index 182e219d0e57..96f1db7df91b 100644 --- a/pkgs/applications/misc/flashprint/default.nix +++ b/pkgs/applications/misc/flashprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashprint"; - version = "5.8.4"; + version = "5.8.6"; src = fetchurl { url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; - hash = "sha256-Gr76yG3Qz7bnbm5YerHbpb+yzqhw1LthUb4qIH03VQw="; + hash = "sha256-oi/nEdOjhbYf9IZmppfKiEmlNGXdc907LS2x8jUck+M="; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix index 046e296489b6..cdf030b6e723 100644 --- a/pkgs/applications/misc/gnome-secrets/default.nix +++ b/pkgs/applications/misc/gnome-secrets/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; - version = "8.0"; + version = "9.6"; format = "other"; src = fetchFromGitLab { @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "secrets"; rev = version; - hash = "sha256-SEPQjl6hd8IBs0c0LBEYaqn2n8CGQmYSEMJp5yoL/PA="; + hash = "sha256-iF2AQYAwwIr/sCZUz1pdqEa74DH4y4Nts6aJj3mS2f4="; }; nativeBuildInputs = [ @@ -49,9 +49,11 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pygobject3 construct + pykcs11 pykeepass pyotp validators + yubico zxcvbn ]; diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index f8f5d6778b21..9ccf6b6edd6f 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-cSPzbPGUwgvaFJ4qp9Dmm+hwORI5ndFqXjuAjjPwFeQ="; + hash = "sha256-kR/DNNWCFj/ott31bcppA2gkpNK5OY+SsjYcQak5CK8="; }; - vendorHash = "sha256-1M+qg20OMeOzxwTkYVROYAhK6lHhXoZ5bAnU2PNaYPQ="; + vendorHash = "sha256-pjWaAeBXIBG+g3TPxioIG9Cl4rvEf4QjyinAtCBYSug="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index ed8f44f45266..a660ee2a5d83 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ { requireFile, callPackage }: callPackage ./runtime-build.nix rec { - version = "20.5.278"; + version = "20.5.332"; eulaDate = "2021-10-13"; src = requireFile { name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz"; - hash = "sha256-O5oAoiDiu+xrmDfTnilPqZue8+dXVTHnK0yrX6moTSc="; + hash = "sha256-ZqbLCWfPUo0fXS9liKOXsUEpm1d60bHIkbx+K98gFtU="; url = "https://www.sidefx.com/download/daily-builds/?production=true"; }; } diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index d4c199d48939..0c457655c44c 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts, xmlstarlet }: let - url = "https://app.hubstaff.com/download/7473-standard-linux-1-6-24-release"; - version = "1.6.24-094b0af9"; - sha256 = "sha256:1jwyl51lljxn6hnkp07bvgw60bqmq3gb0rdgvxmd7r8x3y3xshx1"; + url = "https://app.hubstaff.com/download/8099-standard-linux-1-6-26-release"; + version = "1.6.26-95441346"; + sha256 = "sha256:0xxw2za1hmqff5y0vyrvccgldsgyb808dql548c2xqsc1qi9gbn9"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index 2778db3ca8b2..263ac29eaed2 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.18.0"; + version = "0.19.0"; src = fetchCrate { inherit version pname; - hash = "sha256-m9S8fG0c+67/msdWaN8noazEdsdLk1aswUJ+8hkjhxo="; + hash = "sha256-9xYWjpeXg646JEW7faRLE1Au6LRVU6QQ7zfAwmYffT0="; }; - cargoHash = "sha256-6d/v89Yqn9FioWQTb5513kPbO9lnzBxaubfcdCzwUP4="; + cargoHash = "sha256-gtcznStbuYWcBPKZ/hdH15cwRQL0+Q0fZHe+YW5Rek0="; buildFeatures = [ "nu-ansi-term" ]; diff --git a/pkgs/applications/misc/mupdf/1.17/darwin.patch b/pkgs/applications/misc/mupdf/1.17/darwin.patch deleted file mode 100644 index be1b84b0012f..000000000000 --- a/pkgs/applications/misc/mupdf/1.17/darwin.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ruN mupdf-1.14.0-source.orig/Makerules mupdf-1.14.0-source/Makerules ---- mupdf-1.14.0-source.orig/Makerules 2018-11-02 06:57:12.114012496 +0100 -+++ mupdf-1.14.0-source/Makerules 2018-11-02 10:11:56.717232992 +0100 -@@ -80,13 +80,6 @@ - HAVE_GLUT := yes - SYS_GLUT_CFLAGS := -Wno-deprecated-declarations - SYS_GLUT_LIBS := -framework GLUT -framework OpenGL -- CC = xcrun cc -- AR = xcrun ar -- LD = xcrun ld -- RANLIB = xcrun ranlib -- --else ifeq ($(OS),Linux) -- HAVE_OBJCOPY := yes - - ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) - SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) -@@ -119,12 +112,6 @@ - SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) - endif - -- HAVE_GLUT := yes -- ifeq ($(HAVE_GLUT),yes) -- SYS_GLUT_CFLAGS := -- SYS_GLUT_LIBS := -lglut -lGL -- endif -- - HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) - ifeq ($(HAVE_X11),yes) - X11_CFLAGS := $(shell pkg-config --cflags x11 xext) diff --git a/pkgs/applications/misc/mupdf/1.17/default.nix b/pkgs/applications/misc/mupdf/1.17/default.nix deleted file mode 100644 index 932e23682f71..000000000000 --- a/pkgs/applications/misc/mupdf/1.17/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv, lib, fetchurl, pkg-config, freetype, harfbuzz, openjpeg -, jbig2dec, libjpeg , darwin -, enableX11 ? true, libX11, libXext, libXi, libXrandr -, enableCurl ? true, curl, openssl -, enableGL ? true, libglut, libGLU -}: - -let - - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.versions.majorMinor (lib.getVersion openjpeg); - - -in stdenv.mkDerivation rec { - version = "1.17.0"; - pname = "mupdf"; - - src = fetchurl { - url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; - }; - - patches = - # Use shared libraries to decrease size - lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch - ++ lib.optional stdenv.isDarwin ./darwin.patch - ; - - postPatch = '' - sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c - ''; - - makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; - nativeBuildInputs = [ pkg-config ]; - 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 - [ libglut libGLU ]) - ; - outputs = [ "bin" "dev" "out" "man" "doc" ]; - - preConfigure = '' - # Don't remove mujs because upstream version is incompatible - rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} - ''; - - postInstall = '' - mkdir -p "$out/lib/pkgconfig" - cat >"$out/lib/pkgconfig/mupdf.pc" < $bin/share/applications/mupdf.desktop < $out/jitsi_external_api.min.js echo "${finalAttrs.version}" > "$out/version" jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index 5d5fecf55477..2387b6ce5db6 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.74"; + "version" = "1.11.75"; "hashes" = { - "desktopSrcHash" = "sha256-RKDwtoad8gP1fAjkg2+6BJj6z8SqYk1ddG7wQ9wI1XQ="; + "desktopSrcHash" = "sha256-bO23E1xG3FfizBBAWh0kCN+5JYbiX5V/wxLlY6ljWVQ="; "desktopYarnHash" = "0bl78yd7apd5qbsqyhxnwj7lwrjx5820zh22rzgn9jqkcv25jwgw"; - "webSrcHash" = "sha256-5Tujhqias3+k4BgQbO8R0toHlKQcAywG2MWBZX1SVOM="; - "webYarnHash" = "06wmzxsc0iijrz017lb40nydb05n8ckmin2rrwiw25bl8ywfw0qr"; + "webSrcHash" = "sha256-cDayCoznbmALOiPg9FUYrfdFjzg0NV1NY9/b2KzTvMs="; + "webYarnHash" = "04si1x663z70nxj6nfaq7m2wcd8r4l3vdpirnjhc13wrj1kb8r8x"; }; } diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix deleted file mode 100644 index f3362ab77501..000000000000 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, mkFranzDerivation, fetchurl, xorg, xdg-utils, buildEnv, writeShellScriptBin }: - -let - mkFranzDerivation' = mkFranzDerivation.override { - xdg-utils = buildEnv { - name = "xdg-utils-for-ferdi"; - paths = [ - xdg-utils - (lib.hiPrio (writeShellScriptBin "xdg-open" '' - unset GDK_BACKEND - exec ${xdg-utils}/bin/xdg-open "$@" - '')) - ]; - }; - }; -in -mkFranzDerivation' rec { - pname = "ferdi"; - name = "Ferdi"; - version = "5.8.1"; - src = fetchurl { - url = "https://master.dl.sourceforge.net/project/ferdi.mirror/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-Bl7bM5iDQlfPSZxksqlg7GbuwWlm53QkOf/TQEg3/n0="; - }; - extraBuildInputs = [ xorg.libxshmfence ]; - meta = with lib; { - description = "Combine your favorite messaging services into one application"; - homepage = "https://getferdi.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; - maintainers = with maintainers; [ davidtwco ]; - platforms = [ "x86_64-linux" ]; - hydraPlatforms = [ ]; - knownVulnerabilities = [ - "CVE-2022-32320" - ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index d78109b9b69f..8e8d18e63005 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -6,14 +6,14 @@ let aarch64-linux = "arm64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - amd64-linux_hash = "sha256-4yMaW1ByEQaQHdn99TGpUez2jVi5Ad4ODpugzW6kTm8="; - arm64-linux_hash = "sha256-oIkHF1l7Un4W6/zufa+DOLi9oujQ2Zaq8AaKoHDAMRc="; + amd64-linux_hash = "sha256-gx8tDGb2yjwexChZGJ9RdVbgseDByFeW2ZR1RebjlO4="; + arm64-linux_hash = "sha256-/qv931J4ufKpAtj7KEqrN6klZ59ueHpbWJXsndBuD90="; }."${arch}-linux_hash"; in mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.7.4"; + version = "6.7.6"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb"; inherit hash; diff --git a/pkgs/applications/networking/instant-messengers/iamb/default.nix b/pkgs/applications/networking/instant-messengers/iamb/default.nix index af2e87541175..655a20c12ac6 100644 --- a/pkgs/applications/networking/instant-messengers/iamb/default.nix +++ b/pkgs/applications/networking/instant-messengers/iamb/default.nix @@ -8,20 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "iamb"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "ulyssa"; repo = "iamb"; rev = "v${version}"; - hash = "sha256-UYc7iphpzqZPwhOn/ia7XvnnlIUvM7nSFBz67ZkXmNs="; + hash = "sha256-cjBSWUBgfwdLnpneJ5XW2TdOFkNc+Rc/wyUp9arZzwg="; }; - cargoHash = "sha256-982FdK6ej3Bbg4R9e43VSwlni837ZK4rkMkoeYMyW8E="; + cargoHash = "sha256-a5y8nNFixOxJPNDOzvFFRqVrY2jsirCud2ZJJ8OvRhQ="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Cocoa ]; postInstall = '' diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 946b77512e17..e457d7bdbc35 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -23,6 +23,7 @@ buildDunePackage rec { buildInputs = [ erm_xmpp tls + tls-lwt mirage-crypto-pk x509 domain-name diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix index 653708abe3b6..e3713afbec0e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "Native Hangouts support for pidgin"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ralith ]; + maintainers = [ ]; }; } 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 f4fbeb19ae6b..e736d20fe4e4 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.19.0"; + version = "7.21.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-lO8GOCc/L4WO+aPR6qSn3HQlqeCB6t5pWAENRXOThdI="; + hash = "sha256-mjf27BISkvN9Xsi36EXtiSkvaPEc4j/Cwjlh4gkfdsA="; } 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 15fe94878fc7..4dfe20e94892 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.3.2"; + version = "5.4.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-fTXZdos0iIHmgWCKOU+B3tpxzLsUUtqx92Od75OdZH8="; + hash = "sha256-AWu0LH6DH/omcIsgIBHQIg1uCKN9Ly6EVj4U9QxoSlg="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 20ec6f33c200..64541fc79e97 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2024-08-02"; + version = "0-unstable-2024-08-04"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "c425281150317753d7bc5182c6572abe20f9a784"; - sha256 = "sha256-EHQyGE2S2F2UqNl7VDb38pcdv3amm8lGqWZds5ZoHRE="; + rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8"; + sha256 = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 2f71df5cef5a..25878085a30f 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -32,7 +32,7 @@ let npmBuildScript = "dist"; nativeBuildInputs = [ - python3 # Used by gyp + (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp ]; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 65f16353014d..9459084a4873 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { src = fetchurl { # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - hash = "sha256-RrObmN21QOm5nk0R2avgCH0ulrfiUIo2PnyYWvQaGVw="; + hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index 979a6abd7f3c..3a03bef180a9 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "44.5.0.29672"; + version = "44.8.0.30404"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240521091053/Webex_ubuntu.7z"; - sha256 = "e155c280d15f2db4b5e638f244319dbec938d6de267f2fed1b4ba2b55fbb8a9b"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240806164911/Webex_ubuntu.7z"; + sha256 = "770067b495fcc3b376d77de65371f4196d0f1a0d718b84928d24aa6ea752d29b"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 9b595f9ba191..9d41b0455a72 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -136,6 +136,10 @@ let libdbusmenu ]; + preFixup = '' + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --ozone-platform=wayland --enable-features=WaylandWindowDecorations}}") + ''; + postFixup = '' makeWrapper $out/opt/Wire/wire-desktop $out/bin/wire-desktop \ "''${gappsWrapperArgs[@]}" diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 45b8330c2464..a5cf1a8b39c2 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.6.37851"; - versions.x86_64-darwin = "6.1.6.37851"; - versions.x86_64-linux = "6.1.6.1013"; + versions.aarch64-darwin = "6.1.10.38818"; + versions.x86_64-darwin = "6.1.10.38818"; + versions.x86_64-linux = "6.1.10.1400"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-wsatsfVQElWXMZKZOVeqVBBE7ZRXx54OpA82ZzpymUI="; + hash = "sha256-E8r0bctM5whwEMppzO9hR3W+k+BmrV0gVx+J02KYmuk="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-BTLEfVFrUQbb+LpGP93hMqGFWhKM3tBdKxDKe8GkhiA="; + hash = "sha256-HMSBV/B/nTkcU8src6Wdz8uZnz455guSAMGm5ha7mIA="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-mvCJft0suOxnwTkWWuH9OYKHwTMWx61ct10P5Q/EVBM="; + hash = "sha256-c3WywWmblz9Wg3RMtovCBcR/mYyaWkmuoCqqGvHBxwo="; }; }; @@ -156,7 +156,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' # Desktop File substituteInPlace $out/share/applications/Zoom.desktop \ - --replace "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" + --replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" for i in aomhost zopen zoom ZoomLauncher; do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 2d963bce3289..0633199787ee 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.6"; + version = "4.4.1"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-h4sGORUy3cQPS0lUYqIX68OZJeLq3+TfhOdqMxNkfJk="; + hash = "sha256-5d4L0UwqV6UFgTqDw9NyZI0tlXPccoNoV78ocXMmk2w="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/pkgs/applications/networking/mullvad/Cargo.lock b/pkgs/applications/networking/mullvad/Cargo.lock index fb0d7780c63f..1df9eeb250f0 100644 --- a/pkgs/applications/networking/mullvad/Cargo.lock +++ b/pkgs/applications/networking/mullvad/Cargo.lock @@ -35,9 +35,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -60,9 +60,9 @@ dependencies = [ [[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", "once_cell", @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -128,26 +128,26 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -162,15 +162,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" @@ -184,17 +184,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "async-recursion" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.51", -] - [[package]] name = "async-stream" version = "0.3.5" @@ -214,25 +203,25 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "axum" @@ -245,9 +234,9 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "itoa", "matchit", "memchr", @@ -271,8 +260,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -281,9 +270,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -296,21 +285,21 @@ dependencies = [ [[package]] name = "base16ct" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.13.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.21.3" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "base64ct" @@ -341,22 +330,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest", ] [[package]] @@ -370,9 +358,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte_string" @@ -382,15 +370,25 @@ checksum = "11aade7a05aa8c3a351cedc44c3fc45806430543382fcc4743a9b757a2a0b4ed" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[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 = "camellia" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3264e2574e9ef2b53ce6f536dea83a69ac0bc600b762d1523ff83fe07230ce30" +dependencies = [ + "byteorder", + "cipher", +] [[package]] name = "cbindgen" @@ -398,7 +396,7 @@ version = "0.24.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d" dependencies = [ - "heck", + "heck 0.4.1", "indexmap 1.9.3", "log", "proc-macro2", @@ -412,12 +410,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" [[package]] name = "cesu8" @@ -463,15 +458,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -487,9 +482,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -497,42 +492,42 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", + "strsim 0.11.1", ] [[package]] name = "clap_complete" -version = "4.4.8" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf7dcb7c21d8ca1a2482ee0f1d341f437c9a7af6ca6da359dc5e1b164e98215" +checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "classic-mceliece-rust" @@ -564,9 +559,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", @@ -574,9 +569,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "constant_time_eq" @@ -586,9 +581,9 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[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", @@ -596,9 +591,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" @@ -611,9 +606,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -629,28 +624,24 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-bigint" -version = "0.4.9" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -680,12 +671,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.1" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", - "windows-sys 0.48.0", + "nix 0.28.0", + "windows-sys 0.52.0", ] [[package]] @@ -706,13 +697,13 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] @@ -763,7 +754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -771,9 +762,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "dbus" @@ -788,9 +779,9 @@ dependencies = [ [[package]] name = "der" -version = "0.6.1" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -798,9 +789,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "derive-try-from-primitive" @@ -872,9 +866,9 @@ dependencies = [ [[package]] name = "duct" -version = "0.13.6" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" +checksum = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" dependencies = [ "libc", "once_cell", @@ -884,9 +878,9 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.14.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", "elliptic-curve", @@ -895,30 +889,32 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ + "pkcs8", "signature", ] [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "elliptic-curve" -version = "0.12.3" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", - "der", "digest", + "ff", "generic-array", + "group", "rand_core 0.6.4", "sec1", "subtle", @@ -931,10 +927,10 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] @@ -949,9 +945,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -1029,9 +1025,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fern" @@ -1044,21 +1040,31 @@ dependencies = [ ] [[package]] -name = "fiat-crypto" -version = "0.2.1" +name = "ff" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] @@ -1075,9 +1081,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1093,9 +1099,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1108,9 +1114,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1118,15 +1124,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1135,38 +1141,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1188,6 +1194,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -1203,9 +1210,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -1214,9 +1221,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", "polyval", @@ -1224,9 +1231,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -1234,6 +1241,17 @@ 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 0.6.4", + "subtle", +] + [[package]] name = "h2" version = "0.3.26" @@ -1245,11 +1263,30 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 2.0.0", + "http 0.2.12", + "indexmap 2.2.6", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.10", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util 0.7.10", "tracing", ] @@ -1270,9 +1307,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1281,10 +1318,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.2" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1294,10 +1337,10 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hickory-proto" -version = "0.24.0" -source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" dependencies = [ - "async-recursion", "async-trait", "cfg-if", "data-encoding", @@ -1305,7 +1348,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna 0.5.0", + "idna 0.4.0", "ipnet", "once_cell", "rand 0.8.5", @@ -1319,8 +1362,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.24.0" -source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" dependencies = [ "cfg-if", "futures-util", @@ -1340,8 +1384,9 @@ dependencies = [ [[package]] name = "hickory-server" -version = "0.24.0" -source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be0e43c556b9b3fdb6c7c71a9a32153a2275d02419e3de809e520bfcfe40c37" dependencies = [ "async-trait", "bytes", @@ -1350,21 +1395,19 @@ dependencies = [ "futures-util", "hickory-proto", "hickory-resolver", - "ipnet", - "prefix-trie", "serde", "thiserror", "time", "tokio", - "tokio-util", + "tokio-util 0.7.10", "tracing", ] [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -1380,11 +1423,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1400,9 +1443,9 @@ dependencies = [ [[package]] name = "htmlize" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6507eaed4d57bf58786aabd4ebc91a7d702d1fdace5ccc6479de1aee666765dd" +checksum = "4e81e415f6d22240930e82ae0f541b2dd494ca37daaf10c1d7b32546f3b1159f" dependencies = [ "memchr", "paste", @@ -1413,9 +1456,20 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1424,12 +1478,35 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[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 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -1453,35 +1530,56 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", "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.4", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.28", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -1489,16 +1587,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1548,12 +1646,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] @@ -1610,7 +1708,7 @@ version = "0.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] @@ -1625,7 +1723,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2", "widestring", "windows-sys 0.48.0", "winreg 0.50.0", @@ -1633,12 +1731,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" -dependencies = [ - "serde", -] +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "ipnetwork" @@ -1689,9 +1784,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -1731,7 +1826,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "002f4dfe6d97ae88c33f3489c0d31ffc6f81d9a492de98ff113b127d73bafff8" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -1739,9 +1834,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1759,9 +1854,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -1831,12 +1926,32 @@ dependencies = [ "rle-decode-fast", ] +[[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]] name = "libm" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1851,9 +1966,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[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", @@ -1861,9 +1976,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "log-panics" @@ -1906,40 +2021,41 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "matchit" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maybenot" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc2e64fe3f5fb1e247110a9a408449eff2259cc272cf57bad6f161e801ac962" +checksum = "94ed977e86fc65a7ffae967a6a973e6f7a90b5d747ebd755703d5718804f7c16" dependencies = [ "byteorder", "hex", "libflate", "rand 0.8.5", "rand_distr", - "ring", + "ring 0.16.20", "serde", "simple-error", ] [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest", ] [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" @@ -1952,9 +2068,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1967,9 +2083,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -2014,8 +2130,8 @@ dependencies = [ "cbindgen", "chrono", "futures", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "ipnetwork", "libc", "log", @@ -2052,7 +2168,7 @@ dependencies = [ "talpid-types", "thiserror", "tokio", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winres", ] @@ -2096,7 +2212,7 @@ dependencies = [ "tokio-stream", "winapi", "windows-service", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winres", ] @@ -2178,7 +2294,7 @@ dependencies = [ "once_cell", "thiserror", "widestring", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2188,7 +2304,7 @@ dependencies = [ "clap", "dirs", "duct", - "env_logger 0.10.0", + "env_logger 0.10.2", "log", "mullvad-api", "mullvad-paths", @@ -2200,7 +2316,7 @@ dependencies = [ "thiserror", "tokio", "uuid", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winres", ] @@ -2227,7 +2343,7 @@ name = "mullvad-setup" version = "0.0.0" dependencies = [ "clap", - "env_logger 0.10.0", + "env_logger 0.10.2", "mullvad-api", "mullvad-daemon", "mullvad-management-interface", @@ -2250,7 +2366,6 @@ dependencies = [ "clap", "intersection-derive", "ipnetwork", - "jnix", "log", "once_cell", "regex", @@ -2269,9 +2384,9 @@ dependencies = [ [[package]] name = "multimap" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "natord" @@ -2334,9 +2449,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ "bytes", "futures", @@ -2392,28 +2507,17 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.0", - "cfg-if", - "libc", -] - [[package]] name = "nix" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "cfg-if", "cfg_aliases", "libc", - "memoffset 0.9.0", + "memoffset 0.9.1", ] [[package]] @@ -2428,7 +2532,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -2442,10 +2546,16 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.16" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -2482,24 +2592,24 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openvpn-plugin" @@ -2520,12 +2630,12 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "os_pipe" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2541,9 +2651,9 @@ dependencies = [ [[package]] name = "p256" -version = "0.11.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ "ecdsa", "elliptic-curve", @@ -2551,12 +2661,13 @@ dependencies = [ [[package]] name = "p384" -version = "0.11.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" dependencies = [ "ecdsa", "elliptic-curve", + "primeorder", ] [[package]] @@ -2585,13 +2696,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -2603,16 +2714,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] -name = "percent-encoding" -version = "2.3.0" +name = "pcap" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "45f1686828a29fd8002fbf9c01506b4b2dd575c2305e1b884da3731abae8b9e0" +dependencies = [ + "bitflags 1.3.2", + "errno 0.2.8", + "futures", + "libc", + "libloading", + "pkg-config", + "regex", + "tokio", + "windows-sys 0.36.1", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -2621,9 +2749,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -2631,22 +2759,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "pest_meta" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -2660,7 +2788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.2.6", ] [[package]] @@ -2717,29 +2845,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[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" @@ -2749,9 +2877,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs8" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der", "spki", @@ -2759,51 +2887,51 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.1.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "pnet_base" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872e46346144ebf35219ccaa64b1dffacd9c6f188cd7d012bd6977a2a838f42e" +checksum = "fe4cf6fb3ab38b68d01ab2aea03ed3d1132b4868fa4e06285f29f16da01c5f4c" dependencies = [ "no-std-net", ] [[package]] name = "pnet_macros" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a780e80005c2e463ec25a6e9f928630049a10b43945fea83207207d4a7606f4" +checksum = "688b17499eee04a0408aca0aa5cba5fc86401d7216de8a63fdf7a4c227871804" dependencies = [ "proc-macro2", "quote", "regex", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] name = "pnet_macros_support" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d932134f32efd7834eb8b16d42418dac87086347d1bc7d142370ef078582bc" +checksum = "eea925b72f4bd37f8eab0f221bbe4c78b63498350c983ffa9dd4bcde7e030f56" dependencies = [ "pnet_base", ] [[package]] name = "pnet_packet" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bde678bbd85cb1c2d99dc9fc596e57f03aa725f84f3168b0eaf33eeccb41706" +checksum = "a9a005825396b7fe7a38a8e288dbc342d5034dac80c15212436424fef8ea90ba" dependencies = [ "glob", "pnet_base", @@ -2824,9 +2952,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -2834,6 +2962,12 @@ dependencies = [ "universal-hash", ] +[[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" @@ -2851,23 +2985,22 @@ dependencies = [ ] [[package]] -name = "prefix-trie" -version = "0.2.5" +name = "prettyplease" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fe48f29e6e6fcf123d0d03d63028dbe4c4a738023d35d525df4882f4929418" +checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" dependencies = [ - "ipnet", - "num-traits", + "proc-macro2", + "syn 2.0.60", ] [[package]] -name = "prettyplease" -version = "0.2.15" +name = "primeorder" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ - "proc-macro2", - "syn 2.0.51", + "elliptic-curve", ] [[package]] @@ -2896,9 +3029,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -2911,13 +3044,13 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.4.0", + "bitflags 2.5.0", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.8.2", + "regex-syntax", "rusty-fork", "tempfile", "unarray", @@ -2925,9 +3058,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8473a65b88506c106c28ae905ca4a2b83a2993640467a41bb3080627ddfd2c" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" dependencies = [ "bytes", "prost-derive", @@ -2935,13 +3068,13 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d3e647e9eb04ddfef78dfee2d5b3fefdf94821c84b710a3d8ebc89ede8b164" +checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" dependencies = [ "bytes", - "heck", - "itertools 0.10.5", + "heck 0.5.0", + "itertools 0.12.1", "log", "multimap", "once_cell", @@ -2950,29 +3083,28 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.51", + "syn 2.0.60", "tempfile", - "which", ] [[package]] name = "prost-derive" -version = "0.12.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56075c27b20ae524d00f247b8a4dc333e5784f889fe63099f8e626bc8d73486c" +checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "prost-types" -version = "0.12.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cebe0a918c97f86c217b0f76fd754e966f8b9f41595095cf7d74cb4e59d730f6" +checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" dependencies = [ "prost", ] @@ -2995,9 +3127,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", ] @@ -3061,7 +3193,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.14", ] [[package]] @@ -3094,67 +3226,52 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" 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" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.14", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.5", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "resolv-conf" @@ -3176,27 +3293,42 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] [[package]] -name = "ring-compat" -version = "0.5.1" +name = "ring" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333b9bf6765e0141324d95b5375bb1aa5267865bb4bc0281c22aff22f5d37746" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.14", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "ring-compat" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccce7bae150b815f0811db41b8312fcb74bffa4cab9cee5429ee00f356dd5bd4" dependencies = [ "aead", "digest", "ecdsa", "ed25519", "generic-array", - "opaque-debug", "p256", "p384", "pkcs8", - "ring", + "rand_core 0.6.4", + "ring 0.17.8", "signature", ] @@ -3244,11 +3376,11 @@ 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.4.0", + "bitflags 2.5.0", "errno 0.3.8", "libc", "linux-raw-sys", @@ -3257,40 +3389,40 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", - "ring", + "ring 0.17.8", "rustls-webpki", "sct", ] [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.3", + "base64 0.21.7", ] [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "rusty-fork" @@ -3306,9 +3438,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -3327,19 +3459,19 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "sec1" -version = "0.3.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", @@ -3350,9 +3482,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "sendfd" @@ -3366,29 +3498,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.188" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -3409,9 +3541,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -3420,9 +3552,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -3441,18 +3573,19 @@ dependencies = [ [[package]] name = "shadowsocks" -version = "1.16.0" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d4aadc3b1b38e760533d4060a1aa53a2d754f073389f5aafe6bf7b579c4f97" +checksum = "ed5edddeff89d9874fa59366cfc506b53525410f129bbf13064ab36de15374e6" dependencies = [ "arc-swap", "async-trait", - "base64 0.21.3", + "base64 0.22.0", "blake3", "byte_string", "bytes", "cfg-if", "futures", + "hickory-resolver", "libc", "log", "notify", @@ -3464,24 +3597,24 @@ dependencies = [ "serde_json", "serde_urlencoded", "shadowsocks-crypto", - "socket2 0.5.3", + "socket2", "spin 0.9.8", "thiserror", "tokio", "tokio-tfo", - "trust-dns-resolver", "url", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "shadowsocks-crypto" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb488687e398030dd9c9396e119ddbc6952bdeaefe2168943b5b2ddaa54f2e6" +checksum = "65da645ff4a6440ba1b52a9d6b4c8792054860ac135cb87f8ad3d2c7a78d41b5" dependencies = [ "aes", "aes-gcm", + "camellia", "cfg-if", "chacha20", "chacha20poly1305", @@ -3506,9 +3639,9 @@ dependencies = [ [[package]] name = "shadowsocks-service" -version = "1.16.1" +version = "1.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7782cbb1b1e3743b03dd99165750990cca1b4cd181b2a0e91ddeeccc3f77d8cd" +checksum = "7be0ae9c02adf5fb2a91cdee6b3d6e3610d88411114080280e816d817fe437c8" dependencies = [ "arc-swap", "async-trait", @@ -3517,27 +3650,27 @@ dependencies = [ "bytes", "cfg-if", "futures", - "hyper", - "idna 0.4.0", + "http-body-util", + "hyper 1.3.1", + "idna 0.5.0", "ipnet", "iprange", "json5", "libc", "log", "lru_time_cache", - "nix 0.27.1", + "nix 0.28.0", "once_cell", "pin-project", "rand 0.8.5", "regex", "serde", "shadowsocks", - "socket2 0.5.3", + "socket2", "spin 0.9.8", "thiserror", "tokio", - "tower", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3558,18 +3691,18 @@ checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" [[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", ] [[package]] name = "signature" -version = "1.6.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "rand_core 0.6.4", ] @@ -3607,28 +3740,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.4.9" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" -dependencies = [ - "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3648,9 +3771,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.6.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -3664,9 +3787,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subslice" @@ -3685,15 +3808,15 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "surge-ping" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af341b2be485d647b5dc4cfb2da99efac35b5c95748a08fb7233480fedc5ead3" +checksum = "efbf95ce4c7c5b311d2ce3f088af2b93edef0f09727fa50fbe03c7a979afce77" dependencies = [ "hex", "parking_lot", "pnet_packet", "rand 0.8.5", - "socket2 0.5.3", + "socket2", "thiserror", "tokio", "tracing", @@ -3712,9 +3835,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.51" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -3780,15 +3903,21 @@ dependencies = [ "mnl", "nftnl", "nix 0.23.2", + "nix 0.28.0", "once_cell", "parking_lot", + "pcap", "pfctl", + "pnet_packet", "rand 0.8.5", "resolv-conf", + "serde", + "serde_json", "subslice", "system-configuration", "talpid-dbus", "talpid-openvpn", + "talpid-platform-metadata", "talpid-routing", "talpid-tunnel", "talpid-tunnel-config-client", @@ -3799,10 +3928,11 @@ dependencies = [ "tokio", "tonic-build", "triggered", + "tun", "which", "widestring", "windows-service", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winreg 0.51.0", ] @@ -3851,7 +3981,7 @@ dependencies = [ "triggered", "uuid", "widestring", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winreg 0.51.0", ] @@ -3859,7 +3989,7 @@ dependencies = [ name = "talpid-openvpn-plugin" version = "0.0.0" dependencies = [ - "env_logger 0.10.0", + "env_logger 0.10.2", "log", "mullvad-version", "openvpn-plugin", @@ -3871,7 +4001,7 @@ dependencies = [ "tonic", "tonic-build", "tower", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winres", ] @@ -3881,14 +4011,14 @@ version = "0.0.0" dependencies = [ "rs-release", "talpid-dbus", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "talpid-routing" version = "0.0.0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "futures", "ipnetwork", "libc", @@ -3904,7 +4034,7 @@ dependencies = [ "thiserror", "tokio", "widestring", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3932,16 +4062,18 @@ dependencies = [ "thiserror", "tokio", "tun", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "talpid-tunnel-config-client" version = "0.0.0" dependencies = [ + "cbindgen", "classic-mceliece-rust", "libc", "log", + "oslog", "pqc_kyber", "prost", "rand 0.8.5", @@ -3950,7 +4082,7 @@ dependencies = [ "tonic", "tonic-build", "tower", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "zeroize", ] @@ -3958,7 +4090,7 @@ dependencies = [ name = "talpid-types" version = "0.0.0" dependencies = [ - "base64 0.13.1", + "base64 0.22.0", "ipnetwork", "jnix", "log", @@ -3973,17 +4105,16 @@ name = "talpid-windows" version = "0.0.0" dependencies = [ "futures", - "socket2 0.5.3", + "socket2", "talpid-types", "thiserror", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "talpid-wireguard" version = "0.0.0" dependencies = [ - "base64 0.13.1", "bitflags 1.3.2", "byteorder", "chrono", @@ -4005,7 +4136,7 @@ dependencies = [ "proptest", "rand 0.8.5", "rtnetlink", - "socket2 0.5.3", + "socket2", "surge-ping", "talpid-dbus", "talpid-routing", @@ -4018,68 +4149,69 @@ dependencies = [ "tokio-stream", "tunnel-obfuscation", "widestring", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "zeroize", ] [[package]] name = "tempfile" -version = "3.8.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "time" -version = "0.3.28" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", + "num-conv", + "powerfmt", "serde", "time-core", ] [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "tinyvec" @@ -4098,9 +4230,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -4110,7 +4242,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -4127,13 +4259,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] @@ -4160,9 +4292,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -4181,11 +4313,25 @@ dependencies = [ "log", "once_cell", "pin-project", - "socket2 0.5.3", + "socket2", "tokio", "windows-sys 0.48.0", ] +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.10" @@ -4211,19 +4357,19 @@ dependencies = [ [[package]] name = "tonic" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5469afaf78a11265c343a88969045c1568aa8ecc6c787dbf756e92e70f199861" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.3", + "base64 0.21.7", "bytes", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -4238,15 +4384,15 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b477abbe1d18c0b08f56cd01d1bc288668c5b5cfd19b2ae1886bbf599c546f1" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease", "proc-macro2", "prost-build", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] @@ -4263,7 +4409,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.10", "tower-layer", "tower-service", "tracing", @@ -4283,11 +4429,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -4296,20 +4441,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] @@ -4332,57 +4477,11 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce148eae0d1a376c1b94ae651fc3261d9cb8294788b962b7382066376503a2d1" -[[package]] -name = "trust-dns-proto" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc775440033cb114085f6f2437682b194fa7546466024b1037e82a48a052a69" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff7aed33ef3e8bf2c9966fccdfed93f93d46f432282ea875cd66faabc6ef2f" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot", - "rand 0.8.5", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tun" @@ -4390,9 +4489,14 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbc25e23adc6cac7dd895ce2780f255902290fc39b00e1ae3c33e89f3d20fa66" dependencies = [ + "byteorder", + "bytes", + "futures-core", "ioctl-sys", "libc", "thiserror", + "tokio", + "tokio-util 0.6.10", ] [[package]] @@ -4418,9 +4522,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -4449,21 +4553,21 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[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-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -4491,13 +4595,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "url" -version = "2.4.1" +name = "untrusted" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", "serde", ] @@ -4510,11 +4620,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.14", "serde", ] @@ -4535,9 +4645,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4566,9 +4676,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4576,24 +4686,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4601,28 +4711,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -4642,9 +4752,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" @@ -4664,11 +4774,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "134306a13c5647ad6453e8deaec55d3a44d6021970129e6188735e74bf546697" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4678,12 +4788,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -4697,6 +4807,19 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -4721,7 +4844,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.5", ] [[package]] @@ -4756,17 +4879,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" 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.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]] @@ -4783,9 +4907,15 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" @@ -4801,9 +4931,15 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" @@ -4819,9 +4955,21 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" @@ -4837,9 +4985,15 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" @@ -4855,9 +5009,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -4873,9 +5027,15 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" @@ -4891,9 +5051,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winreg" @@ -4953,14 +5113,14 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -4973,5 +5133,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] diff --git a/pkgs/applications/networking/mullvad/libwg.nix b/pkgs/applications/networking/mullvad/libwg.nix index 4d9d4c373ee3..88d0ae1b6f51 100644 --- a/pkgs/applications/networking/mullvad/libwg.nix +++ b/pkgs/applications/networking/mullvad/libwg.nix @@ -12,7 +12,7 @@ buildGoModule { sourceRoot = "${mullvad.src.name}/wireguard/libwg"; - vendorHash = "sha256-2hb6+OHifm/oAgXCiYf+nwtNDDZNWR6lAbLSGT3AG0I="; + vendorHash = "sha256-gaU3na3sjzM6lvmsGRkuGtV2AHvkl6IgzmyGx3R5ZpM="; # XXX: hack to make the ar archive go to the correct place # This is necessary because passing `-o ...` to `ldflags` does not work diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index b1f64da558b9..b43881123a90 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -17,23 +17,24 @@ }: rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2024.3"; + version = "2024.4"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-poQtE+XIlPcL9viAau+70xWx1fPrTXJXMcuPvXlqjZg="; + hash = "sha256-d7poR1NnvqaPutXLFizpQnyipl+38N1Qe2zVXeV7v1Q="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "hickory-proto-0.24.0" = "sha256-IqGVoQ1vRruCcaDr82ARkvSo42Pe9Q6iJIWnSd6GqEg="; "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4="; }; }; + checkFlags = "--skip=version_check"; + nativeBuildInputs = [ pkg-config protobuf diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index c506f7f9b7e3..5586fbbdba41 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.71"; + version = "3.72"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-urYpcFZtZCEQ6nGcDJ2gq+HYnMcEencVn/jxt0HUl/U="; + hash = "sha256-5ANhRknN8EOUw+Ifsd2zCKDpDeoWJzUuwGMDMkZOwls="; }; - vendorHash = "sha256-2YvIK0wIwCELcaBUZN2SbTngdFO717YY+83NSIzae0w="; + vendorHash = "sha256-3CrWrv8kXnbZUcaI2CG/x7MUWlR14OLbjen5FbljTEI="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index ff1613b8b2e1..171b547ece4a 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.109.2"; + version = "1.110.3"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-IVT3BWyDijhpt+bMn7u2f2JiGc0onAjbajHMzzbVt20="; + hash = "sha256-hVgFr5fnoSZumNkImMIEbKCu7nIAT72bMi3wnsn95tc="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-+m7XOpKzg0clbRh2Rpi8JqhLoJLJsA7tT3g6FkmoVc4="; + vendorHash = "sha256-iXOL7YtSXTmLMS3nDvuUy2puWK83gbtVmrzD17C9JxU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index de65aec1bd9d..b126a35038f9 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "1.27.1612021-unstable-2024-06-26"; + version = "1.27.1612021-unstable-2024-08-14"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "aab22d7284dbc470df36146a8885335760b47b0c"; - sha256 = "sha256-nWdZfbwAIwyaOMsAE94MrkHHRmwrFyFZRmYno+2/5mQ="; + rev = "3601f6dd89eea161b059c141fc40418733e82f2f"; + sha256 = "sha256-YaSKaotN7LzlSQAIGkpTcgpgVQBH6KmH4YiebaMdz/g="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 391569825b18..be9b11f5da01 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -21,6 +21,7 @@ , pango , pkg-config , nltk-data +, xorg }: let @@ -121,6 +122,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gettext + xorg.lndir ]; propagatedBuildInputs = with python.pkgs; [ @@ -194,9 +196,9 @@ python.pkgs.buildPythonApplication rec { in '' runHook preInstall - mkdir -p $out/lib/paperless-ngx + mkdir -p $out/lib/paperless-ngx/static/frontend cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx - ln -s ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/ + lndir -silent ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/frontend chmod +x $out/lib/paperless-ngx/src/manage.py makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ --prefix PYTHONPATH : "${pythonPath}" \ diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 65d251ef134d..1990ff0ea7ae 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.10.7"; + version = "4.10.8"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-jGfLbKDhiBpLkO5de5aLBwLw6xBZ+IIsYPDX4/XGPqE="; + hash = "sha256-gbwpNlWtJocKQqTFLoroUbXn4FOOA7LO1H/IduEsyrg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 864fce4d1eeb..36535678a8d6 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.4"; + version = "7.22.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-GINgI4u87Ns4/5aUWpeJaokb+3Liwjjibr02NGcF10c="; + hash = "sha256-cF6vKwAWz32/XYUWvq/4Wu73TFQ2jaGIFxWmeXmlPCE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 459523ea6169..4dd8fa743121 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -25,7 +25,7 @@ , withNgspice ? !stdenv.isDarwin , libngspice , withScripting ? true -, python311 +, python3 , addons ? [ ] , debug ? false , sanitizeAddress ? false @@ -122,14 +122,10 @@ let else versionsImport.${baseName}.libVersion.version; wxGTK = wxGTK32; - # KiCAD depends on wxWidgets, which uses distutils (removed in Python 3.12) - # See also: https://github.com/wxWidgets/Phoenix/issues/2104 - # Eventually, wxWidgets should support Python 3.12: https://github.com/wxWidgets/Phoenix/issues/2553 - # Until then, we use Python 3.11 which still includes distutils - python = python311; + python = python3; wxPython = python.pkgs.wxpython; addonPath = "addon.zip"; - addonsDrvs = map (pkg: pkg.override { inherit addonPath python; }) addons; + addonsDrvs = map (pkg: pkg.override { inherit addonPath python3; }) addons; addonsJoined = runCommand "addonsJoined" @@ -161,7 +157,7 @@ stdenv.mkDerivation rec { # Common libraries, referenced during runtime, via the wrapper. passthru.libraries = callPackages ./libraries.nix { inherit libSrc; }; - passthru.callPackage = newScope { inherit addonPath python; }; + passthru.callPackage = newScope { inherit addonPath python3; }; base = callPackage ./base.nix { inherit stable testing baseName; inherit kicadSrc kicadVersion; diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index a66637150bdf..5aca699f9d3d 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "btor2tools"; - version = "1.0.0-pre_${src.rev}"; + version = "unstable-2024-08-07"; src = fetchFromGitHub { owner = "boolector"; repo = "btor2tools"; - rev = "9831f9909fb283752a3d6d60d43613173bd8af42"; - sha256 = "0mfqmkgvyw8fa2c09kww107dmk180ch1hp98r5kv41vnc04iqb0s"; + rev = "44bcadbfede292ff4c4a4a8962cc18130de522fb"; + sha256 = "0ncl4xwms8d656x95ga8v8zjybx4cmdl5hlcml7dpcgm3p8qj4ks"; }; - patches = [ - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/Boolector/btor2tools/commit/037f1fa88fb439dca6f648ad48a3463256d69d8b.patch"; - hash = "sha256-FX1yy9XdUs1tAReOxhEzNHu48DrISzNNMSYoIrhHoFY="; - }) - ]; - nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; installPhase = '' diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 245f8db13ce6..d43ae16a647e 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -3,16 +3,17 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "3.1.1"; + version = "3.1.1-unstable-2024-08-02"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; - rev = "v${version}"; - hash = "sha256-/g5bO3UQcg0XYm62KdoWcVQqOV3SIedWUYLufEcblmE="; + # commit "chore: update to build with rust 1.80 (leanprover/elan#134)" + rev = "97ce78e0e6aecdf3e8d35dbf42b0614302efb250"; + hash = "sha256-7cwpHMyhpTxYXjZM4xbDK+epvA2kBf7jelvMaPGP1kU="; }; - cargoHash = "sha256-f8YVUTxHX1FY2p73DlnLDtCJaG/0JImUtJFraV6ErNM="; + cargoHash = "sha256-ON5d7ryMKEhkx6dV760msr+y/+4hIwssXUE5Ocaq2W0="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix deleted file mode 100644 index c3df8340d20c..000000000000 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, bash, python3, yosys -, yices, boolector, z3, aiger -}: - -stdenv.mkDerivation { - pname = "symbiyosys"; - version = "2021.11.30"; - - src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "SymbiYosys"; - rev = "b409b1179e36d2a3fff66c85b7d4e271769a2d9e"; - hash = "sha256-S7of2upntiMkSdh4kf1RsrjriS31Eh8iEcVvG36isQg="; - }; - - buildInputs = [ ]; - patchPhase = '' - patchShebangs . - - # Fix up Yosys imports - substituteInPlace sbysrc/sby.py \ - --replace "##yosys-sys-path##" \ - "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" - - # Fix various executable references - substituteInPlace sbysrc/sby_core.py \ - --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' \ - --replace ', "btormc"' ', "${boolector}/bin/btormc"' \ - --replace ', "aigbmc"' ', "${aiger}/bin/aigbmc"' - - substituteInPlace sbysrc/sby_core.py \ - --replace '##yosys-program-prefix##' '"${yosys}/bin/"' - - substituteInPlace sbysrc/sby.py \ - --replace '/usr/bin/env python3' '${python3}/bin/python' - ''; - - buildPhase = "true"; - - installPhase = '' - mkdir -p $out/bin $out/share/yosys/python3 - - cp sbysrc/sby_*.py $out/share/yosys/python3/ - cp sbysrc/sby.py $out/bin/sby - - chmod +x $out/bin/sby - ''; - - doCheck = false; # not all provers are yet packaged... - nativeCheckInputs = [ python3 yosys boolector yices z3 aiger ]; - checkPhase = "make test"; - - meta = { - description = "Tooling for Yosys-based verification flows"; - homepage = "https://symbiyosys.readthedocs.io/"; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ thoughtpolice ]; - mainProgram = "sby"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix deleted file mode 100644 index e5ab259b8f70..000000000000 --- a/pkgs/applications/science/math/mathematica/10.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ lib -, patchelf -, requireFile -, stdenv -# arguments from default.nix -, lang -, meta -, name -, src -, version -# dependencies -, alsa-lib -, coreutils -, cudaPackages -, fontconfig -, freetype -, gcc -, glib -, libuuid -, libxml2 -, ncurses -, opencv2 -, openssl -, unixODBC -, xorg -# options -, cudaSupport -}: - -let - platform = - if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then - "Linux" - else - throw "Mathematica requires i686-linux or x86_64 linux"; -in -stdenv.mkDerivation rec { - inherit meta src version; - - pname = "mathematica"; - - buildInputs = [ - coreutils - patchelf - alsa-lib - coreutils - fontconfig - freetype - gcc.cc - gcc.libc - glib - ncurses - opencv2 - openssl - unixODBC - libxml2 - libuuid - ] ++ (with xorg; [ - libX11 - libXext - libXtst - libXi - libXmu - libXrender - libxcb - libXcursor - libXfixes - libXrandr - libICE - libSM - ]); - - ldpath = lib.makeLibraryPath buildInputs - + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); - - dontConfigure = true; - dontBuild = true; - - unpackPhase = '' - echo "=== Extracting makeself archive ===" - # find offset from file - offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) - dd if="$src" ibs=$offset skip=1 | tar -xf - - cd Unix - ''; - - installPhase = '' - cd Installer - # don't restrict PATH, that has already been done - sed -i -e 's/^PATH=/# PATH=/' MathInstaller - - echo "=== Running MathInstaller ===" - ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent - ''; - - preFixup = '' - echo "=== PatchElfing away ===" - # This code should be a bit forgiving of errors, unfortunately - set +e - find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do - type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') - if [ -z "$type" ]; then - : - elif [ "$type" == "EXEC" ]; then - echo "patching $f executable <<" - patchelf --shrink-rpath "$f" - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - elif [ "$type" == "DYN" ]; then - echo "patching $f library <<" - patchelf \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - else - echo "not patching $f <<: unknown elf type" - fi - done - ''; - - # all binaries are already stripped - dontStrip = true; - - # we did this in prefixup already - dontPatchELF = true; -} diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix deleted file mode 100644 index 5b9460f76e06..000000000000 --- a/pkgs/applications/science/math/mathematica/11.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ lib -, patchelf -, requireFile -, stdenv -# arguments from default.nix -, lang -, meta -, name -, src -, version -# dependencies -, alsa-lib -, coreutils -, cudaPackages -, dbus -, fontconfig -, freetype -, gcc -, glib -, libGL -, libGLU -, libuuid -, libxml2 -, ncurses -, opencv2 -, openssl -, unixODBC -, xkeyboard_config -, xorg -, zlib -# options -, cudaSupport -}: - -stdenv.mkDerivation rec { - inherit meta name src version; - - buildInputs = [ - coreutils - patchelf - alsa-lib - coreutils - dbus - fontconfig - freetype - gcc.cc - gcc.libc - glib - ncurses - opencv2 - openssl - unixODBC - xkeyboard_config - libxml2 - libuuid - zlib - libGL - libGLU - ] ++ (with xorg; [ - libX11 - libXext - libXtst - libXi - libXmu - libXrender - libxcb - libXcursor - libXfixes - libXrandr - libICE - libSM - ]); - - ldpath = lib.makeLibraryPath buildInputs - + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); - - dontConfigure = true; - dontBuild = true; - - unpackPhase = '' - echo "=== Extracting makeself archive ===" - # find offset from file - offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) - dd if="$src" ibs=$offset skip=1 | tar -xf - - cd Unix - ''; - - installPhase = '' - cd Installer - # don't restrict PATH, that has already been done - sed -i -e 's/^PATH=/# PATH=/' MathInstaller - sed -i -e 's/\/bin\/bash/\/bin\/sh/' MathInstaller - - echo "=== Running MathInstaller ===" - ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent - - # Fix library paths - cd $out/libexec/Mathematica/Executables - for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do - sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path - done - - # Fix xkeyboard config path for Qt - for path in mathematica Mathematica; do - line=$(grep -n QT_PLUGIN_PATH $path | sed 's/:.*//') - sed -i -e "$line iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"" $path - done - ''; - - preFixup = '' - echo "=== PatchElfing away ===" - # This code should be a bit forgiving of errors, unfortunately - set +e - find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do - type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') - if [ -z "$type" ]; then - : - elif [ "$type" == "EXEC" ]; then - echo "patching $f executable <<" - patchelf --shrink-rpath "$f" - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - elif [ "$type" == "DYN" ]; then - echo "patching $f library <<" - patchelf \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - else - echo "not patching $f <<: unknown elf type" - fi - done - ''; - - # all binaries are already stripped - dontStrip = true; - - # we did this in prefixup already - dontPatchELF = true; -} diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix deleted file mode 100644 index c2fc07c532fc..000000000000 --- a/pkgs/applications/science/math/mathematica/9.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ lib -, patchelf -, requireFile -, stdenv -# arguments from default.nix -, lang -, meta -, name -, src -, version -# dependencies -, alsa-lib -, coreutils -, cudaPackages -, fontconfig -, freetype -, gcc -, glib -, ncurses -, opencv2 -, openssl -, unixODBC -, xorg -# options -, cudaSupport -}: - -let - platform = - if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then - "Linux" - else - throw "Mathematica requires i686-linux or x86_64 linux"; -in -stdenv.mkDerivation rec { - inherit meta src version; - pname = "mathematica"; - - buildInputs = [ - coreutils - patchelf - alsa-lib - coreutils - fontconfig - freetype - gcc.cc - gcc.libc - glib - ncurses - opencv2 - openssl - unixODBC - ] ++ (with xorg; [ - libX11 - libXext - libXtst - libXi - libXmu - libXrender - libxcb - ]); - - ldpath = lib.makeLibraryPath buildInputs - + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); - - dontConfigure = true; - dontBuild = true; - - unpackPhase = '' - echo "=== Extracting makeself archive ===" - # find offset from file - offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) - dd if="$src" ibs=$offset skip=1 | tar -xf - - cd Unix - ''; - - installPhase = '' - cd Installer - # don't restrict PATH, that has already been done - sed -i -e 's/^PATH=/# PATH=/' MathInstaller - - echo "=== Running MathInstaller ===" - ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent - ''; - - preFixup = '' - echo "=== PatchElfing away ===" - find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do - type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') - if [ -z "$type" ]; then - : - elif [ "$type" == "EXEC" ]; then - echo "patching $f executable <<" - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${ldpath}" \ - "$f" - patchelf --shrink-rpath "$f" - elif [ "$type" == "DYN" ]; then - echo "patching $f library <<" - patchelf \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - else - echo "not patching $f <<: unknown elf type" - fi - done - ''; - - # all binaries are already stripped - dontStrip = true; - - # we did this in prefixup already - dontPatchELF = true; -} diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index c4cebcd8e29a..9e2552478765 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -44,12 +44,6 @@ let versions = callPackage ./versions.nix { }; else "and with local documentation"}") else lib.head matching-versions; - specific-drv = ./. + "/${lib.versions.major found-version.version}.nix"; - - real-drv = if lib.pathExists specific-drv - then specific-drv - else ./generic.nix; - isMatching = v1: v2: let as = lib.splitVersion v1; bs = lib.splitVersion v2; @@ -64,7 +58,7 @@ let versions = callPackage ./versions.nix { }; in -callPackage real-drv { +callPackage ./generic.nix { inherit cudaSupport cudaPackages; inherit (found-version) version lang; src = if source == null then found-version.src else source; diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 3bbf70433471..98e65d376b39 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -147,34 +147,6 @@ let versions = [ sha256 = "sha256-uftx4a/MHXLCABlv+kNFEtII+ikg4geHhDP1BOWK6dc="; installer = "Mathematica_12.0.0_LINUX.sh"; } - { - version = "11.3.0"; - lang = "en"; - language = "English"; - sha256 = "sha256-D8/iCMHqyESOe+OvC9uENwsXvZxdBmwBOSjI7pWu0Q4="; - installer = "Mathematica_11.3.0_LINUX.sh"; - } - { - version = "11.2.0"; - lang = "ja"; - language = "Japanese"; - sha256 = "sha256-kWOS7dMr7YYiI430Nd2OhkJrsEMDijM28w3xDYGbSbE="; - installer = "Mathematica_11.2.0_ja_LINUX.sh"; - } - { - version = "9.0.0"; - lang = "en"; - language = "English"; - sha256 = "sha256-mKgxdd7dLWa5EOuR5C37SeU+UC9Cv5YTbY5xSK9y34A="; - installer = "Mathematica_9.0.0_LINUX.sh"; - } - { - version = "10.0.2"; - lang = "en"; - language = "English"; - sha256 = "sha256-NHUg1jzLos1EsIr8TdYdNaA5+3jEcFqVZIr9GVVUXrQ="; - installer = "Mathematica_10.0.2_LINUX.sh"; - } ]; in diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index 4ce49e6cad4c..c7a1b585379a 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -101,9 +101,9 @@ stdenv.mkDerivation rec { # Fix the installation script patchShebangs MathInstaller substituteInPlace MathInstaller \ - --replace '`hostname`' "" \ - --replace "chgrp" "# chgrp" \ - --replace "chown" ": # chown" + --replace-fail '`hostname`' "" \ + --replace-fail "chgrp" "# chgrp" \ + --replace-fail "chown" ": # chown" # Install the desktop items export XDG_DATA_HOME="$out/share" @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" if ! isELF "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer"; then substituteInPlace $out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer \ - --replace "TopDirectory=" "TopDirectory=$out/libexec/${dirName} #"; + --replace-fail "TopDirectory=" "TopDirectory=$out/libexec/${dirName} #"; fi for path in WolframPlayer wolframplayer; do diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/applications/science/math/wolfram-engine/l10ns.nix index cfd296087d74..de9b677ab17a 100644 --- a/pkgs/applications/science/math/wolfram-engine/l10ns.nix +++ b/pkgs/applications/science/math/wolfram-engine/l10ns.nix @@ -7,6 +7,13 @@ let allVersions = lib.flip map # N.B. Versions in this list should be ordered from newest to oldest. [ + { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "1kxdvm3i7nn3ws784y972h2br1n0y82kkkjvz7c5llssv6d3pgj8"; + installer = "WolframEngine_14.1.0_LIN.sh"; + } { version = "13.3.0"; lang = "en"; diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix deleted file mode 100644 index b7ace57d74af..000000000000 --- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix +++ /dev/null @@ -1,33 +0,0 @@ -{lib, fetchPypi, buildPythonPackage, html5lib, httplib2, nose, pillow, pypdf2, reportlab}: - -let - #xhtml2pdf specifically requires version "1.0b10" of html5lib - html5 = html5lib.overrideAttrs( oldAttrs: rec { - name = "${oldAttrs.pname}-${version}"; - version = "1.0b10"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1yd068a5c00wd0ajq0hqimv7fd82lhrw0w3s01vbhy9bbd6xapqd"; - }; - }); -in - -buildPythonPackage rec { - pname = "xhtml2pdf"; - version = "0.2.1"; - - buildInputs = [html5]; - propagatedBuildInputs = [httplib2 nose pillow pypdf2 reportlab html5]; - - src = fetchPypi { - inherit pname version; - sha256 = "1n9r8zdk9gc2x539fq60bhszmd421ipj8g78zmsn3njvma1az9k1"; - }; - - meta = { - description = "Pdf converter for the ReportLab Toolkit"; - homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ rprospero ]; - }; -} diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 8d9373278e94..37c7fb3a2a05 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -12,10 +12,6 @@ , withoutBin ? false }: -let - optionOnOff = option: if option then "on" else "off"; -in - stdenv.mkDerivation rec { pname = "simgrid"; version = "3.35"; @@ -42,31 +38,32 @@ stdenv.mkDerivation rec { # "Release" does not work. non-debug mode is Debug compiled with optimization cmakeBuildType = "Debug"; - cmakeFlags = [ - "-Denable_documentation=${optionOnOff buildDocumentation}" - "-Denable_java=${optionOnOff buildJavaBindings}" - "-Denable_python=${optionOnOff buildPythonBindings}" - "-DSIMGRID_PYTHON_LIBDIR=./" # prevents CMake to install in ${python3} dir - "-Denable_msg=${optionOnOff buildJavaBindings}" - "-Denable_fortran=${optionOnOff fortranSupport}" - "-Denable_model-checking=${optionOnOff modelCheckingSupport}" - "-Denable_ns3=off" - "-Denable_lua=off" - "-Denable_lib_in_jar=off" - "-Denable_maintainer_mode=off" - "-Denable_mallocators=on" - "-Denable_debug=on" - "-Denable_smpi=on" - "-Dminimal-bindings=${optionOnOff minimalBindings}" - "-Denable_smpi_ISP_testsuite=${optionOnOff moreTests}" - "-Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}" - "-Denable_compile_warnings=off" - "-Denable_compile_optimizations=${optionOnOff optimize}" - "-Denable_lto=${optionOnOff optimize}" + cmakeFlags = [ + (lib.cmakeBool "enable_documentation" buildDocumentation) + (lib.cmakeBool "enable_java" buildJavaBindings) + (lib.cmakeBool "enable_python" buildPythonBindings) + (lib.cmakeFeature "SIMGRID_PYTHON_LIBDIR" "./") # prevents CMake to install in ${python3} dir + (lib.cmakeBool "enable_msg" buildJavaBindings) + (lib.cmakeBool "enable_fortran" fortranSupport) + (lib.cmakeBool "enable_model-checking" modelCheckingSupport) + (lib.cmakeBool "enable_ns3" false) + (lib.cmakeBool "enable_lua" false) + (lib.cmakeBool "enable_lib_in_jar" false) + (lib.cmakeBool "enable_maintainer_mode" false) + (lib.cmakeBool "enable_mallocators" true) + (lib.cmakeBool "enable_debug" true) + (lib.cmakeBool "enable_smpi" true) + (lib.cmakeBool "minimal-bindings" minimalBindings) + (lib.cmakeBool "enable_smpi_ISP_testsuite" moreTests) + (lib.cmakeBool "enable_smpi_MPICH3_testsuite" moreTests) + (lib.cmakeBool "enable_compile_warnings" false) + (lib.cmakeBool "enable_compile_optimizations" optimize) + (lib.cmakeBool "enable_lto" optimize) # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" optimize) ]; + makeFlags = lib.optional debug "VERBOSE=1"; # needed to run tests and to ensure correct shabangs in output scripts diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index b881d339300c..2474998450cb 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -75,8 +75,9 @@ stdenv.mkDerivation (finalAttrs: { inherit extraBuildInputs; }; cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) ] - ++ (builtins.map (p: "-DPKG_${p}=ON") (builtins.attrNames (lib.filterAttrs (n: v: v) packages))) + ++ (lib.mapAttrsToList (n: v: lib.cmakeBool "PKG_${n}" v) packages) ++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags) ; @@ -99,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/share/vim-plugins/lammps $out/share/nvim/site ''; - meta = with lib; { + meta = { description = "Classical Molecular Dynamics simulation code"; longDescription = '' LAMMPS is a classical molecular dynamics simulation code designed to @@ -109,13 +110,16 @@ stdenv.mkDerivation (finalAttrs: { under the terms of the GNU Public License (GPL). ''; homepage = "https://www.lammps.org"; - license = licenses.gpl2Only; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; # compiling lammps with 64 bit support blas and lapack might cause runtime # segfaults. In anycase both blas and lapack should have the same #bits # support. broken = (blas.isILP64 && lapack.isILP64); - maintainers = [ maintainers.costrouc maintainers.doronbehar ]; + maintainers = with lib.maintainers; [ + costrouc + doronbehar + ]; mainProgram = "lmp"; }; }) diff --git a/pkgs/applications/system/coolercontrol/Cargo.lock b/pkgs/applications/system/coolercontrol/Cargo.lock index 3ac008f7e628..c1a100c69ed5 100644 --- a/pkgs/applications/system/coolercontrol/Cargo.lock +++ b/pkgs/applications/system/coolercontrol/Cargo.lock @@ -3,10 +3,274 @@ version = 3 [[package]] -name = "addr2line" -version = "0.21.0" +name = "actix-codec" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "futures-core", + "futures-sink", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "actix-cors" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331" +dependencies = [ + "actix-utils", + "actix-web", + "derive_more", + "futures-util", + "log", + "once_cell", + "smallvec", +] + +[[package]] +name = "actix-http" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", + "ahash", + "base64 0.22.1", + "bitflags 2.6.0", + "brotli", + "bytes", + "bytestring", + "derive_more", + "encoding_rs", + "flate2", + "futures-core", + "h2", + "http 0.2.12", + "httparse", + "httpdate", + "itoa", + "language-tags", + "local-channel", + "mime", + "percent-encoding", + "pin-project-lite", + "rand", + "sha1", + "smallvec", + "tokio", + "tokio-util", + "tracing", + "zstd", +] + +[[package]] +name = "actix-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "actix-multipart" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d974dd6c4f78d102d057c672dcf6faa618fafa9df91d44f9c466688fc1275a3a" +dependencies = [ + "actix-multipart-derive", + "actix-utils", + "actix-web", + "bytes", + "derive_more", + "futures-core", + "futures-util", + "httparse", + "local-waker", + "log", + "memchr", + "mime", + "rand", + "serde", + "serde_json", + "serde_plain", + "tempfile", + "tokio", +] + +[[package]] +name = "actix-multipart-derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a0a77f836d869f700e5b47ac7c3c8b9c8bc82e4aec861954c6198abee3ebd4d" +dependencies = [ + "darling", + "parse-size", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "actix-router" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" +dependencies = [ + "bytestring", + "cfg-if", + "http 0.2.12", + "regex", + "regex-lite", + "serde", + "tracing", +] + +[[package]] +name = "actix-rt" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" +dependencies = [ + "futures-core", + "tokio", +] + +[[package]] +name = "actix-server" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b02303ce8d4e8be5b855af6cf3c3a08f3eff26880faad82bab679c22d3650cb5" +dependencies = [ + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "futures-util", + "mio", + "socket2", + "tokio", + "tracing", +] + +[[package]] +name = "actix-service" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" +dependencies = [ + "futures-core", + "paste", + "pin-project-lite", +] + +[[package]] +name = "actix-session" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b671404ec72194d8af58c2bdaf51e3c477a0595056bd5010148405870dda8df2" +dependencies = [ + "actix-service", + "actix-utils", + "actix-web", + "anyhow", + "derive_more", + "serde", + "serde_json", + "tracing", +] + +[[package]] +name = "actix-utils" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" +dependencies = [ + "local-waker", + "pin-project-lite", +] + +[[package]] +name = "actix-web" +version = "4.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" +dependencies = [ + "actix-codec", + "actix-http", + "actix-macros", + "actix-router", + "actix-rt", + "actix-server", + "actix-service", + "actix-utils", + "actix-web-codegen", + "ahash", + "bytes", + "bytestring", + "cfg-if", + "cookie", + "derive_more", + "encoding_rs", + "futures-core", + "futures-util", + "itoa", + "language-tags", + "log", + "mime", + "once_cell", + "pin-project-lite", + "regex", + "regex-lite", + "serde", + "serde_json", + "serde_urlencoded", + "smallvec", + "socket2", + "time", + "url", +] + +[[package]] +name = "actix-web-codegen" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" +dependencies = [ + "actix-router", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "actix-web-static-files" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adf6d1ef6d7a60e084f9e0595e2a5234abda14e76c105ecf8e2d0e8800c41a1f" +dependencies = [ + "actix-web", + "derive_more", + "futures-util", + "static-files", +] + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -17,6 +281,54 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[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" @@ -56,6 +368,55 @@ dependencies = [ "libc", ] +[[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 = "anyhow" version = "1.0.86" @@ -63,38 +424,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] -name = "arboard" -version = "3.4.0" +name = "arrayref" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" -dependencies = [ - "clipboard-win", - "core-graphics 0.23.2", - "image 0.25.1", - "log", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "parking_lot", - "windows-sys 0.48.0", - "wl-clipboard-rs", - "x11rb", -] +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] -name = "ascii" -version = "1.1.0" +name = "arrayvec" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[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", + "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] @@ -104,70 +454,25 @@ 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" -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-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", - "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.7.0", - "rustix 0.38.34", + "polling", + "rustix", "slab", "tracing", "windows-sys 0.52.0", @@ -175,39 +480,33 @@ 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" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", + "event-listener", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] @@ -218,22 +517,22 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[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", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix", "signal-hook-registry", "slab", "windows-sys 0.52.0", @@ -253,31 +552,16 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] -name = "atk" -version = "0.15.1" +name = "atomic" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "glib", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", + "bytemuck", ] [[package]] @@ -286,17 +570,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[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" @@ -305,9 +578,9 @@ 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", @@ -326,9 +599,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.7" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" @@ -336,15 +609,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bitflags" version = "1.3.2" @@ -353,15 +617,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" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -372,34 +630,24 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "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", + "futures-lite", "piper", ] [[package]] name = "brotli" -version = "3.5.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -408,24 +656,14 @@ 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", ] -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "bumpalo" version = "3.16.0" @@ -434,9 +672,23 @@ 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.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "byteorder" @@ -444,6 +696,12 @@ 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.6.0" @@ -451,79 +709,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] -name = "cairo-rs" -version = "0.15.12" +name = "bytestring" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "cargo_toml" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" -dependencies = [ - "serde", - "toml 0.7.8", + "bytes", ] [[package]] name = "cc" -version = "1.0.98" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfb" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" dependencies = [ - "byteorder", - "fnv", - "uuid", -] - -[[package]] -name = "cfg-expr" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", + "jobserver", + "libc", + "once_cell", ] [[package]] @@ -538,6 +740,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 = "chrono" version = "0.4.38" @@ -546,78 +754,70 @@ checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", + "wasm-bindgen", "windows-targets 0.52.5", ] [[package]] -name = "chunked_transfer" -version = "1.5.0" +name = "cipher" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] [[package]] name = "clap" -version = "3.2.25" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ - "atty", - "bitflags 1.3.2", + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" +dependencies = [ + "anstream", + "anstyle", "clap_lex", - "indexmap 1.9.3", - "strsim 0.10.0", - "termcolor", - "textwrap", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] -name = "clipboard-win" -version = "5.3.1" +name = "clokwerk" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "bd108d365fcb6d7eddf17a6718eb6a33db18ba4178f8cc6b667f480710f10d76" dependencies = [ - "error-code", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "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", + "chrono", ] [[package]] @@ -627,14 +827,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "combine" -version = "4.6.7" +name = "colorchoice" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "concurrent-queue" @@ -645,6 +841,26 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const_format" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + [[package]] name = "convert_case" version = "0.4.0" @@ -652,28 +868,77 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] -name = "coolercontrol" -version = "1.3.0" +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ - "rand 0.8.5", - "serde", - "serde_json", - "tauri", - "tauri-build", - "tauri-plugin-localhost", - "tauri-plugin-single-instance", - "tauri-plugin-store", - "tauri-plugin-window-state", + "aes-gcm", + "base64 0.20.0", + "hkdf", + "hmac", + "percent-encoding", + "rand", + "sha2", + "subtle", + "time", + "version_check", ] [[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +name = "coolercontrold" +version = "1.4.0" dependencies = [ - "core-foundation-sys", - "libc", + "actix-cors", + "actix-multipart", + "actix-session", + "actix-web", + "actix-web-static-files", + "anyhow", + "async-trait", + "chrono", + "clap", + "clokwerk", + "const_format", + "derive_more", + "env_logger", + "gifski", + "heck", + "http-auth-basic", + "http-body-util", + "hyper", + "hyper-util", + "image", + "imgref", + "lazy_static", + "libdrm_amdgpu_sys", + "log", + "mime", + "nix 0.29.0", + "nu-glob", + "nvml-wrapper", + "pciid-parser", + "psutil", + "regex", + "rgb", + "ril", + "serde", + "serde_json", + "sha2", + "signal-hook", + "static-files", + "strum", + "sysinfo", + "systemd-journal-logger", + "tempfile", + "test-context", + "tiny-skia", + "tokio", + "tokio-graceful-shutdown", + "toml_edit 0.22.14", + "uuid", + "yata", + "zbus", ] [[package]] @@ -682,43 +947,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - -[[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 0.5.0", - "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 = "cpufeatures" version = "0.2.12" @@ -778,44 +1006,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core", "typenum", ] [[package]] -name = "cssparser" -version = "0.27.2" +name = "ctr" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.66", -] - -[[package]] -name = "ctor" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" -dependencies = [ - "quote", - "syn 2.0.66", + "cipher", ] [[package]] @@ -838,8 +1039,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", - "syn 2.0.66", + "strsim", + "syn", ] [[package]] @@ -850,7 +1051,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -860,42 +1061,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde", -] - -[[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-new" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", ] [[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", ] [[package]] @@ -906,90 +1084,14 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "either" +version = "1.13.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", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.3", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" -dependencies = [ - "dtoa", -] - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "embed-resource" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" -dependencies = [ - "cc", - "memchr", - "rustc_version", - "toml 0.8.13", - "vswhom", - "winreg", -] - -[[package]] -name = "embed_plist" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" @@ -1001,10 +1103,16 @@ dependencies = [ ] [[package]] -name = "enumflags2" -version = "0.7.9" +name = "endi" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +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", @@ -1012,13 +1120,36 @@ 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.66", + "syn", +] + +[[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]] @@ -1037,80 +1168,27 @@ dependencies = [ "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 = "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" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" 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.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", "pin-project-lite", ] -[[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" @@ -1126,34 +1204,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset 0.9.1", - "rustc_version", -] - -[[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 = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "flate2" version = "1.0.30" @@ -1171,47 +1221,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "foreign-types" -version = "0.3.2" +name = "fontdue" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "0793f5137567643cf65ea42043a538804ff0fbf288649e2141442b602d81f9bc" dependencies = [ - "foreign-types-shared 0.1.1", + "hashbrown 0.13.2", + "ttf-parser", ] -[[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]] -name = "foreign-types-shared" -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" @@ -1222,13 +1240,18 @@ dependencies = [ ] [[package]] -name = "futf" -version = "0.1.5" +name = "futures" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ - "mac", - "new_debug_unreachable", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", ] [[package]] @@ -1238,6 +1261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -1263,28 +1287,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.1.0", + "fastrand", "futures-core", "futures-io", "parking", @@ -1299,7 +1308,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -1320,6 +1329,7 @@ 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", @@ -1331,114 +1341,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" -dependencies = [ - "bitflags 1.3.2", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "gdk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps 6.2.2", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" -dependencies = [ - "gdk-sys", - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", - "system-deps 6.2.2", -] - -[[package]] -name = "gdkx11-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" -dependencies = [ - "gdk-sys", - "glib-sys", - "libc", - "system-deps 6.2.2", - "x11", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1449,27 +1351,6 @@ dependencies = [ "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.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.15" @@ -1478,89 +1359,65 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", +] + +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[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 = "gif-dispose" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "781005a5985b4c723fd3e6586df79d823151846ebcbcf2fcc7e3d3fba18c2d51" +dependencies = [ + "gif", + "imgref", + "rgb", +] + +[[package]] +name = "gifski" +version = "1.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa3aeeed337aa658d1c2d90cb21b6db6172d1b8a84dfb462ade81f48eb0fd5eb" +dependencies = [ + "crossbeam-channel", + "crossbeam-utils", + "gif", + "gif-dispose", + "imagequant", + "imgref", + "loop9", + "num-traits", + "ordered-channel", + "quick-error", + "resize", + "rgb", ] [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "gio" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", - "winapi", -] - -[[package]] -name = "glib" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" -dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.15.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" -dependencies = [ - "anyhow", - "heck 0.4.1", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "glib-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" -dependencies = [ - "libc", - "system-deps 6.2.2", -] +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1569,89 +1426,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "globset" -version = "0.4.14" +name = "h2" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[package]] -name = "gobject-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "gtk" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" -dependencies = [ - "atk", - "bitflags 1.3.2", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps 6.2.2", -] - -[[package]] -name = "gtk3-macros" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", ] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" @@ -1659,42 +1459,24 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[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.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 = "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" @@ -1702,26 +1484,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "home" -version = "0.5.9" +name = "hkdf" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "windows-sys 0.52.0", + "hmac", ] [[package]] -name = "html5ever" -version = "0.26.0" +name = "hmac" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", + "digest", ] [[package]] @@ -1732,7 +1509,7 @@ checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.11", + "itoa", ] [[package]] @@ -1743,14 +1520,46 @@ checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", - "itoa 1.0.11", + "itoa", ] [[package]] -name = "http-range" -version = "0.1.5" +name = "http-auth-basic" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" +checksum = "dd2e17aacf7f4a2428def798e2ff4f4f883c0987bdaf47dd5c8bc027bc9f1ebc" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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", + "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" @@ -1758,6 +1567,50 @@ 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 = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[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", + "hyper", + "pin-project-lite", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -1781,16 +1634,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ico" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" -dependencies = [ - "byteorder", - "png", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1807,34 +1650,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.6", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-traits", -] - [[package]] name = "image" version = "0.25.1" @@ -1843,22 +1658,46 @@ checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", + "color_quant", + "gif", + "image-webp", "num-traits", "png", + "rayon", "tiff", + "zune-core", + "zune-jpeg", ] [[package]] -name = "indexmap" -version = "1.9.3" +name = "image-webp" +version = "0.1.2" 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 = "imagequant" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09db32417831053bf246bc74fc7c139a05458552d2d98a9f58ff5744d8dea8d3" +dependencies = [ + "arrayvec", + "once_cell", + "rayon", + "rgb", + "thread_local", +] + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + [[package]] name = "indexmap" version = "2.2.6" @@ -1867,43 +1706,22 @@ checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.5", - "serde", ] [[package]] -name = "infer" -version = "0.13.0" +name = "inout" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "cfb", + "generic-array", ] [[package]] -name = "instant" -version = "0.1.13" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[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 = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itoa" @@ -1912,48 +1730,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] -name = "javascriptcore-rs" -version = "0.16.0" +name = "jobserver" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ - "bitflags 1.3.2", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" -dependencies = [ - "glib-sys", - "gobject-sys", "libc", - "system-deps 5.0.0", ] -[[package]] -name = "jni" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -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 = "jpeg-decoder" version = "0.3.1" @@ -1970,58 +1754,16 @@ dependencies = [ ] [[package]] -name = "json-patch" -version = "1.4.0" +name = "language-tags" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" -dependencies = [ - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "kuchikiki" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" -dependencies = [ - "cssparser", - "html5ever", - "indexmap 1.9.3", - "matches", - "selectors", -] +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" - -[[package]] -name = "libappindicator" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" -dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" -dependencies = [ - "gtk-sys", - "libloading 0.7.4", - "once_cell", -] +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" @@ -2030,53 +1772,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] -name = "libloading" -version = "0.7.4" +name = "libdrm_amdgpu_sys" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "adffc519012b872bd699a856bc3faffb899c7f9d41750b21a0f573bba1ada802" dependencies = [ - "cfg-if", - "winapi", + "libc", ] [[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", "windows-targets 0.52.5", ] -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.5.0", - "libc", -] - -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - -[[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 = "local-channel" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8" +dependencies = [ + "futures-core", + "futures-sink", + "local-waker", +] + +[[package]] +name = "local-waker" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" + [[package]] name = "lock_api" version = "0.4.12" @@ -2089,83 +1825,36 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", + "value-bag", ] [[package]] -name = "mac" -version = "0.1.1" +name = "loop9" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] [[package]] -name = "malloc_buf" -version = "0.0.6" +name = "mach2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen 0.10.0", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -2177,65 +1866,75 @@ dependencies = [ ] [[package]] -name = "minimal-lexical" -version = "0.2.1" +name = "miette" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" +dependencies = [ + "cfg-if", + "miette-derive", + "thiserror", + "unicode-width", +] + +[[package]] +name = "miette-derive" +version = "7.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] [[package]] -name = "ndk" -version = "0.6.0" +name = "mio" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", + "libc", + "log", + "wasi", + "windows-sys 0.48.0", ] -[[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.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - [[package]] name = "nix" -version = "0.26.4" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.7.1", ] [[package]] @@ -2244,38 +1943,40 @@ 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", - "cfg_aliases", + "cfg_aliases 0.1.1", + "libc", + "memoffset", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", "libc", ] [[package]] -name = "nodrop" -version = "0.1.14" +name = "ntapi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" 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 = "nu-glob" +version = "0.95.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acd2879444c53bbfb51a2ab060ae1257fe2c8446e6b2cd8a63c88a4d6a728a7a" + [[package]] name = "num-conv" version = "0.1.0" @@ -2302,158 +2003,31 @@ dependencies = [ ] [[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +name = "nvml-wrapper" +version = "0.10.0" +source = "git+https://github.com/codifryed/nvml-wrapper?branch=fan-control#6c8426b459e5e52ca39dd5101da78887d49f748d" dependencies = [ - "num_enum_derive", + "bitflags 2.6.0", + "libloading", + "nvml-wrapper-sys", + "static_assertions", + "thiserror", + "wrapcenum-derive", ] [[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +name = "nvml-wrapper-sys" +version = "0.8.0" +source = "git+https://github.com/codifryed/nvml-wrapper?branch=fan-control#6c8426b459e5e52ca39dd5101da78887d49f748d" dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode", -] - -[[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", - "libc", - "objc2", - "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", - "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.5.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.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 = "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", + "libloading", ] [[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", ] @@ -2465,13 +2039,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "open" -version = "3.2.0" +name = "opaque-debug" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "ordered-channel" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f0bc569ca0974cb90125f52cf76f7b6ad3a072301beba78eb0aa4174c4964ed" dependencies = [ - "pathdiff", - "windows-sys 0.42.0", + "crossbeam-channel", ] [[package]] @@ -2484,53 +2063,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "os_pipe" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[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 = "pango" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" -dependencies = [ - "bitflags 1.3.2", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", -] - [[package]] name = "parking" version = "2.2.0" @@ -2555,16 +2087,34 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall", "smallvec", "windows-targets 0.52.5", ] [[package]] -name = "pathdiff" -version = "0.2.1" +name = "parse-size" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae" + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "path-slash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498a099351efa4becc6a19c72aa9270598e8fd274ca47052e37455241c88b696" + +[[package]] +name = "pciid-parser" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e889f5dad24e8b842a0417e1df0fa250f4e300d1eb88b81d48a9db5bfff6e035" [[package]] name = "percent-encoding" @@ -2573,147 +2123,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] -name = "petgraph" -version = "0.6.5" +name = "pin-project" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ - "fixedbitset", - "indexmap 2.2.6", + "pin-project-internal", ] [[package]] -name = "phf" -version = "0.8.0" +name = "pin-project-internal" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "phf_macros 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros 0.11.2", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", + "syn", ] [[package]] @@ -2730,12 +2156,12 @@ 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", + "fastrand", "futures-io", ] @@ -2745,20 +2171,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "plist" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" -dependencies = [ - "base64 0.21.7", - "indexmap 2.2.6", - "line-wrap", - "quick-xml", - "serde", - "time", -] - [[package]] name = "png" version = "0.17.13" @@ -2774,33 +2186,29 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ - "autocfg", - "bitflags 1.3.2", "cfg-if", "concurrent-queue", - "libc", - "log", + "hermit-abi 0.4.0", "pin-project-lite", - "windows-sys 0.48.0", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] -name = "polling" -version = "3.7.0" +name = "polyval" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", - "concurrent-queue", - "hermit-abi 0.3.9", - "pin-project-lite", - "rustix 0.38.34", - "tracing", - "windows-sys 0.52.0", + "cpufeatures", + "opaque-debug", + "universal-hash", ] [[package]] @@ -2815,70 +2223,45 @@ 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 = "proc-macro-crate" -version = "1.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "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-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] -name = "quick-xml" -version = "0.31.0" +name = "psutil" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "5e617cc9058daa5e1fe5a0d23ed745773a5ee354111dad1ec0235b0cc16b6730" dependencies = [ - "memchr", + "cfg-if", + "glob", + "mach2", + "nix 0.24.3", + "num_cpus", + "once_cell", + "thiserror", ] +[[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.36" @@ -2888,20 +2271,6 @@ dependencies = [ "proc-macro2", ] -[[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", - "rand_pcg", -] - [[package]] name = "rand" version = "0.8.5" @@ -2909,18 +2278,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]] @@ -2930,16 +2289,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]] @@ -2948,105 +2298,102 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom", ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rayon" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ - "rand_core 0.5.1", + "either", + "rayon-core", ] [[package]] -name = "rand_pcg" -version = "0.2.1" +name = "rayon-core" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "rand_core 0.5.1", + "crossbeam-deque", + "crossbeam-utils", ] [[package]] -name = "raw-window-handle" +name = "redox_syscall" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom 0.2.15", - "libredox", - "thiserror", + "bitflags 2.6.0", ] [[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", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.4.7" 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" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax", ] [[package]] -name = "regex-syntax" -version = "0.6.29" +name = "regex-lite" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[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 = "resize" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e29f584c07a8396c5e2eee0bd8d7aec5c8d9e0a3c2333806fd2ec1d2a5b080" +dependencies = [ + "rayon", + "rgb", +] + +[[package]] +name = "rgb" +version = "0.8.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ril" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9d89f558ed427b172d6014c4cf3145b506d379df0676b471964dbbbe923ea1" +dependencies = [ + "fontdue", + "num-traits", + "png", +] [[package]] name = "rustc-demangle" @@ -3063,30 +2410,16 @@ dependencies = [ "semver", ] -[[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.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.14", + "linux-raw-sys", "windows-sys 0.52.0", ] @@ -3102,55 +2435,17 @@ 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 = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags 1.3.2", - "cssparser", - "derive_more", - "fxhash", - "log", - "matches", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - [[package]] name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] [[package]] name = "serde" @@ -3169,21 +2464,29 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ - "indexmap 2.2.6", - "itoa 1.0.11", + "itoa", "ryu", "serde", ] +[[package]] +name = "serde_plain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" +dependencies = [ + "serde", +] + [[package]] name = "serde_repr" version = "0.1.19" @@ -3192,80 +2495,21 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] -name = "serde_spanned" -version = "0.6.6" +name = "serde_urlencoded" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ + "form_urlencoded", + "itoa", + "ryu", "serde", ] -[[package]] -name = "serde_with" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.6", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "serialize-to-javascript" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" -dependencies = [ - "serde", - "serde_json", - "serialize-to-javascript-impl", -] - -[[package]] -name = "serialize-to-javascript-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - [[package]] name = "sha1" version = "0.10.6" @@ -3289,12 +2533,13 @@ dependencies = [ ] [[package]] -name = "sharded-slab" -version = "0.1.7" +name = "signal-hook" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ - "lazy_static", + "libc", + "signal-hook-registry", ] [[package]] @@ -3312,12 +2557,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" -[[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" @@ -3335,55 +2574,22 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] -name = "soup2" -version = "0.2.1" +name = "static-files" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +checksum = "64712ea1e3e140010e1d9605872ba205afa2ab5bd38191cc6ebd248ae1f6a06b" dependencies = [ - "bitflags 1.3.2", - "gio", - "glib", - "libc", - "once_cell", - "soup2-sys", -] - -[[package]] -name = "soup2-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" -dependencies = [ - "bitflags 1.3.2", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "state" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" -dependencies = [ - "loom", + "mime_guess", + "path-slash", ] [[package]] @@ -3393,36 +2599,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "string_cache" -version = "0.8.7" +name = "strict-num" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" [[package]] name = "strsim" @@ -3431,10 +2611,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] -name = "syn" -version = "1.0.109" +name = "strum" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -3442,362 +2650,27 @@ dependencies = [ ] [[package]] -name = "syn" -version = "2.0.66" +name = "sysinfo" +version = "0.30.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" -dependencies = [ - "cfg-expr 0.9.1", - "heck 0.3.3", - "pkg-config", - "toml 0.5.11", - "version-compare 0.0.11", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr 0.15.8", - "heck 0.5.0", - "pkg-config", - "toml 0.8.13", - "version-compare 0.2.0", -] - -[[package]] -name = "tao" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "cc", - "cocoa", - "core-foundation", - "core-graphics 0.22.3", - "crossbeam-channel", - "dirs-next", - "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", - "gdkwayland-sys", - "gdkx11-sys", - "gio", - "glib", - "glib-sys", - "gtk", - "image 0.24.9", - "instant", - "jni", - "lazy_static", - "libappindicator", + "cfg-if", + "core-foundation-sys", "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "objc", + "ntapi", "once_cell", - "parking_lot", - "png", - "raw-window-handle", - "scopeguard", - "serde", - "tao-macros", - "unicode-segmentation", - "uuid", - "windows 0.39.0", - "windows-implement", - "x11-dl", + "windows", ] [[package]] -name = "tao-macros" -version = "0.1.2" +name = "systemd-journal-logger" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -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 = "tauri" -version = "1.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c7177b6be45bbb875aa239578f5adc982a1b3d5ea5b315ccd100aeb0043374" -dependencies = [ - "anyhow", - "clap", - "cocoa", - "dirs-next", - "dunce", - "embed_plist", - "encoding_rs", - "flate2", - "futures-util", - "getrandom 0.2.15", - "glib", - "glob", - "gtk", - "heck 0.5.0", - "http 0.2.12", - "ignore", - "objc", - "once_cell", - "open", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "regex", - "semver", - "serde", - "serde_json", - "serde_repr", - "serialize-to-javascript", - "state", - "tar", - "tauri-macros", - "tauri-runtime", - "tauri-runtime-wry", - "tauri-utils", - "tempfile", - "thiserror", - "tokio", - "url", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", -] - -[[package]] -name = "tauri-build" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs-next", - "heck 0.5.0", - "json-patch", - "semver", - "serde", - "serde_json", - "tauri-utils", - "tauri-winres", - "walkdir", -] - -[[package]] -name = "tauri-codegen" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8" -dependencies = [ - "base64 0.21.7", - "brotli", - "ico", - "json-patch", - "plist", - "png", - "proc-macro2", - "quote", - "regex", - "semver", - "serde", - "serde_json", - "sha2", - "tauri-utils", - "thiserror", - "time", - "uuid", - "walkdir", -] - -[[package]] -name = "tauri-macros" -version = "1.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 1.0.109", - "tauri-codegen", - "tauri-utils", -] - -[[package]] -name = "tauri-plugin-localhost" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=5e3900e682e13f3759b439116ae2f77a6d389ca2#5e3900e682e13f3759b439116ae2f77a6d389ca2" -dependencies = [ - "http 1.1.0", - "log", - "serde", - "serde_json", - "tauri", - "thiserror", - "tiny_http", -] - -[[package]] -name = "tauri-plugin-single-instance" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=5e3900e682e13f3759b439116ae2f77a6d389ca2#5e3900e682e13f3759b439116ae2f77a6d389ca2" +checksum = "b5f3848dd723f2a54ac1d96da793b32923b52de8dfcced8722516dac312a5b2a" dependencies = [ "log", - "serde", - "serde_json", - "tauri", - "thiserror", - "windows-sys 0.52.0", - "zbus", -] - -[[package]] -name = "tauri-plugin-store" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=5e3900e682e13f3759b439116ae2f77a6d389ca2#5e3900e682e13f3759b439116ae2f77a6d389ca2" -dependencies = [ - "log", - "serde", - "serde_json", - "tauri", - "thiserror", -] - -[[package]] -name = "tauri-plugin-window-state" -version = "0.1.1" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=5e3900e682e13f3759b439116ae2f77a6d389ca2#5e3900e682e13f3759b439116ae2f77a6d389ca2" -dependencies = [ - "bincode", - "bitflags 2.5.0", - "log", - "serde", - "serde_json", - "tauri", - "thiserror", -] - -[[package]] -name = "tauri-runtime" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" -dependencies = [ - "gtk", - "http 0.2.12", - "http-range", - "rand 0.8.5", - "raw-window-handle", - "serde", - "serde_json", - "tauri-utils", - "thiserror", - "url", - "uuid", - "webview2-com", - "windows 0.39.0", -] - -[[package]] -name = "tauri-runtime-wry" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655" -dependencies = [ - "arboard", - "cocoa", - "gtk", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "tauri-runtime", - "tauri-utils", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "wry", -] - -[[package]] -name = "tauri-utils" -version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35" -dependencies = [ - "brotli", - "ctor", - "dunce", - "glob", - "heck 0.5.0", - "html5ever", - "infer", - "json-patch", - "kuchikiki", - "log", - "memchr", - "phf 0.11.2", - "proc-macro2", - "quote", - "semver", - "serde", - "serde_json", - "serde_with", - "thiserror", - "url", - "walkdir", - "windows-version", -] - -[[package]] -name = "tauri-winres" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" -dependencies = [ - "embed-resource", - "toml 0.7.8", + "rustix", ] [[package]] @@ -3807,43 +2680,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", + "fastrand", + "rustix", "windows-sys 0.52.0", ] [[package]] -name = "tendril" -version = "0.4.3" +name = "test-context" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +checksum = "6676ab8513edfd2601a108621103fdb45cac9098305ca25ec93f7023b06b05d9" dependencies = [ - "futf", - "mac", - "utf-8", + "futures", + "test-context-macros", ] [[package]] -name = "termcolor" -version = "1.4.1" +name = "test-context-macros" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +checksum = "78ea17a2dc368aeca6f554343ced1b1e31f76d63683fa8016e5844bd7a5144a1" dependencies = [ - "winapi-util", + "proc-macro2", + "quote", + "syn", ] -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - [[package]] name = "thiserror" version = "1.0.61" @@ -3861,7 +2723,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3892,7 +2754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa 1.0.11", + "itoa", "num-conv", "powerfmt", "serde", @@ -3917,22 +2779,36 @@ dependencies = [ ] [[package]] -name = "tiny_http" -version = "0.12.0" +name = "tiny-skia" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389915df6413a2e74fb181895f933386023c71110878cd0825588928e64cdc82" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ - "ascii", - "chunked_transfer", - "httpdate", + "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 = "tinyvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -3945,47 +2821,63 @@ 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", "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", ] [[package]] -name = "toml" -version = "0.5.11" +name = "tokio-graceful-shutdown" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "0e08074a4a6fe69a4d9ca7548134dcd913f544251d496b758657cf87deb87a2d" dependencies = [ - "serde", + "async-trait", + "atomic", + "bytemuck", + "miette", + "pin-project-lite", + "thiserror", + "tokio", + "tokio-util", + "tracing", ] [[package]] -name = "toml" -version = "0.7.8" +name = "tokio-macros" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "toml" -version = "0.8.13" +name = "tokio-util" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.13", + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", ] [[package]] @@ -3993,42 +2885,63 @@ 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" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", + "indexmap", "toml_datetime", "winnow 0.5.40", ] [[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 2.2.6", - "serde", - "serde_spanned", + "indexmap", "toml_datetime", - "winnow 0.6.8", + "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", +] + +[[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 = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4042,7 +2955,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -4052,51 +2965,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", - "valuable", ] [[package]] -name = "tracing-log" -version = "0.2.0" +name = "try-lock" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] -name = "tracing-subscriber" -version = "0.3.18" +name = "ttf-parser" +version = "0.15.2" 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]] -name = "tree_magic_mini" -version = "3.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ee137597cdb361b55a4746983e4ac1b35ab6024396a419944ad473bb915265" -dependencies = [ - "fnv", - "home", - "memchr", - "nom", - "once_cell", - "petgraph", -] +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "typenum" @@ -4110,11 +2991,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.1", + "memoffset", "tempfile", "winapi", ] +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.15" @@ -4137,55 +3027,58 @@ dependencies = [ ] [[package]] -name = "unicode-segmentation" -version = "1.11.0" +name = "unicode-width" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] [[package]] name = "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", "percent-encoding", - "serde", ] [[package]] -name = "utf-8" -version = "0.7.6" +name = "utf8parse" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[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.15", + "getrandom", ] [[package]] -name = "valuable" -version = "0.1.0" +name = "value-bag" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version-compare" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "version_check" @@ -4194,47 +3087,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "vswhom" -version = "0.1.0" +name = "want" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "libc", - "vswhom-sys", + "try-lock", ] -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - -[[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.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" @@ -4262,7 +3122,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-shared", ] @@ -4284,7 +3144,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4295,164 +3155,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wayland-backend" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" -dependencies = [ - "cc", - "downcast-rs", - "rustix 0.38.34", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" -dependencies = [ - "bitflags 2.5.0", - "rustix 0.38.34", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "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.5.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" -dependencies = [ - "dlib", - "log", - "pkg-config", -] - -[[package]] -name = "webkit2gtk" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup2", - "webkit2gtk-sys", -] - -[[package]] -name = "webkit2gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" -dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pango-sys", - "pkg-config", - "soup2-sys", - "system-deps 6.2.2", -] - -[[package]] -name = "webview2-com" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "webview2-com-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "webview2-com-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" -dependencies = [ - "regex", - "serde", - "serde_json", - "thiserror", - "windows 0.39.0", - "windows-bindgen", - "windows-metadata", -] - [[package]] name = "weezl" version = "0.1.8" @@ -4475,15 +3177,6 @@ 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" @@ -4492,35 +3185,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.39.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-implement", - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-bindgen" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" -dependencies = [ - "windows-metadata", - "windows-tokens", + "windows-core", + "windows-targets 0.52.5", ] [[package]] @@ -4532,37 +3202,6 @@ dependencies = [ "windows-targets 0.52.5", ] -[[package]] -name = "windows-implement" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" -dependencies = [ - "syn 1.0.109", - "windows-tokens", -] - -[[package]] -name = "windows-metadata" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -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-sys" version = "0.48.0" @@ -4612,27 +3251,6 @@ dependencies = [ "windows_x86_64_msvc 0.52.5", ] -[[package]] -name = "windows-tokens" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" - -[[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]] -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" @@ -4645,18 +3263,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - -[[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" @@ -4669,18 +3275,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - -[[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" @@ -4699,18 +3293,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - -[[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" @@ -4723,18 +3305,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - -[[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" @@ -4747,12 +3317,6 @@ 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" @@ -4765,18 +3329,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - -[[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" @@ -4800,175 +3352,71 @@ 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", ] [[package]] -name = "winreg" -version = "0.52.0" +name = "wrapcenum-derive" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +checksum = "a76ff259533532054cfbaefb115c613203c73707017459206380f03b3b3f266e" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wl-clipboard-rs" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb" -dependencies = [ - "derive-new", - "libc", - "log", - "nix 0.28.0", - "os_pipe", - "tempfile", - "thiserror", - "tree_magic_mini", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", -] - -[[package]] -name = "wry" -version = "0.24.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" -dependencies = [ - "base64 0.13.1", - "block", - "cocoa", - "core-graphics 0.22.3", - "crossbeam-channel", - "dunce", - "gdk", - "gio", - "glib", - "gtk", - "html5ever", - "http 0.2.12", - "kuchikiki", - "libc", - "log", - "objc", - "objc_id", - "once_cell", - "serde", - "serde_json", - "sha2", - "soup2", - "tao", - "thiserror", - "url", - "webkit2gtk", - "webkit2gtk-sys", - "webview2-com", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[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 = [ - "gethostname", - "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 = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys 0.4.14", - "rustix 0.38.34", + "darling", + "proc-macro2", + "quote", + "syn", ] [[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]] +name = "yata" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4ef8ddfa3ccd93454262c0e60a43a2bbf403d404174e1815f7581d5028229f" +dependencies = [ + "serde", ] [[package]] name = "zbus" -version = "3.15.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" dependencies = [ "async-broadcast", - "async-executor", - "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", "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", + "nix 0.28.0", "ordered-stream", - "rand 0.8.5", + "rand", "serde", "serde_repr", "sha1", "static_assertions", + "tokio", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -4977,23 +3425,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.15.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -5001,14 +3448,76 @@ dependencies = [ ] [[package]] -name = "zvariant" -version = "3.15.2" +name = "zerocopy" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ - "byteorder", + "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", +] + +[[package]] +name = "zstd" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.11+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] + +[[package]] +name = "zvariant" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +dependencies = [ + "endi", "enumflags2", - "libc", "serde", "static_assertions", "zvariant_derive", @@ -5016,24 +3525,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index fd916da9bbfe..25f62fad9bbf 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -4,10 +4,10 @@ , dbus , freetype , gtk3 -, libsoup +, libsoup_3 , openssl , pkg-config -, webkitgtk +, webkitgtk_4_1 , libappindicator , makeWrapper , coolercontrol @@ -23,12 +23,7 @@ rustPlatform.buildRustPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui/src-tauri"; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "tauri-plugin-localhost-0.1.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI="; - }; - }; + cargoHash = "sha256-0Ud5S4T5+5eBuvD5N64NAvbK0+tTozKsPhsNziCEu3I="; buildFeatures = [ "custom-protocol" ]; @@ -41,9 +36,9 @@ rustPlatform.buildRustPackage { dbus openssl freetype - libsoup + libsoup_3 gtk3 - webkitgtk + webkitgtk_4_1 libappindicator ]; @@ -54,7 +49,7 @@ rustPlatform.buildRustPackage { postPatch = '' mkdir -p ui-build cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/ - substituteInPlace tauri.conf.json --replace '"distDir": "../dist"' '"distDir": "ui-build"' + substituteInPlace tauri.conf.json --replace '"frontendDist": "../dist"' '"frontendDist": "ui-build"' ''; postInstall = '' diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix index da3e75a906c5..f6c6090d0c57 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix @@ -11,7 +11,7 @@ buildNpmPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui"; - npmDepsHash = "sha256-gnJvNQCbqFfPfsqi008HW4kBTpxiVpN7eHyn9bU6if8="; + npmDepsHash = "sha256-PpX9lk+yEG1auvBv5JBdMh7rjWoM0oTYJx6Nme5ij8s="; postBuild = '' cp -r dist $out diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index d1077a6e965e..40db1cebacec 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -1,6 +1,7 @@ { rustPlatform , buildNpmPackage , testers +, libdrm , coolercontrol , runtimeShell }: @@ -15,7 +16,16 @@ rustPlatform.buildRustPackage { inherit version src; sourceRoot = "${src.name}/coolercontrold"; - cargoHash = "sha256-CuA8r54O33csmSY67/AOlQQqUniAWkgWSewIBdeq7X4="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "nvml-wrapper-0.10.0" = "sha256-pMiULWT+nJXcDfLDeACG/DaPF5+AbzpoIUWWWz8mQ+0="; + }; + }; + + buildInputs = [ + libdrm + ]; postPatch = '' # copy the frontend static resources to a directory for embedding diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix index 0922ecd5d9b3..31feaa5a40dc 100644 --- a/pkgs/applications/system/coolercontrol/default.nix +++ b/pkgs/applications/system/coolercontrol/default.nix @@ -4,13 +4,13 @@ }: let - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitLab { owner = "coolercontrol"; repo = "coolercontrol"; rev = version; - hash = "sha256-0NYDPJNX0kWIBHv+b4GuK6efgHCBNDu3rBXaQ/iSxFk="; + hash = "sha256-jsgso9MHt5Szzp9YkuXz8qysdN0li/zD2R/vSZ2Lw5M="; }; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/kitty/themes.nix b/pkgs/applications/terminal-emulators/kitty/themes.nix index 49f0d3040c33..c51e908aad84 100644 --- a/pkgs/applications/terminal-emulators/kitty/themes.nix +++ b/pkgs/applications/terminal-emulators/kitty/themes.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "kitty-themes"; - version = "0-unstable-2024-06-26"; + version = "0-unstable-2024-08-14"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty-themes"; - rev = "522b2bc8631cfe28a1b230d1b774f911eab17cf3"; - hash = "sha256-LYiTp18Qk/rF+n9OuVG4kHDQEbE+ijWKQHA2AIDV4wQ="; + rev = "cdf1ed4134815f58727f8070f997552f86b58892"; + hash = "sha256-vt5y3Ai1KMgRhFrkfhA8G9Ve6BEFrgkCF3ssGlOdekw="; }; dontConfigure = true; diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix index 994af1db8d35..8e1bd0b2517d 100644 --- a/pkgs/applications/version-management/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -50,7 +50,9 @@ rustPlatform.buildRustPackage rec { dontUseCargoParallelTests = true; checkFlags = lib.optionals stdenv.isDarwin [ - "--skip=test_diff_same_non_empty_file" + # This test tries to read /etc/passwd, which fails with the sandbox + # enabled on Darwin + "--skip=test_diff_real_files" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index a1c7361fd336..7debed6749e9 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.54.0"; + version = "2.55.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-wcEQcIDr+isuwDbwbgjGsioDjxAPfosu4vuJhro91DQ="; + hash = "sha256-Ty74t+FwyRHed4V/OoJkq/4It5KpLLa4Xxti+93rjCs="; }; - vendorHash = "sha256-JZ30OXn5XdwLhz02fZgZltLw4FIM2wTlXzRgN8mhPjQ="; + vendorHash = "sha256-K4KKgfjbopYEMJZCDt2x9l6EO7MwVBZ2HrdzvF/oetw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 93607cdfd977..67a14424abe5 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.27.0"; + version = "3.28.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-37SZhuMrGjRQOzjnAegL6babhcIjAwh9wtAb7RB09dM="; + hash = "sha256-INGJYUq5sW6er27kBjtz6BOWhnEtdnRuZgLnfEpO1uE="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 45e083d5b08c..0d6d5a15ef72 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.13.11"; + version = "5.13.22"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-sLSPnr89AvosutY8jw0KiiXihVT+A+fuHs6AKvMEUF4="; + hash = "sha256-nYKwf0+Ai6GU9CeRKI7NInmkA4yH41tMWoT9S03m0VI="; }; - cargoHash = "sha256-iaAxwUtGKG3AG3mdiKveZekFSEqHBf4O9WLs23YeSPs="; + cargoHash = "sha256-dcTyombQBR0IGkK+2GWedFQf/1a74gVUIqM96xVxlj0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-radar/default.nix b/pkgs/applications/version-management/git-radar/default.nix index 4bc6a3f8c531..1c19381c1bb1 100644 --- a/pkgs/applications/version-management/git-radar/default.nix +++ b/pkgs/applications/version-management/git-radar/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub}: +{ coreutils-prefixed, lib, makeWrapper, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-radar"; @@ -11,12 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0c3zp8s4w7m4s71qgwk1jyfc8yzw34f2hi43x1w437ypgabwg81j"; }; + nativeBuildInputs = [ makeWrapper ]; + dontBuild = true; installPhase = '' mkdir -p $out/bin cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out ln -s $out/git-radar $out/bin + ${lib.optionalString stdenv.isDarwin '' + wrapProgram $out/git-radar --prefix PATH : ${lib.makeBinPath [ coreutils-prefixed ]} + ''} ''; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index bf4eca6edb5f..60ef72756c34 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.2.0", - "repo_hash": "0g3g0nwxwv0h7i49qlv1835n9gh0cw8hikms62jl89nv1ca833yr", - "yarn_hash": "119acrb27gpmh4m6vk917y4djfm9319jnys0mrqj183diw8j3zcn", + "version": "17.2.2", + "repo_hash": "1gk29bwd6vzikjg28p30wgdq9a46l4qbnac5r0h2mwih1sm8hlbc", + "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.2.0-ee", + "rev": "v17.2.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.2.0", - "GITLAB_PAGES_VERSION": "17.2.0", + "GITALY_SERVER_VERSION": "17.2.2", + "GITLAB_PAGES_VERSION": "17.2.2", "GITLAB_SHELL_VERSION": "14.37.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.2.0" + "GITLAB_WORKHORSE_VERSION": "17.2.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index f41248123934..ab137a045933 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "17.2.0"; + version = "17.2.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -20,7 +20,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-thQ8Gufcygt3QEbIcmkroSuAky9kJ7f7hupim87AJdE="; + hash = "sha256-4K0unlvhAnTIiuyRUNm0dXG5sJsxIuo8HkUQvUK7ws4="; }; vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; diff --git a/pkgs/applications/version-management/gitlab/gitaly/git.nix b/pkgs/applications/version-management/gitlab/gitaly/git.nix index b80f5de40668..a6d272b2fbb7 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/git.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/git.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "gitaly-git"; - version = "2.44.1.gl1"; + version = "2.44.2.gl1"; # `src` attribute for nix-update src = fetchFromGitLab { owner = "gitlab-org"; repo = "git"; rev = "v${version}"; - hash = "sha256-1XtzM2dYbt3nsYOm5isgHnolfziyIC9yCTkfLJ95V6Y="; + hash = "sha256-VIffbZZEbGjVW1No8zojSQlX/ciJ2DJnaogNlQtc77o="; }; # we actually use the gitaly build system diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index b13c9a12706d..6d1a3ba1a192 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.6.0"; + version = "4.7.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-rFojpy8xUXhlzBFBYFW3+AjDI5efaNWh+Vi3wsqVebI="; + hash = "sha256-+71mqnXRMq0vE+T6V/JqIhP//zldQOEK7694IB5RSnc="; }; - vendorHash = "sha256-xhy0WSqdlri5bckIeS6CSeyZGf3pBNpLElkvsMm6N48="; + vendorHash = "sha256-h4nLnmsQ52PU3tUbTCUwWN8LbYuSgzaDkqplEZcDAGM="; postPatch = '' # Disable flaky inmemory storage driver test diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 5b75abd4c2d1..5c934a5afc83 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.2.0"; + version = "17.2.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-Rw78xDkOf/LDINsWqNGkMSjUXkbgVlSI6PTiZLHo2Wo="; + hash = "sha256-AtLsy2hHxqr3XyTItLfMoTmrUsM707Kme7jE2jAAfyc="; }; vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 32db49747235..77ba5813469d 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 = "17.2.0"; + version = "17.2.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 3a520314aa47..f8d33908e6ca 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -2279,4 +2279,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.5.11 + 2.5.16 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 10c3460eded1..325a467cd624 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -2789,7 +2789,7 @@ src: version = "1.45.0"; }; google-protobuf = { - groups = ["default"]; + groups = ["default" "development" "opentelemetry" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index cb94d6f3bb23..867f7a9b13a4 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -4,23 +4,25 @@ , pkg-config , libgit2 , zlib +, cmake }: rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.9.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-A9gjCuWIRdNQhMjdRIH0B5cXGZAPQxK+qYSNI5WGZec="; + hash = "sha256-Jys6pdHGIrgBrXnHm3P2PbTPBPiclQErEaUUQSRm1a0="; }; - cargoHash = "sha256-aA7YPUKlBhfIBvT4D6zgZ8+lKNNazsVwGJC5VETAzOY="; + cargoHash = "sha256-JT/Di4HEcXm03/1gVuaX+6JKn0aHAudwpf+gzXgRFfA="; nativeBuildInputs = [ pkg-config + cmake ]; buildInputs = [ diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index c572c2652f23..0a498c597353 100644 --- a/pkgs/applications/version-management/stgit/default.nix +++ b/pkgs/applications/version-management/stgit/default.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.4.9"; + version = "2.4.10"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-b8uzekKnNAJGeDYI2puHUaxY6K0s5tWxAWGpufJi/jk="; + hash = "sha256-3z0MwqE7+jEuWK1/OUGDolUWzi9soKWvVtlhyA9zJEA="; }; - cargoHash = "sha256-0bbOAo48xRiCyivO3fuThXAIEFgFbxh6ZtFOPikZi88="; + cargoHash = "sha256-9cfgKOIxnh1YLeUVLFnRQz6PqeLrz/6Sc2QybCXo6/w="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix deleted file mode 100644 index 3391210462c3..000000000000 --- a/pkgs/applications/video/ccextractor/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, libiconv -, zlib -, enableOcr ? true -, makeWrapper -, tesseract4 -, leptonica -, ffmpeg_4 -}: - -stdenv.mkDerivation rec { - pname = "ccextractor"; - version = "0.93"; - - src = fetchFromGitHub { - owner = "CCExtractor"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc="; - }; - - postPatch = '' - # https://github.com/CCExtractor/ccextractor/issues/1467 - sed -i '/allheaders.h/a#include ' src/lib_ccx/ocr.c - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/CMakeLists.txt \ - --replace 'add_definitions(-DGPAC_CONFIG_LINUX)' 'add_definitions(-DGPAC_CONFIG_DARWIN)' - ''; - - cmakeDir = "../src"; - - nativeBuildInputs = [ pkg-config cmake makeWrapper ]; - - buildInputs = [ zlib ] - ++ lib.optional (!stdenv.isLinux) libiconv - ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg_4 ]; - - cmakeFlags = [ - # file RPATH_CHANGE could not write new RPATH: - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ] ++ lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; - - postInstall = lib.optionalString enableOcr '' - wrapProgram "$out/bin/ccextractor" \ - --set TESSDATA_PREFIX "${tesseract4}/share/" - ''; - - meta = with lib; { - homepage = "https://www.ccextractor.org"; - description = "Tool that produces subtitles from closed caption data in videos"; - longDescription = '' - A tool that analyzes video files and produces independent subtitle files from - closed captions data. CCExtractor is portable, small, and very fast. - It works on Linux, Windows, and OSX. - ''; - platforms = platforms.unix; - # undefined reference to `png_do_expand_palette_rgba8_neon' - # undefined reference to `png_riffle_palette_neon' - # undefined reference to `png_do_expand_palette_rgb8_neon' - # undefined reference to `png_init_filter_functions_neon' - # during Linking C executable ccextractor - broken = stdenv.isAarch64; - license = licenses.gpl2Only; - maintainers = [ ]; - mainProgram = "ccextractor"; - }; -} diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index ec15a47090fd..7ec4658aee32 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -7,7 +7,7 @@ , docbook-xsl-nons , dvdauthor , dvdplusrwtools -, ffmpeg_4 +, ffmpeg_7 , flex , fontconfig , gettext @@ -32,18 +32,13 @@ let inherit (lib) optionals makeBinPath; in stdenv.mkDerivation rec { pname = "dvdstyler"; - version = "3.2.1"; + version = "3.3b4"; src = fetchurl { - url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2"; - sha256 = "sha256-C7M0hzn0yTCXRUuBTss6WPa6zo8DD0Fhmp/ur7R0dVg="; + url = "mirror://sourceforge/project/dvdstyler/dvdstyler-devel/${version}/DVDStyler-${version}.tar.bz2"; + hash = "sha256-JCaKcE7jkTxT57KKePs8gmgQedoOcP5NEQ2FwIDS2Ho="; }; - patches = [ - # https://sourceforge.net/p/dvdstyler/DVDStyler/ci/679fa8dc6ac7657775eda9d7b0ed9da9d069aeec/ - ./wxgtk32.patch - ]; - nativeBuildInputs = [ bison docbook_xml_dtd_412 @@ -60,7 +55,7 @@ in stdenv.mkDerivation rec { cdrtools dvdauthor dvdplusrwtools - ffmpeg_4 + ffmpeg_7 fontconfig glib libexif diff --git a/pkgs/applications/video/dvdstyler/wxgtk32.patch b/pkgs/applications/video/dvdstyler/wxgtk32.patch deleted file mode 100644 index 92b3c3fbe3ba..000000000000 --- a/pkgs/applications/video/dvdstyler/wxgtk32.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/wxVillaLib/PropDlg.cpp -+++ b/wxVillaLib/PropDlg.cpp -@@ -12,7 +12,9 @@ - #include "utils.h" - #include - #include -+#ifdef __WXMSW__ - #include -+#endif - #include - #include - #include diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/applications/video/gpu-screen-recorder/default.nix index 89fda1154232..663d82640247 100644 --- a/pkgs/applications/video/gpu-screen-recorder/default.nix +++ b/pkgs/applications/video/gpu-screen-recorder/default.nix @@ -1,22 +1,23 @@ -{ stdenv -, lib -, fetchurl -, makeWrapper -, meson -, ninja -, pkg-config -, libXcomposite -, libpulseaudio -, ffmpeg -, wayland -, libdrm -, libva -, libglvnd -, libXdamage -, libXi -, libXrandr -, libXfixes -, wrapperDir ? "/run/wrappers/bin" +{ + stdenv, + lib, + fetchurl, + makeWrapper, + meson, + ninja, + pkg-config, + libXcomposite, + libpulseaudio, + ffmpeg, + wayland, + libdrm, + libva, + libglvnd, + libXdamage, + libXi, + libXrandr, + libXfixes, + wrapperDir ? "/run/wrappers/bin", }: stdenv.mkDerivation { @@ -51,9 +52,7 @@ stdenv.mkDerivation { libXfixes ]; - patches = [ - ./0001-Don-t-install-systemd-unit-files-using-absolute-path.patch - ]; + patches = [ ./0001-Don-t-install-systemd-unit-files-using-absolute-path.patch ]; mesonFlags = [ "-Dsystemd=true" @@ -73,6 +72,7 @@ stdenv.mkDerivation { meta = { description = "Screen recorder that has minimal impact on system performance by recording a window using the GPU only"; + mainProgram = "gpu-screen-recorder"; homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.babbaj ]; diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index a87ede755163..481b059d7727 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -8,13 +8,13 @@ buildLua rec { pname = "mpv-playlistmanager"; - version = "0-unstable-2024-07-28"; + version = "0-unstable-2024-08-17"; src = fetchFromGitHub { owner = "jonniek"; repo = "mpv-playlistmanager"; - rev = "54ed4421f9db5df22524d37e565fe4bb2d12117e"; - hash = "sha256-RAIyPgqDjKkKcBAzIehpqxCNkWt0Gyxvfo8ycXkjAe0="; + rev = "d733d8c00cb543a646f2ce5ab5c12bef2dfd6756"; + hash = "sha256-Pv2+dl9QIIwOYmT4sJmPOBHed5pZLMXZaw80mT4s+WQ="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 0adac748460e..204f0e1311fa 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -63,13 +63,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "30.2.2"; + version = "30.2.3"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = finalAttrs.version; - hash = "sha256-yMtLN/86+3wuNR+gGhsaxN4oGIC21bAcjbQfyTuXIYc="; + hash = "sha256-4bAzW62xX9apKOAJyn3iys1bFdHj4re2reMZtlGsn5s="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index e40dbc8c4f14..5285d6f5abe4 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-RdXqiFMlpKTmedF+VBzROx0qTKDOdkQ3hO4Xj0vIq2A="; + hash = "sha256-KP3aYSGjEsytiA7toLSkqKcxgT+2Wu3SKyOG4uga2RI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix deleted file mode 100644 index 703676b4615d..000000000000 --- a/pkgs/applications/video/p2pvc/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, opencv2, ncurses, portaudio }: - -stdenv.mkDerivation { - pname = "p2pvc"; - version = "unstable-2015-02-12"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ opencv2 ncurses portaudio ]; - - enableParallelBuilding = true; - - installPhase = "mkdir -p $out/bin; cp p2pvc $out/bin/"; - - src = fetchFromGitHub { - owner = "mofarrell"; - repo = "p2pvc"; - rev = "d7b1c70288a7750fc8f9a22dbddbe51d34b5b9e5"; - sha256 = "0d4vvrsjad5gk4rrjwgydn9ffj12jfb4aksw2px6jw75hp9pzmka"; - }; - - meta = { - description = "Point to point color terminal video chat"; - homepage = "https://github.com/mofarrell/p2pvc"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ trino ]; - platforms = with lib.platforms; linux; - mainProgram = "p2pvc"; - }; -} diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 4e78ef877492..9b503abab6a1 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_4, libjack2, libX11, libXext, libXinerama, qtx11extras +{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_7, libjack2, libX11, libXext, libXinerama, qtx11extras , libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja, nix-update-script }: mkDerivation rec { pname = "simplescreenrecorder"; - version = "0.4.4"; + version = "0.4.4-unstable-2024-08-13"; src = fetchFromGitHub { owner = "MaartenBaert"; repo = "ssr"; - rev = version; - sha256 = "sha256-cVjQmyk+rCqmDJzdnDk7bQ8kpyD3HtTw3wLVx2thHok="; + rev = "4e3ba13dd212fc4213fe0911f371bc7d34033b8d"; + hash = "sha256-jBZkyrZOrUljWgO8U4SZOTCu3sOm83unQ7vyv+KkAuE="; }; cmakeFlags = [ @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ - alsa-lib ffmpeg_4 libjack2 libX11 libXext libXfixes libXinerama libGLU libGL + alsa-lib ffmpeg_7 libjack2 libX11 libXext libXfixes libXinerama libGLU libGL libpulseaudio libv4l qtbase qttools qtx11extras ]; diff --git a/pkgs/applications/virtualization/pods/Cargo.lock b/pkgs/applications/virtualization/pods/Cargo.lock index d53094fcf9bf..c12193cc03df 100644 --- a/pkgs/applications/virtualization/pods/Cargo.lock +++ b/pkgs/applications/virtualization/pods/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[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", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -31,9 +31,9 @@ dependencies = [ [[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", ] @@ -55,22 +55,23 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "ashpd" -version = "0.6.0" -source = "git+https://github.com/bilelmoussaoui/ashpd.git?rev=30216eccd3f4ecb50c4d34a493a33e6eef4e375c#30216eccd3f4ecb50c4d34a493a33e6eef4e375c" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "enumflags2", "futures-channel", "futures-util", "gdk4-wayland", "gdk4-x11", + "glib", "gtk4", - "once_cell", "rand", "serde", "serde_repr", @@ -81,146 +82,122 @@ dependencies = [ [[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", + "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "1.9.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-io" -version = "1.13.0" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" 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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" -dependencies = [ - "async-lock 3.0.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.0.1", + "futures-lite", "parking", - "polling 3.3.0", - "rustix 0.38.21", + "polling", + "rustix", "slab", "tracing", - "waker-fn", - "windows-sys", + "windows-sys 0.59.0", ] [[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.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e900cdcd39bb94a14487d3f7ef92ca222162e6c7c3fe7cb3550ea75fb486ed" -dependencies = [ - "event-listener 3.0.1", + "event-listener", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.0.1", - "futures-lite 1.13.0", - "rustix 0.38.21", - "windows-sys", + "event-listener", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.2.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.21", + "rustix", "signal-hook-registry", "slab", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] @@ -231,15 +208,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.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -264,9 +241,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -294,25 +271,22 @@ dependencies = [ [[package]] name = "blocking" -version = "1.4.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 2.8.0", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 1.13.0", + "futures-lite", "piper", - "tracing", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -328,27 +302,28 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cairo-rs" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "797fd5a634dcb0ad0d7d583df794deb0a236d88e759cd34b7da20198c6c9d145" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", @@ -366,18 +341,15 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292" [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -390,10 +362,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chrono" -version = "0.4.31" +name = "cfg_aliases" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +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", @@ -417,9 +395,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -439,7 +417,7 @@ dependencies = [ "log", "mime", "paste", - "pin-project 1.1.3", + "pin-project 1.1.5", "serde", "serde_json", "tar", @@ -450,36 +428,33 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -494,24 +469,13 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" 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 = "digest" version = "0.10.7" @@ -524,10 +488,16 @@ dependencies = [ ] [[package]] -name = "enumflags2" -version = "0.7.8" +name = "endi" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +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", @@ -535,13 +505,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] @@ -552,34 +522,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys", -] - -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "version_check", + "windows-sys 0.52.0", ] [[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.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -588,28 +543,19 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.3.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 3.0.1", + "event-listener", "pin-project-lite", ] [[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "field-offset" @@ -617,27 +563,27 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset", "rustc_version", ] [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "miniz_oxide", @@ -651,18 +597,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -675,9 +621,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -685,15 +631,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -702,63 +648,51 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 1.9.0", + "fastrand", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" -dependencies = [ - "futures-core", - "pin-project-lite", ] [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -786,20 +720,21 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28bb53ecb56857c683c9ec859908e076dd3969c7d67598bd8b1ce095d211304a" dependencies = [ "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f6681a0c1330d1d3968bec1529f7172d62819ef0bdbb0d18022320654158b03" dependencies = [ "gio-sys", "glib-sys", @@ -810,8 +745,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -824,8 +760,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -840,8 +777,9 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34f422f60971cdea128457cad122c46fee48b3a53aa1e1d140919d50ff5b7491" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -852,8 +790,9 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23295b2ecafae572224a382b876b0bdc0fed947da63b51edebc8798288002048" dependencies = [ "glib-sys", "libc", @@ -862,8 +801,9 @@ dependencies = [ [[package]] name = "gdk4-x11" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4b89c2149f74668d630279559fb5e2b4f11a77124b73d04518cc344854cd626" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -874,8 +814,9 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a186f565940124ebd6c1c97e9eb0909e2d19a33ccd3eebed4ff32ebda766207d" dependencies = [ "gdk4-sys", "glib-sys", @@ -895,9 +836,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -926,14 +867,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2" dependencies = [ "futures-channel", "futures-core", @@ -942,7 +884,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -950,22 +891,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -977,28 +920,28 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" dependencies = [ "heck", - "proc-macro-crate 2.0.0", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "glib-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" dependencies = [ "libc", "system-deps", @@ -1006,8 +949,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" dependencies = [ "glib-sys", "libc", @@ -1016,8 +960,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630e940ad5824f90221d6579043a9cd1f8bec86b4a17faaf7827d58eb16e8c1f" dependencies = [ "glib", "graphene-sys", @@ -1026,8 +971,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8fade7b754982f47ebbed241fd2680816fdd4598321784da10b9e1168836a" dependencies = [ "glib-sys", "libc", @@ -1037,8 +983,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" dependencies = [ "cairo-rs", "gdk4", @@ -1051,8 +998,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1066,8 +1014,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d" dependencies = [ "cairo-rs", "field-offset", @@ -1086,21 +1035,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09" dependencies = [ - "anyhow", - "proc-macro-crate 2.0.0", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.73", ] [[package]] name = "gtk4-sys" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1117,21 +1066,27 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +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" @@ -1141,9 +1096,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -1159,42 +1114,42 @@ dependencies = [ [[package]] name = "hostname" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ + "cfg-if", "libc", - "match_cfg", - "winapi", + "windows", ] [[package]] name = "http" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95b9abcae896730d42b78e09c155ed4ddf82c07b4de772c64aee5b2d8b7c150" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ - "bytes 1.5.0", + "bytes 1.7.1", "fnv", "itoa", ] [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "bytes 1.5.0", + "bytes 1.7.1", "http", "pin-project-lite", ] [[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" @@ -1204,11 +1159,11 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ - "bytes 1.5.0", + "bytes 1.7.1", "futures-channel", "futures-core", "futures-util", @@ -1218,7 +1173,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -1234,15 +1189,15 @@ dependencies = [ "futures-util", "hex", "hyper", - "pin-project 1.1.3", + "pin-project 1.1.5", "tokio", ] [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1263,9 +1218,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1273,9 +1228,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown", @@ -1292,56 +1247,42 @@ dependencies = [ "generic-array", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "io-lifetimes" -version = "1.0.11" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys", -] +checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[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" dependencies = [ "spin", ] [[package]] name = "libadwaita" -version = "0.6.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#24608c684b8fa59357d0d586fde75c04a464cbf6" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" dependencies = [ - "gdk-pixbuf", "gdk4", "gio", "glib", @@ -1353,8 +1294,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.6.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#24608c684b8fa59357d0d586fde75c04a464cbf6" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" dependencies = [ "gdk4-sys", "gio-sys", @@ -1368,9 +1310,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -1379,46 +1321,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] -name = "libpanel" -version = "0.3.0" -source = "git+https://gitlab.gnome.org/World/Rust/libpanel-rs.git#7dd6d088f92079893f0e5d2afc2c8258b807ddcd" +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "futures-core", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita", + "bitflags 2.6.0", "libc", - "libpanel-sys", -] - -[[package]] -name = "libpanel-sys" -version = "0.3.0" -source = "git+https://gitlab.gnome.org/World/Rust/libpanel-rs.git#7dd6d088f92079893f0e5d2afc2c8258b807ddcd" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libadwaita-sys", - "libc", - "system-deps", + "redox_syscall 0.5.3", ] [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.14" 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" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "locale_config" @@ -1435,9 +1352,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "malloc_buf" @@ -1449,31 +1366,26 @@ dependencies = [ ] [[package]] -name = "match_cfg" -version = "0.1.0" +name = "md-5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "autocfg", + "cfg-if", + "digest", ] [[package]] -name = "memoffset" -version = "0.9.0" +name = "memchr" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1486,22 +1398,32 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "multi_log" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad56bb3c7c7c15b4e25de86c9123e886e5f80a0c03ace219b453b081c2bf20d7" +dependencies = [ + "log", ] [[package]] @@ -1515,21 +1437,22 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases", "libc", - "memoffset 0.7.1", + "memoffset", ] [[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", @@ -1541,11 +1464,10 @@ 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", ] @@ -1570,28 +1492,33 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -1600,11 +1527,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", @@ -1612,28 +1538,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -1669,43 +1585,45 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oo7" -version = "0.2.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b" +checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24" dependencies = [ "aes", - "byteorder", "cbc", "cipher", "digest", + "endi", "futures-util", "hkdf", "hmac", + "md-5", "num", "num-bigint-dig", - "once_cell", "pbkdf2", "rand", "serde", "sha2", + "subtle", "tokio", "zbus", "zeroize", + "zvariant", ] [[package]] @@ -1720,20 +1638,21 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54768854025df6903061d0084fd9702a253ddfd60db7d9b751d43b76689a7f0a" dependencies = [ "gio", "glib", "libc", - "once_cell", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b07cc57d10cee4ec661f718a6902cee18c2f4cfae08e87e5a390525946913390" dependencies = [ "glib-sys", "gobject-sys", @@ -1741,6 +1660,12 @@ dependencies = [ "system-deps", ] +[[package]] +name = "paris" +version = "1.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fecab3723493c7851f292cb060f3ee1c42f19b8d749345d0d7eaf3fd19aa62d" + [[package]] name = "parking" version = "2.2.0" @@ -1749,9 +1674,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[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 = "pbkdf2" @@ -1765,9 +1690,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" @@ -1780,11 +1705,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ - "pin-project-internal 1.1.3", + "pin-project-internal 1.1.5", ] [[package]] @@ -1800,20 +1725,20 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[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" @@ -1823,20 +1748,20 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "podman-api" @@ -1845,7 +1770,7 @@ source = "git+https://github.com/vv9k/podman-api-rs.git#f35e6f9f9fdb9d9023aed341 dependencies = [ "base64", "byteorder", - "bytes 1.5.0", + "bytes 1.7.1", "containers-api", "flate2", "futures-util", @@ -1874,7 +1799,7 @@ dependencies = [ [[package]] name = "pods" -version = "2.0.0" +version = "2.1.0-devel" dependencies = [ "anyhow", "ashpd", @@ -1883,14 +1808,15 @@ dependencies = [ "gtk4", "indexmap", "libadwaita", - "libpanel", "log", + "multi_log", "names", "oo7", "paste", "podman-api", "serde", "serde_json", + "simplelog", "sourceview5", "syslog", "tokio", @@ -1901,32 +1827,17 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.7.3" 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", -] - -[[package]] -name = "polling" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.21", + "rustix", "tracing", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1937,67 +1848,36 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "zerocopy", ] [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.20.7", -] - -[[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", + "toml_edit 0.21.1", ] [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2043,18 +1923,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2064,9 +1944,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2075,15 +1955,15 @@ 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 = "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_version" @@ -2096,90 +1976,77 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.11", - "windows-sys", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2208,13 +2075,25 @@ 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", ] +[[package]] +name = "simplelog" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" +dependencies = [ + "log", + "paris", + "termcolor", + "time", +] + [[package]] name = "slab" version = "0.4.9" @@ -2226,34 +2105,25 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "sourceview5" -version = "0.8.0" -source = "git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git#5baec2e87544136de6c3e1a3614624d60986d530" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905c83b38d4aff1800a12adba65b083deba61b4d948f62fc2ff7ad7d77656d05" dependencies = [ "futures-channel", "futures-core", @@ -2269,8 +2139,9 @@ dependencies = [ [[package]] name = "sourceview5-sys" -version = "0.8.0" -source = "git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git#5baec2e87544136de6c3e1a3614624d60986d530" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3759467713554a8063faa380237ee2c753e89026bbe1b8e9611d991cb106ff" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -2285,9 +2156,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "static_assertions" @@ -2297,9 +2168,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -2314,9 +2185,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "837a7e8026c6ce912ff01cefbe8cafc2f8010ac49682e2a3d9decc3bce1ecaaf" dependencies = [ "proc-macro2", "quote", @@ -2325,11 +2196,10 @@ dependencies = [ [[package]] name = "syslog" -version = "6.1.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7434e95bcccce1215d30f4bf84fe8c00e8de1b9be4fb736d747ca53d36e7f96f" +checksum = "019f1500a13379b7d051455df397c75770de6311a7a188a699499502704d9f10" dependencies = [ - "error-chain", "hostname", "libc", "log", @@ -2338,9 +2208,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" dependencies = [ "cfg-expr", "heck", @@ -2351,9 +2221,9 @@ dependencies = [ [[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", @@ -2362,58 +2232,68 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-dir" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.21", - "windows-sys", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.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.50" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -2429,18 +2309,19 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2453,27 +2334,26 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", - "bytes 1.5.0", + "bytes 1.7.1", "libc", "mio", - "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tracing", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -2496,58 +2376,47 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.18", ] [[package]] @@ -2575,7 +2444,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] @@ -2589,9 +2458,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" @@ -2601,19 +2470,20 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset", "tempfile", "winapi", ] [[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-ident" @@ -2623,18 +2493,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "url" -version = "2.4.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -2644,27 +2514,27 @@ 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 = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vte" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b0a06c0f086f7abe70cf308967153479e223b6a9809f7dcc6c47b045574bc9" +checksum = "40eb22ae96f050e0c0d6f7ce43feeae26c348fc4dea56928ca81537cfaa6188b" dependencies = [ "utf8parse", "vte_generate_state_changes", @@ -2673,9 +2543,10 @@ dependencies = [ [[package]] name = "vte4" version = "0.8.0" -source = "git+https://gitlab.gnome.org/World/Rust/vte4-rs.git#aa466f43ead6190c6c4b8792f78ed766df1c289e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7759016227e58e3239b8dca9c4a70086345844872b1f27cba0dba990fef5cb44" dependencies = [ - "bitflags 1.3.2", + "cairo-rs", "gdk4", "gio", "glib", @@ -2689,8 +2560,10 @@ dependencies = [ [[package]] name = "vte4-sys" version = "0.8.0" -source = "git+https://gitlab.gnome.org/World/Rust/vte4-rs.git#aa466f43ead6190c6c4b8792f78ed766df1c289e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1aa57d29283c6eeac2e34c16791436275d254ac02b8590b02698feef197234" dependencies = [ + "cairo-sys-rs", "gdk4-sys", "gio-sys", "glib-sys", @@ -2702,20 +2575,14 @@ dependencies = [ [[package]] name = "vte_generate_state_changes" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" dependencies = [ "proc-macro2", "quote", ] -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "want" version = "0.3.1" @@ -2733,9 +2600,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2743,24 +2610,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2768,22 +2635,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "winapi" @@ -2801,6 +2668,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -2808,32 +2684,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-core" -version = "0.51.1" +name = "windows" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ "windows-targets", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ "windows-targets", ] [[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", @@ -2842,94 +2738,108 @@ 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 = "winnow" -version = "0.5.19" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ - "nix", - "winapi", + "libc", + "windows-sys 0.59.0", ] [[package]] name = "zbus" -version = "3.14.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-process", "async-recursion", "async-trait", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", "nix", - "once_cell", "ordered-stream", "rand", "serde", @@ -2939,7 +2849,7 @@ dependencies = [ "tokio", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -2948,23 +2858,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.73", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -2972,10 +2881,31 @@ dependencies = [ ] [[package]] -name = "zeroize" -version = "1.6.0" +name = "zerocopy" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "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 2.0.73", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -2988,18 +2918,17 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "zvariant" -version = "3.15.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "url", @@ -3008,24 +2937,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.73", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.73", ] diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 65fb88824497..201fcf89988b 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -19,26 +19,19 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "2.0.0"; + version = "2.0.1-unstable-2024-08-11"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-jSN4WmyzYARhDkwAtTYD4iXNTM1QQbAAwQ/ICHg7k3k="; + rev = "146a85b4860375ac0a5be8d7be57fb12753a3c42"; + sha256 = "sha256-KaS38XC+V3jRPPTnI4UqMc9KGAC7INHMu47LVo9YP44="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "ashpd-0.6.0" = "sha256-kLacOwMZ4MQlFYCx5J4kI4J+a9fVRF5Ii/AkWOL/TNQ="; - "cairo-rs-0.19.0" = "sha256-8s+ngacR7d2wb1FKYf0pycxMQbgW63zMKpMgaUs2e+c="; - "gdk4-0.8.0" = "sha256-o9HC4VX6ntPk0JXAX5Whhu0qlUdpPky/1PNrRd9zjdk="; - "libadwaita-0.6.0" = "sha256-3Kge7SIE+vex/uOIt7hjmU68jidkBjrW96o24hu3e/U="; - "libpanel-0.3.0" = "sha256-LA8ynd+7imEdQwvLslmKw+pPNbAEle9fZ2sFuyRY/jU="; "podman-api-0.10.0" = "sha256-nbxK/U5G+PlbytpHdr63x/C69hBgedPXBFfgdzT9fdc="; - "sourceview5-0.8.0" = "sha256-+f+mm682H4eRC7Xzx5wukecDZq+hMpJQ3+3xHzG00Go="; - "vte4-0.8.0" = "sha256-KZBpfSAngbp5czAXdKA7Au5uYqs2L5MyNsnXcBH77lo="; }; }; diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/applications/virtualization/quickgui/default.nix index cb3c79f36aa9..e60d7949ec3a 100644 --- a/pkgs/applications/virtualization/quickgui/default.nix +++ b/pkgs/applications/virtualization/quickgui/default.nix @@ -1,67 +1,56 @@ -{ stdenvNoCC +{ fetchFromGitHub +, makeDesktopItem +, copyDesktopItems , lib -, fetchurl -, autoPatchelfHook -, dpkg -, wrapGAppsHook3 +, flutter , quickemu , zenity }: - -stdenvNoCC.mkDerivation rec { +flutter.buildFlutterApplication rec { pname = "quickgui"; - version = "1.2.8"; - - src = fetchurl { - url = "https://github.com/quickemu-project/quickgui/releases/download/v${version}/quickgui_${version}-1_lunar1.0_amd64.deb"; - sha256 = "sha256-crnV7OWH5UbkMM/TxTIOlXmvqBgjFmQG7RxameMOjH0="; + version = "1.2.10"; + src = fetchFromGitHub { + owner = "quickemu-project"; + repo = "quickgui"; + rev = version; + hash = "sha256-M2Qy66RqsjXg7ZpHwaXCN8qXRIsisnIyaENx3KqmUfQ="; }; - nativeBuildInputs = [ - autoPatchelfHook - dpkg - wrapGAppsHook3 - ]; + pubspecLock = lib.importJSON ./pubspec.lock.json; - buildInputs = [ - quickemu - zenity - ]; + gitHashes = { + window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM="; + }; - strictDeps = true; + extraWrapProgramArgs = "--prefix PATH : ${lib.makeBinPath [ quickemu zenity ]}"; - unpackCmd = "dpkg-deb -x $curSrc source"; - - installPhase = '' - runHook preInstall - - mv usr $out - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ quickemu zenity ]} - ) - ''; + nativeBuildInputs = [ copyDesktopItems ]; postFixup = '' - substituteInPlace $out/share/applications/quickgui.desktop \ - --replace "/usr" $out - - # quickgui PR 88 - echo "Categories=System;" >> $out/share/applications/quickgui.desktop + for SIZE in 16 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/$SIZEx$SIZE/apps/ + cp -av assets/resources/quickgui_$SIZE.png $out/share/icons/hicolor/$SIZEx$SIZE/apps/quickgui.png + done ''; + desktopItems = [ + (makeDesktopItem { + name = "quickgui"; + exec = "quickgui"; + icon = "quickgui"; + desktopName = "Quickgui"; + comment = "An elegant virtual machine manager for the desktop"; + categories = [ "Development" "System" ]; + }) + ]; + meta = with lib; { - description = "Flutter frontend for quickemu"; + description = "Elegant virtual machine manager for the desktop"; homepage = "https://github.com/quickemu-project/quickgui"; - changelog = "https://github.com/quickemu-project/quickgui/releases/tag/v${version}"; + changelog = "https://github.com/quickemu-project/quickgui/releases/"; license = licenses.mit; - maintainers = with maintainers; [ heyimnova ]; + maintainers = with maintainers; [ flexiondotorg heyimnova ]; platforms = [ "x86_64-linux" ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; mainProgram = "quickgui"; }; } diff --git a/pkgs/applications/virtualization/quickgui/pubspec.lock.json b/pkgs/applications/virtualization/quickgui/pubspec.lock.json new file mode 100644 index 000000000000..7e62ceff8be7 --- /dev/null +++ b/pkgs/applications/virtualization/quickgui/pubspec.lock.json @@ -0,0 +1,1189 @@ +{ + "packages": { + "_discoveryapis_commons": { + "dependency": "transitive", + "description": { + "name": "_discoveryapis_commons", + "sha256": "f8bb1fdbd77f3d5c1d62b5b0eca75fbf1e41bf4f6c62628f880582e2182ae45d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "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" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "charset": { + "dependency": "transitive", + "description": { + "name": "charset", + "sha256": "27802032a581e01ac565904ece8c8962564b1070690794f0072f6865958ce8b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "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" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "desktop_notifications": { + "dependency": "direct main", + "description": { + "name": "desktop_notifications", + "sha256": "6d92694ad6e9297a862c5ff7dd6b8ff64c819972557754769f819d2209612927", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.3" + }, + "dio": { + "dependency": "transitive", + "description": { + "name": "dio", + "sha256": "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.3+1" + }, + "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": "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.6" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_app_builder": { + "dependency": "transitive", + "description": { + "name": "flutter_app_builder", + "sha256": "74018c0e2da3ae33073e7417b5c8e900fdc7b5ebc3bdacd2dd05244d9b5e54cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "flutter_app_packager": { + "dependency": "transitive", + "description": { + "name": "flutter_app_packager", + "sha256": "3925c4e2ac53f4a5ce3bae1a5f54966620504d6c28725b112074cfbdf227a36b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "flutter_app_publisher": { + "dependency": "transitive", + "description": { + "name": "flutter_app_publisher", + "sha256": "bbb1953ef723fc98a7f974ae9499194999f570194c6d856182518e6e73b51ff2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "flutter_distributor": { + "dependency": "direct dev", + "description": { + "name": "flutter_distributor", + "sha256": "45d27526a5de93370e322da5314b0a1c07c024b79031a8ad44435046915fa0e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "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": "c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.20" + }, + "flutter_svg": { + "dependency": "direct main", + "description": { + "name": "flutter_svg", + "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.10+1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.0" + }, + "gettext": { + "dependency": "direct main", + "description": { + "name": "gettext", + "sha256": "007a3cbd5d8139252118bab34911d24edfc695665b38f91ae244f51b4d71f6b4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "gettext_i18n": { + "dependency": "direct main", + "description": { + "name": "gettext_i18n", + "sha256": "1acdb7f6bb7c06aaa69016a248de20123ac9af2e1a29321244012fbf6f2d4bdd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.7" + }, + "gettext_parser": { + "dependency": "direct main", + "description": { + "name": "gettext_parser", + "sha256": "9565c9dd1033ec125e1fbc7ccba6c0d2d753dd356122ba1a17e6aa7dc868f34a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "google_identity_services_web": { + "dependency": "transitive", + "description": { + "name": "google_identity_services_web", + "sha256": "9482364c9f8b7bd36902572ebc3a7c2b5c8ee57a9c93e6eb5099c1a9ec5265d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1+1" + }, + "googleapis": { + "dependency": "transitive", + "description": { + "name": "googleapis", + "sha256": "864f222aed3f2ff00b816c675edf00a39e2aaf373d728d8abec30b37bee1a81c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.2.0" + }, + "googleapis_auth": { + "dependency": "transitive", + "description": { + "name": "googleapis_auth", + "sha256": "befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.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" + }, + "intl": { + "dependency": "transitive", + "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" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "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" + }, + "liquid_engine": { + "dependency": "transitive", + "description": { + "name": "liquid_engine", + "sha256": "41ae12d5a72451c3efb8d4e7b901cdf0537917597bc7e7376e9b0a237f92df29", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "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" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.0" + }, + "msix": { + "dependency": "transitive", + "description": { + "name": "msix", + "sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.7" + }, + "mustache_template": { + "dependency": "transitive", + "description": { + "name": "mustache_template", + "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.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" + }, + "parse_app_package": { + "dependency": "transitive", + "description": { + "name": "parse_app_package", + "sha256": "69f313fbadf457576015333a8da2e99018763dce88df248febcfb8883da8aedb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "path": { + "dependency": "transitive", + "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_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" + }, + "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": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "plist_parser": { + "dependency": "transitive", + "description": { + "name": "plist_parser", + "sha256": "e2a6f9abfa0c45c0253656b7360abb0dfb84af9937bace74605b93d2aad2bf0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.11" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "process_run": { + "dependency": "direct main", + "description": { + "name": "process_run", + "sha256": "6052115540ad88715d6bcee60656970f70c68c85846d1948b92e435f0382899e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0+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": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "qiniu_sdk_base": { + "dependency": "transitive", + "description": { + "name": "qiniu_sdk_base", + "sha256": "2506c6372512f81cfbddf162ea6da1ad7b1c6521dee1d10e9da6847c92e13349", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.2" + }, + "quiver": { + "dependency": "direct main", + "description": { + "name": "quiver", + "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "recase": { + "dependency": "transitive", + "description": { + "name": "recase", + "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shell_executor": { + "dependency": "transitive", + "description": { + "name": "shell_executor", + "sha256": "9c024546fc96470a6b96be9902f0bc05347a017a7638ed8d93c77e8d77eb3c3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "shell_uikit": { + "dependency": "transitive", + "description": { + "name": "shell_uikit", + "sha256": "03703090807091514ace2f9c8dc5d9b2d18c42a248c767220167825fbc3d2747", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "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" + }, + "tuple": { + "dependency": "direct main", + "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" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.3" + }, + "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": "transitive", + "description": { + "name": "uuid", + "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+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" + }, + "version": { + "dependency": "direct main", + "description": { + "name": "version", + "sha256": "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.1" + }, + "window_size": { + "dependency": "direct main", + "description": { + "path": "plugins/window_size", + "ref": "eb3964990cf19629c89ff8cb4a37640c7b3d5601", + "resolved-ref": "eb3964990cf19629c89ff8cb4a37640c7b3d5601", + "url": "https://github.com/google/flutter-desktop-embedding.git" + }, + "source": "git", + "version": "0.1.0" + }, + "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" + }, + "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.22.0" + } +} diff --git a/pkgs/applications/virtualization/xen/4.16/0001-xen-fig-geneneration-4.16.patch b/pkgs/applications/virtualization/xen/4.16/0001-xen-fig-geneneration-4.16.patch deleted file mode 100644 index 1d814b562a17..000000000000 --- a/pkgs/applications/virtualization/xen/4.16/0001-xen-fig-geneneration-4.16.patch +++ /dev/null @@ -1,16 +0,0 @@ -Remove a pipe that was causing SIGPIPE -issues on overloaded Hydra machines. - -diff --git a/docs/figs/Makefile b/docs/figs/Makefile -index e128a4364f..943f745dda 100644 ---- a/docs/figs/Makefile -+++ b/docs/figs/Makefile -@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png - all: $(TARGETS) - - %.png: %.fig -- $(FIG2DEV) -L png $< >$@.tmp -+ $(FIG2DEV) -L png $< $@.tmp - mv -f $@.tmp $@ - - clean: diff --git a/pkgs/applications/virtualization/xen/4.16/default.nix b/pkgs/applications/virtualization/xen/4.16/default.nix index e67b2b052a6e..27139ca06e8e 100644 --- a/pkgs/applications/virtualization/xen/4.16/default.nix +++ b/pkgs/applications/virtualization/xen/4.16/default.nix @@ -7,19 +7,23 @@ }@genericDefinition: let - upstreamPatches = import ../patches.nix { + upstreamPatches = import ../generic/patches.nix { inherit lib; inherit fetchpatch; }; - upstreamPatchList = lib.lists.flatten [ - upstreamPatches.XSA_458 - upstreamPatches.XSA_460 - upstreamPatches.XSA_461 - ]; + upstreamPatchList = lib.lists.flatten ( + with upstreamPatches; + [ + XSA_458 + XSA_460 + XSA_461 + ] + ); in -callPackage (import ../generic.nix { +callPackage (import ../generic/default.nix { + pname = "xen"; branch = "4.16"; version = "4.16.6"; latest = false; @@ -27,10 +31,7 @@ callPackage (import ../generic.nix { xen = { rev = "4b33780de790bd438dd7cbb6143b410d94f0f049"; hash = "sha256-2kcmfKwBo3w1U5CSxLSYSteqvzcJaB+cA7keVb3amyA="; - patches = [ - ./0000-xen-ipxe-src-4.16.patch - ./0001-xen-fig-geneneration-4.16.patch - ] ++ upstreamPatchList; + patches = [ ] ++ upstreamPatchList; }; qemu = { rev = "c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3"; diff --git a/pkgs/applications/virtualization/xen/4.17/0000-xen-ipxe-src-4.17.patch b/pkgs/applications/virtualization/xen/4.17/0000-xen-ipxe-src-4.17.patch deleted file mode 100644 index d96023d1946a..000000000000 --- a/pkgs/applications/virtualization/xen/4.17/0000-xen-ipxe-src-4.17.patch +++ /dev/null @@ -1,27 +0,0 @@ -Hack to make etherboot use pre-fetched iPXE. - -diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile -index ed9e11305f..979a3acea8 100644 ---- a/tools/firmware/etherboot/Makefile -+++ b/tools/firmware/etherboot/Makefile -@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz - - D=ipxe - T=ipxe.tar.gz -+G=ipxe.git - - ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS))) - ROM = $D/src/bin/ipxe.bin -@@ -41,9 +42,9 @@ $T: - fi - mv _$T $T - --$D/src/arch/i386/Makefile: $T Config -- rm -rf $D -- gzip -dc $T | tar xf - -+$D/src/arch/i386/Makefile: $G Config -+ mkdir $D -+ cp -a $G/* $D - for i in $$(cat patches/series) ; do \ - patch -d $D -p1 --quiet $@.tmp -+ $(FIG2DEV) -L png $< $@.tmp - mv -f $@.tmp $@ - - clean: diff --git a/pkgs/applications/virtualization/xen/4.17/default.nix b/pkgs/applications/virtualization/xen/4.17/default.nix index a179ac94d9c2..6887696fcfe9 100644 --- a/pkgs/applications/virtualization/xen/4.17/default.nix +++ b/pkgs/applications/virtualization/xen/4.17/default.nix @@ -7,20 +7,24 @@ }@genericDefinition: let - upstreamPatches = import ../patches.nix { + upstreamPatches = import ../generic/patches.nix { inherit lib; inherit fetchpatch; }; - upstreamPatchList = lib.lists.flatten [ - upstreamPatches.QUBES_REPRODUCIBLE_BUILDS - upstreamPatches.XSA_458 - upstreamPatches.XSA_460 - upstreamPatches.XSA_461 - ]; + upstreamPatchList = lib.lists.flatten ( + with upstreamPatches; + [ + QUBES_REPRODUCIBLE_BUILDS + XSA_458 + XSA_460 + XSA_461 + ] + ); in -callPackage (import ../generic.nix { +callPackage (import ../generic/default.nix { + pname = "xen"; branch = "4.17"; version = "4.17.4"; latest = false; @@ -28,10 +32,7 @@ callPackage (import ../generic.nix { xen = { rev = "d530627aaa9b6e03c7f911434bb342fca3d13300"; hash = "sha256-4ltQUzo4XPzGT/7fGt1hnNMqBQBVF7VP+WXD9ZaJcGo="; - patches = [ - ./0000-xen-ipxe-src-4.17.patch - ./0001-xen-fig-geneneration-4.17.patch - ] ++ upstreamPatchList; + patches = [ ] ++ upstreamPatchList; }; qemu = { rev = "ffb451126550b22b43b62fb8731a0d78e3376c03"; diff --git a/pkgs/applications/virtualization/xen/4.18/0000-xen-ipxe-src-4.18.patch b/pkgs/applications/virtualization/xen/4.18/0000-xen-ipxe-src-4.18.patch deleted file mode 100644 index d96023d1946a..000000000000 --- a/pkgs/applications/virtualization/xen/4.18/0000-xen-ipxe-src-4.18.patch +++ /dev/null @@ -1,27 +0,0 @@ -Hack to make etherboot use pre-fetched iPXE. - -diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile -index ed9e11305f..979a3acea8 100644 ---- a/tools/firmware/etherboot/Makefile -+++ b/tools/firmware/etherboot/Makefile -@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz - - D=ipxe - T=ipxe.tar.gz -+G=ipxe.git - - ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS))) - ROM = $D/src/bin/ipxe.bin -@@ -41,9 +42,9 @@ $T: - fi - mv _$T $T - --$D/src/arch/i386/Makefile: $T Config -- rm -rf $D -- gzip -dc $T | tar xf - -+$D/src/arch/i386/Makefile: $G Config -+ mkdir $D -+ cp -a $G/* $D - for i in $$(cat patches/series) ; do \ - patch -d $D -p1 --quiet $@.tmp -+ $(FIG2DEV) -L png $< $@.tmp - mv -f $@.tmp $@ - - clean: diff --git a/pkgs/applications/virtualization/xen/4.18/default.nix b/pkgs/applications/virtualization/xen/4.18/default.nix index 292d55058e7b..ed2df662e26e 100644 --- a/pkgs/applications/virtualization/xen/4.18/default.nix +++ b/pkgs/applications/virtualization/xen/4.18/default.nix @@ -7,20 +7,24 @@ }@genericDefinition: let - upstreamPatches = import ../patches.nix { + upstreamPatches = import ../generic/patches.nix { inherit lib; inherit fetchpatch; }; - upstreamPatchList = lib.lists.flatten [ - upstreamPatches.QUBES_REPRODUCIBLE_BUILDS - upstreamPatches.XSA_458 - upstreamPatches.XSA_460 - upstreamPatches.XSA_461 - ]; + upstreamPatchList = lib.lists.flatten ( + with upstreamPatches; + [ + QUBES_REPRODUCIBLE_BUILDS + XSA_458 + XSA_460 + XSA_461 + ] + ); in -callPackage (import ../generic.nix { +callPackage (import ../generic/default.nix { + pname = "xen"; branch = "4.18"; version = "4.18.2"; latest = false; @@ -28,10 +32,7 @@ callPackage (import ../generic.nix { xen = { rev = "d152a0424677d8b78e00ed1270a583c5dafff16f"; hash = "sha256-pHCjj+Bcy4xQfB9xHU9fccFwVdP2DXrUhdszwGvrdmY="; - patches = [ - ./0000-xen-ipxe-src-4.18.patch - ./0001-xen-fig-geneneration-4.18.patch - ] ++ upstreamPatchList; + patches = [ ] ++ upstreamPatchList; }; qemu = { rev = "0df9387c8983e1b1e72d8c574356f572342c03e6"; diff --git a/pkgs/applications/virtualization/xen/4.19/0000-xen-ipxe-src-4.19.patch b/pkgs/applications/virtualization/xen/4.19/0000-xen-ipxe-src-4.19.patch deleted file mode 100644 index d96023d1946a..000000000000 --- a/pkgs/applications/virtualization/xen/4.19/0000-xen-ipxe-src-4.19.patch +++ /dev/null @@ -1,27 +0,0 @@ -Hack to make etherboot use pre-fetched iPXE. - -diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile -index ed9e11305f..979a3acea8 100644 ---- a/tools/firmware/etherboot/Makefile -+++ b/tools/firmware/etherboot/Makefile -@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz - - D=ipxe - T=ipxe.tar.gz -+G=ipxe.git - - ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS))) - ROM = $D/src/bin/ipxe.bin -@@ -41,9 +42,9 @@ $T: - fi - mv _$T $T - --$D/src/arch/i386/Makefile: $T Config -- rm -rf $D -- gzip -dc $T | tar xf - -+$D/src/arch/i386/Makefile: $G Config -+ mkdir $D -+ cp -a $G/* $D - for i in $$(cat patches/series) ; do \ - patch -d $D -p1 --quiet $@.tmp -+ $(FIG2DEV) -L png $< $@.tmp - mv -f $@.tmp $@ - - clean: diff --git a/pkgs/applications/virtualization/xen/4.19/default.nix b/pkgs/applications/virtualization/xen/4.19/default.nix index 278c40121433..5b8cf5d21788 100644 --- a/pkgs/applications/virtualization/xen/4.19/default.nix +++ b/pkgs/applications/virtualization/xen/4.19/default.nix @@ -7,19 +7,23 @@ }@genericDefinition: let - upstreamPatches = import ../patches.nix { + upstreamPatches = import ../generic/patches.nix { inherit lib; inherit fetchpatch; }; - upstreamPatchList = lib.lists.flatten [ - upstreamPatches.QUBES_REPRODUCIBLE_BUILDS - upstreamPatches.XSA_460 - upstreamPatches.XSA_461 - ]; + upstreamPatchList = lib.lists.flatten ( + with upstreamPatches; + [ + QUBES_REPRODUCIBLE_BUILDS + XSA_460 + XSA_461 + ] + ); in -callPackage (import ../generic.nix { +callPackage (import ../generic/default.nix { + pname = "xen"; branch = "4.19"; version = "4.19.0"; latest = true; @@ -27,10 +31,7 @@ callPackage (import ../generic.nix { xen = { rev = "026c9fa29716b0ff0f8b7c687908e71ba29cf239"; hash = "sha256-Q6x+2fZ4ITBz6sKICI0NHGx773Rc919cl+wzI89UY+Q="; - patches = [ - ./0000-xen-ipxe-src-4.19.patch - ./0001-xen-fig-geneneration-4.19.patch - ] ++ upstreamPatchList; + patches = [ ] ++ upstreamPatchList; }; qemu = { rev = "0df9387c8983e1b1e72d8c574356f572342c03e6"; diff --git a/pkgs/applications/virtualization/xen/README.md b/pkgs/applications/virtualization/xen/README.md index c059808dcecb..0df84ad8e4c2 100644 --- a/pkgs/applications/virtualization/xen/README.md +++ b/pkgs/applications/virtualization/xen/README.md @@ -88,14 +88,15 @@ open a PR fixing the script, and update Xen manually: ### For Both Update Methods -1. Update `packages.nix` with the new versions. Don't forget the `slim` packages! +1. Update `packages.nix` and `../../../top-level/all-packages.nix` with the new + versions. Don't forget the `slim` packages! 1. Make sure all branches build. (Both the `standard` and `slim` versions) 1. Use the NixOS module to test if dom0 boots successfully on all new versions. 1. Make sure the `meta` attributes evaluate to something that makes sense. The following one-line command is useful for testing this: ```console - xenToEvaluate=xen; echo -e "\033[1m$(nix eval .#"$xenToEvaluate".meta.description 2> /dev/null | tail -c +2 | head -c -2)\033[0m\n\n$(nix eval .#"$xenToEvaluate".meta.longDescription 2> /dev/null | tail -c +2 | head -c -2)" + xenToEvaluate=xen; echo -e "\033[1m$(nix eval .#"$xenToEvaluate".meta.description --raw 2> /dev/null)\033[0m\n\n$(nix eval .#"$xenToEvaluate".meta.longDescription --raw 2> /dev/null)" ``` Change the value of `xenToEvaluate` to evaluate all relevant Xen packages. @@ -118,7 +119,7 @@ are requested by the main Xen build. Building `xen.efi` requires an `ld` with PE support.[^2] We use a `makeFlag` to override the `$LD` environment variable to point to our -patched `efiBinutils`. For more information, see the comment in `./generic.nix`. +patched `efiBinutils`. For more information, see the comment in `./generic/default.nix`. > [!TIP] > If you are certain you will not be running Xen in an x86 EFI environment, disable diff --git a/pkgs/applications/virtualization/xen/4.16/0000-xen-ipxe-src-4.16.patch b/pkgs/applications/virtualization/xen/generic/0000-xen-ipxe-src-generic.patch similarity index 100% rename from pkgs/applications/virtualization/xen/4.16/0000-xen-ipxe-src-4.16.patch rename to pkgs/applications/virtualization/xen/generic/0000-xen-ipxe-src-generic.patch diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic/default.nix similarity index 77% rename from pkgs/applications/virtualization/xen/generic.nix rename to pkgs/applications/virtualization/xen/generic/default.nix index b8672770e5bd..d273f9b1f381 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic/default.nix @@ -58,8 +58,6 @@ versionDefinition: binutils-unwrapped, # Documentation - fig2dev, - imagemagick, pandoc, # Scripts @@ -81,7 +79,7 @@ versionDefinition: let #TODO: fix paths instead. - scriptEnvPath = lib.strings.concatMapStringsSep ":" (x: "${x}/bin") [ + scriptEnvPath = lib.strings.makeSearchPathOutput "out" "bin" [ bridge-utils coreutils diffutils @@ -95,20 +93,30 @@ let nbd openvswitch perl - util-linux + util-linux.bin which ]; + # Inherit attributes from a versionDefinition. + inherit (versionDefinition) pname; inherit (versionDefinition) branch; inherit (versionDefinition) version; inherit (versionDefinition) latest; inherit (versionDefinition) pkg; - pname = "xen"; - # Sources needed to build tools and firmwares. + # Mark versions older than minSupportedVersion as EOL. + minSupportedVersion = "4.16"; + + ## Pre-fetched Source Handling ## + + # Main attribute set for sources needed to build tools and firmwares. + # Each source takes in: + # * A `src` attribute, which contains the actual fetcher, + # * A 'patches` attribute, which is a list of patches that need to be applied in the source. + # * A `path` attribute, which is the destination of the source inside the Xen tree. prefetchedSources = lib.attrsets.optionalAttrs withInternalQEMU { - qemu-xen = { + qemu = { src = fetchgit { url = "https://xenbits.xen.org/git-http/qemu-xen.git"; fetchSubmodules = true; @@ -116,14 +124,11 @@ let inherit (pkg.qemu) hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.qemu) pkg.qemu.patches; - postPatch = '' - substituteInPlace scripts/tracetool.py \ - --replace-fail "/usr/bin/env python" "${python311Packages.python}/bin/python" - ''; + path = "tools/qemu-xen"; }; } // lib.attrsets.optionalAttrs withInternalSeaBIOS { - "firmware/seabios-dir-remote" = { + seaBIOS = { src = fetchgit { url = "https://xenbits.xen.org/git-http/seabios.git"; inherit (pkg.seaBIOS) rev; @@ -132,10 +137,11 @@ let patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.seaBIOS) pkg.seaBIOS.patches; + path = "tools/firmware/seabios-dir-remote"; }; } // lib.attrsets.optionalAttrs withInternalOVMF { - "firmware/ovmf-dir-remote" = { + ovmf = { src = fetchgit { url = "https://xenbits.xen.org/git-http/ovmf.git"; fetchSubmodules = true; @@ -143,15 +149,11 @@ let inherit (pkg.ovmf) hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ovmf) pkg.ovmf.patches; - postPatch = '' - substituteInPlace \ - OvmfPkg/build.sh BaseTools/BinWrappers/PosixLike/{AmlToC,BrotliCompress,build,GenFfs,GenFv,GenFw,GenSec,LzmaCompress,TianoCompress,Trim,VfrCompile} \ - --replace-fail "/usr/bin/env bash" ${stdenv.shell} - ''; + path = "tools/firmware/ovmf-dir-remote"; }; } // lib.attrsets.optionalAttrs withInternalIPXE { - "firmware/etherboot/ipxe.git" = { + ipxe = { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; @@ -159,10 +161,68 @@ let inherit (pkg.ipxe) hash; }; patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ipxe) pkg.ipxe.patches; + path = "tools/firmware/etherboot/ipxe.git"; }; }; - withPrefetchedSources = - sourcePkg: lib.strings.concatLines (lib.attrsets.mapAttrsToList sourcePkg prefetchedSources); + + # Gets a list containing the names of the top-level attribute for each pre-fetched + # source, to be used in the map functions below. + prefetchedSourcesList = lib.attrsets.mapAttrsToList (name: value: name) prefetchedSources; + + # Produces bash commands that will copy each pre-fetched source. + copyPrefetchedSources = + # Finish the deployment by concatnating the list of commands together. + lib.strings.concatLines ( + # Iterate on each pre-fetched source. + builtins.map ( + source: + # Only produce a copy command if patches exist. + lib.strings.optionalString (lib.attrsets.hasAttrByPath [ "${source}" ] prefetchedSources) + # The actual copy command. `src` is always an absolute path to a fetcher output + # inside the /nix/store, and `path` is always a path relative to the Xen root. + # We need to `mkdir -p` the target directory first, and `chmod +w` the contents last, + # as the copied files will still be edited by the postPatchPhase. + '' + echo "Copying ${prefetchedSources.${source}.src} -> ${prefetchedSources.${source}.path}" + mkdir --parents ${prefetchedSources.${source}.path} + cp --recursive --no-target-directory ${prefetchedSources.${source}.src} ${ + prefetchedSources.${source}.path + } + chmod --recursive +w ${prefetchedSources.${source}.path} + '' + ) prefetchedSourcesList + ); + + # Produces strings with `patch` commands to be ran on postPatch. + # These deploy the .patch files for each pre-fetched source. + deployPrefetchedSourcesPatches = + # Finish the deployment by concatnating the list of commands together. + lib.strings.concatLines ( + # The double map functions create a list of lists. Flatten it so we can concatnate it. + lib.lists.flatten ( + # Iterate on each pre-fetched source. + builtins.map ( + source: + # Iterate on each available patch. + (builtins.map ( + patch: + # Only produce a patch command if patches exist. + lib.strings.optionalString + (lib.attrsets.hasAttrByPath [ + "${source}" + "patches" + ] prefetchedSources) + # The actual patch command. It changes directories to the correct source each time. + '' + echo "Applying patch ${patch} to ${source}." + patch --directory ${prefetchedSources.${source}.path} --strip 1 < ${patch} + '' + ) prefetchedSources.${source}.patches) + ) prefetchedSourcesList + ) + ); + + ## XSA Patches Description Builder ## # Sometimes patches are sourced through a path, like ./0000-xen.patch. # This would break the patch attribute parser functions, so we normalise @@ -175,7 +235,7 @@ let if builtins.isPath patch then { type = "path"; } else - throw "xen/generic.nix: normalisedPatchList attempted to normalise something that is not a Path or an Attribute Set." + throw "xen/generic/default.nix: normalisedPatchList attempted to normalise something that is not a Path or an Attribute Set." else patch ) pkg.xen.patches; @@ -241,19 +301,7 @@ let else [ ]; - withTools = - attr: file: - withPrefetchedSources ( - name: source: - lib.strings.optionalString (builtins.hasAttr attr source) '' - echo "processing ${name}" - __do() { - cd "tools/${name}" - ${file name source} - } - ( __do ) - '' - ); + ## Binutils Override ## # Originally, there were two versions of binutils being used: the standard one and # this patched one. Unfortunately, that required patches to the Xen Makefiles, and @@ -264,6 +312,7 @@ let name = "efi-binutils"; configureFlags = oldAttrs.configureFlags ++ [ "--enable-targets=x86_64-pep" ]; doInstallCheck = false; # We get a spurious failure otherwise, due to a host/target mismatch. + meta.mainProgram = "ld"; # We only really care for `ld`. }); in @@ -286,16 +335,17 @@ stdenv.mkDerivation (finalAttrs: { inherit (pkg.xen) hash; }; - # Gets the patches from the pkg.xen.patches attribute from the versioned files. - patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.xen) pkg.xen.patches; + patches = + # Generic Xen patches that apply to all Xen versions. + [ ./0000-xen-ipxe-src-generic.patch ] + # Gets the patches from the pkg.xen.patches attribute from the versioned files. + ++ lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.xen) pkg.xen.patches; nativeBuildInputs = [ autoPatchelfHook bison cmake - fig2dev - imagemagick # Causes build failures in Hydra related to fig generation if not included. flex pandoc pkg-config @@ -325,7 +375,6 @@ stdenv.mkDerivation (finalAttrs: { # oxenstored ocamlPackages.findlib ocamlPackages.ocaml - systemdMinimal # Python Fixes python311Packages.wrapPython @@ -335,10 +384,14 @@ stdenv.mkDerivation (finalAttrs: { pixman ] ++ lib.lists.optional withInternalOVMF nasm - ++ lib.lists.optional withFlask checkpolicy; + ++ lib.lists.optional withFlask checkpolicy + ++ lib.lists.optional (lib.strings.versionOlder version "4.19") systemdMinimal; configureFlags = - [ "--enable-systemd" ] + [ + "--enable-systemd" + "--disable-qemu-traditional" + ] ++ lib.lists.optional (!withInternalQEMU) "--with-system-qemu" ++ lib.lists.optional withSeaBIOS "--with-system-seabios=${seabios}/share/seabios" @@ -348,20 +401,21 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.lists.optional withInternalOVMF "--enable-ovmf" ++ lib.lists.optional withIPXE "--with-system-ipxe=${ipxe}" - ++ lib.lists.optional withInternalIPXE "--enable-ipxe"; + ++ lib.lists.optional withInternalIPXE "--enable-ipxe" + + ++ lib.lists.optional withFlask "--enable-xsmpolicy"; makeFlags = [ "PREFIX=$(out)" "CONFIG_DIR=/etc" - "XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files" "XEN_SCRIPT_DIR=$(CONFIG_DIR)/xen/scripts" "BASH_COMPLETION_DIR=$(PREFIX)/share/bash-completion/completions" ] ++ lib.lists.optionals withEFI [ "EFI_VENDOR=${efiVendor}" "INSTALL_EFI_STRIP=1" - "LD=${efiBinutils}/bin/ld" # See the comment in the efiBinutils definition above. + "LD=${lib.meta.getExe efiBinutils}" # See the comment in the efiBinutils definition above. ] # These flags set the CONFIG_* options in /boot/xen.config # and define if the default policy file is built. However, @@ -442,17 +496,9 @@ stdenv.mkDerivation (finalAttrs: { rm --recursive --force tools/qemu-xen tools/qemu-xen-traditional '' - # The following expression moves the sources we fetched in the - # versioned Nix expressions to their correct locations inside - # the Xen source tree. + # Call copyPrefetchedSources, which copies all aviable sources to their correct positions. + '' - ${withPrefetchedSources ( - name: source: '' - echo "Copying pre-fetched source: ${source.src} -> tools/${name}" - cp --recursive ${source.src} tools/${name} - chmod --recursive +w tools/${name} - '' - )} + ${copyPrefetchedSources} ''; postPatch = @@ -485,31 +531,16 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir" '' - # The following expression applies the patches defined on each - # prefetchedSources attribute. + # # Call deployPrefetchedSourcesPatches, which patches all pre-fetched sources with their specified patchlists. + '' - ${withTools "patches" ( - name: source: '' - ${lib.strings.concatMapStringsSep "\n" (patch: '' - echo "Patching with ${patch}" - patch --strip 1 < ${patch} - '') source.patches} - '' - )} - - ${withTools "postPatch" (name: source: source.postPatch)} - - ${pkg.xen.postPatch or ""} + ${deployPrefetchedSourcesPatches} + '' + # Patch shebangs for QEMU and OVMF build scripts. + + '' + patchShebangs --build tools/qemu-xen/scripts/tracetool.py + patchShebangs --build tools/firmware/ovmf-dir-remote/OvmfPkg/build.sh tools/firmware/ovmf-dir-remote/BaseTools/BinWrappers/PosixLike/{AmlToC,BrotliCompress,build,GenFfs,GenFv,GenFw,GenSec,LzmaCompress,TianoCompress,Trim,VfrCompile} ''; - preBuild = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "preBuild" ] pkg.xen) pkg.xen.preBuild; - - postBuild = '' - ${withTools "buildPhase" (name: source: source.buildPhase)} - - ${pkg.xen.postBuild or ""} - ''; - installPhase = let cpFlags = builtins.toString [ @@ -555,12 +586,6 @@ stdenv.mkDerivation (finalAttrs: { for i in $out/etc/xen/scripts/!(*.sh); do sed --in-place "2s@^@export PATH=$out/bin:${scriptEnvPath}\n@" $i done - '' - - + '' - ${withTools "installPhase" (name: source: source.installPhase)} - - ${pkg.xen.installPhase or ""} ''; postFixup = @@ -632,7 +657,7 @@ stdenv.mkDerivation (finalAttrs: { # Starts with the longDescription from ./packages.nix. (packageDefinition.meta.longDescription or "") + lib.strings.optionalString (!withInternalQEMU) ( - "\nUse with `qemu_xen_${lib.stringAsChars (x: if x == "." then "_" else x) branch}`" + "\nUse with `qemu_xen_${lib.strings.stringAsChars (x: if x == "." then "_" else x) branch}`" + lib.strings.optionalString latest " or `qemu_xen`" + ".\n" ) @@ -679,11 +704,14 @@ stdenv.mkDerivation (finalAttrs: { # Development headers in $dev/include. mit ]; - maintainers = [ lib.maintainers.sigmasquadron ]; + # This automatically removes maintainers from EOL versions of Xen, so we aren't bothered about versions we don't explictly support. + maintainers = lib.lists.optionals (lib.strings.versionAtLeast version minSupportedVersion) ( + with lib.maintainers; [ sigmasquadron ] + ); mainProgram = "xl"; # Evaluates to x86_64-linux. platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64; - knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version "4.16") [ + knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version minSupportedVersion) [ "Xen ${version} is no longer supported by the Xen Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html" ]; }; diff --git a/pkgs/applications/virtualization/xen/patches.nix b/pkgs/applications/virtualization/xen/generic/patches.nix similarity index 100% rename from pkgs/applications/virtualization/xen/patches.nix rename to pkgs/applications/virtualization/xen/generic/patches.nix diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 96bd42e05201..5f0f50ecd736 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -62,7 +62,4 @@ rec { withInternalIPXE = false; inherit (slim) meta; }; - - xen = xen_4_19; - xen-slim = xen_4_19-slim; } diff --git a/pkgs/applications/virtualization/xen/update.sh b/pkgs/applications/virtualization/xen/update.sh index 0b0c7516fa83..6ac8ba5a825c 100755 --- a/pkgs/applications/virtualization/xen/update.sh +++ b/pkgs/applications/virtualization/xen/update.sh @@ -1,10 +1,9 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p gitMinimal curl gnupg nix-prefetch-git nixfmt-rfc-style # shellcheck disable=SC2206,SC2207 shell=bash -set -e - -# Set a temporary $HOME in /tmp for GPG. -HOME=/tmp/xenUpdateScript +set -o errexit +set -o pipefail +set -o nounset # This script expects to be called in an interactive terminal somewhere inside Nixpkgs. echo "Preparing..." @@ -15,8 +14,8 @@ mkdir /tmp/xenUpdateScript # Import and verify PGP key. curl --silent --output /tmp/xenUpdateScript/xen.asc https://keys.openpgp.org/vks/v1/by-fingerprint/23E3222C145F4475FA8060A783FE14C957E82BD9 -gpg --quiet --import /tmp/xenUpdateScript/xen.asc -fingerprint="$(gpg --with-colons --fingerprint "pgp@xen.org" 2>/dev/null | awk -F: '/^pub:.*/ { getline; print $10}')" +gpg --homedir /tmp/xenUpdateScript/.gnupg --quiet --import /tmp/xenUpdateScript/xen.asc +fingerprint="$(gpg --homedir /tmp/xenUpdateScript/.gnupg --with-colons --fingerprint "pgp@xen.org" 2>/dev/null | awk -F: '/^pub:.*/ { getline; print $10}')" echo -e "Please ascertain through multiple external sources that the \e[1;32mXen Project PGP Key Fingerprint\e[0m is indeed \e[1;33m$fingerprint\e[0m. If that is not the case, \e[1;31mexit immediately\e[0m." read -r -p $'Press \e[1;34menter\e[0m to continue with a pre-filled expected fingerprint, or input an arbitrary PGP fingerprint to match with the key\'s fingerprint: ' userInputFingerprint userInputFingerprint=${userInputFingerprint:-"23E3222C145F4475FA8060A783FE14C957E82BD9"} @@ -32,7 +31,7 @@ latestVersion=$(echo "$versionList" | tr ' ' '\n' | tail --lines=1) branchList=($(echo "$versionList" | tr ' ' '\n' | sed s/\.[0-9]*$//g | awk '!seen[$0]++')) # Figure out which versions we're actually going to install. -minSupportedBranch="$(grep " knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version " "$xenPath"/generic.nix | sed s/' knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version "'//g | sed s/'") \['//g)" +minSupportedBranch="$(grep " minSupportedVersion = " "$xenPath"/generic/default.nix | sed s/' minSupportedVersion = "'//g | sed s/'";'//g)" supportedBranches=($(for version in "${branchList[@]}"; do if [ "$(printf '%s\n' "$minSupportedBranch" "$version" | sort -V | head -n1)" = "$minSupportedBranch" ]; then echo "$version"; fi; done)) supportedVersions=($(for version in "${supportedBranches[@]}"; do echo "$versionList" | tr ' ' '\n' | grep "$version" | tail --lines=1; done)) @@ -51,7 +50,7 @@ for version in "${supportedVersions[@]}"; do # Verify PGP key automatically. If the fingerprint matches what the user specified, or the default fingerprint, then we consider it trusted. cd /tmp/xenUpdateScript/xen if [[ "$fingerprint" = "$userInputFingerprint" ]]; then - echo "$fingerprint:6:" | gpg --quiet --import-ownertrust + echo "$fingerprint:6:" | gpg --homedir /tmp/xenUpdateScript/.gnupg --quiet --import-ownertrust (git verify-tag RELEASE-"$version" 2>/dev/null && echo -e "\n\e[1;32mSuccessfully authenticated Xen $version.\e[0m") || (echo -e "\e[1;31merror:\e[0m Unable to verify tag \e[1;32mRELEASE-$version\e[0m.\n- It is possible that \e[1;33mthis script has broken\e[0m, the Xen Project has \e[1;33mcycled their PGP keys\e[0m, or a \e[1;31msupply chain attack is in progress\e[0m.\n\n\e[1;31mPlease update manually.\e[0m" && exit 1) else echo -e "\e[1;31merror:\e[0m Unable to verify \e[1;34mpgp@xen.org\e[0m's fingerprint.\n- It is possible that \e[1;33mthis script has broken\e[0m, the Xen Project has \e[1;33mcycled their PGP keys\e[0m, or an \e[1;31mimpersonation attack is in progress\e[0m.\n\n\e[1;31mPlease update manually.\e[0m" && exit 1 @@ -121,11 +120,10 @@ for version in "${supportedVersions[@]}"; do echo -e "Found the following patches:\n \e[1;32mXen\e[0m: \e[1;33m$discoveredXenPatchesEcho\e[0m\n \e[1;36mQEMU\e[0m: \e[1;33m$discoveredQEMUPatchesEcho\e[0m\n \e[1;36mSeaBIOS\e[0m: \e[1;33m$discoveredSeaBIOSPatchesEcho\e[0m\n \e[1;36mOVMF\e[0m: \e[1;33m$discoveredOVMFPatchesEcho\e[0m\n \e[1;36miPXE\e[0m: \e[1;33m$discoveredIPXEPatchesEcho\e[0m" # Prepare patches that are called in ./patches.nix. - defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_458") + defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_458" "XSA_460" "XSA_461" ) read -r -a defaultPatchList -p $'\nWould you like to override the \e[1;34mupstreamPatches\e[0m list for \e[1;32mXen '"$version"$'\e[0m? If no, press \e[1;34menter\e[0m to use the default patch list: [ \e[1;34m'"${defaultPatchListInit[*]}"$' \e[0m]: ' defaultPatchList=(${defaultPatchList[@]:-${defaultPatchListInit[@]}}) - spaceSeparatedPatchList=${defaultPatchList[*]} - upstreamPatches="upstreamPatches.${spaceSeparatedPatchList// / upstreamPatches.}" + upstreamPatches=${defaultPatchList[*]} # Write and format default.nix file. echo -e "\nWriting updated \e[1;34mversionDefinition\e[0m..." @@ -139,17 +137,18 @@ for version in "${supportedVersions[@]}"; do }@genericDefinition: let - upstreamPatches = import ../patches.nix { + upstreamPatches = import ../generic/patches.nix { inherit lib; inherit fetchpatch; }; - upstreamPatchList = lib.lists.flatten [ + upstreamPatchList = lib.lists.flatten (with upstreamPatches; [ $upstreamPatches - ]; + ]); in -callPackage (import ../generic.nix { +callPackage (import ../generic/default.nix { + pname = "xen"; branch = "$branch"; version = "$version"; latest = $latest; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix index 66d6fcd7506e..ff658d30ce15 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix @@ -1,26 +1,20 @@ { lib, fetchFromGitHub, - fetchpatch, hyprland, mkHyprlandPlugin, + unstableGitUpdater, }: mkHyprlandPlugin hyprland { pluginName = "hyprspace"; - version = "0-unstable-2024-06-17"; + version = "0-unstable-2024-08-21"; 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="; + rev = "743ec37d02bb2b7261f28de16bf404cebfd96105"; + hash = "sha256-w0j/3OeSrpx+S8if1M2ONBsZvJQ1hBQkdTQEiMCHy7o="; }; dontUseCmakeConfigure = true; @@ -34,6 +28,8 @@ mkHyprlandPlugin hyprland { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { }; + meta = { homepage = "https://github.com/KZDKM/Hyprspace"; description = "Workspace overview plugin for Hyprland"; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 6c376fab2d4b..9b2bdc31743f 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "i3status"; - version = "2.14"; + version = "2.15"; src = fetchurl { url = "https://i3wm.org/i3status/i3status-${version}.tar.xz"; - sha256 = "0929chhvyq9hg4scpcz8r9zn3s9jvbg6a86k3wqa77qg85rh4kaw"; + sha256 = "sha256-bGf1LK5PE533ZK0cxzZWK+D5d1B5G8IStT80wG6vIgU="; }; nativeBuildInputs = [ meson ninja perl pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 32ece77e4fb0..4c4f0bb54455 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -32,16 +32,17 @@ , libsecret , evolution-data-server , nixosTests +, gmobile }: stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.39.0"; + version = "0.41.0"; src = fetchurl { # Release tarball which includes subprojects gvc and libcall-ui url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-n1ZegSJAUr1Lbn0+Mx64vHhl4bwSJEdnO1xN/QdEKlw="; + hash = "sha256-HXuD9YC7gqGqAq2YmhXI3WRGsvyBc6PgSW3YSYTOdI4="; }; nativeBuildInputs = [ @@ -67,6 +68,8 @@ stdenv.mkDerivation (finalAttrs: { gcr networkmanager polkit + gmobile + gnome.gnome-bluetooth gnome.gnome-control-center gnome-desktop gnome.gnome-session @@ -87,11 +90,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; mesonFlags = [ - "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" - # https://github.com/NixOS/nixpkgs/issues/36468 - # https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1363 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # Save some time building if tests are disabled "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 3a563f9e1723..d0165fffbac0 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , nixosTests , directoryListingUpdater , meson @@ -17,16 +17,20 @@ , wayland-protocols , json-glib , gsound +, gmobile }: stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.39.0"; + version = "0.41.0"; - src = fetchurl { - # This tarball includes the meson wrapped subproject 'gmobile'. - url = "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-9vN4IqGoRHDJQYohycrrSj4ITJHHaSNgPjpEjRCCvUw="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; + repo = "phosh-mobile-settings"; + rev = "v${version}"; + hash = "sha256-t5qngjQcjPltUGbcZ+CF5FbZtZkV/cD3xUhuApQbKHo="; }; nativeBuildInputs = [ @@ -47,6 +51,7 @@ stdenv.mkDerivation rec { wayland-protocols json-glib gsound + gmobile ]; postPatch = '' diff --git a/pkgs/build-support/compress-drv/default.nix b/pkgs/build-support/compress-drv/default.nix index 0773ab9e0554..beb7412ee648 100644 --- a/pkgs/build-support/compress-drv/default.nix +++ b/pkgs/build-support/compress-drv/default.nix @@ -9,6 +9,12 @@ : List of file extensions to compress. Example: `["txt" "svg" "xml"]`. + `extraFindOperands` (String) + + : Extra command line parameters to pass to the find command. + This can be used to exclude certain files. + For example: `-not -iregex ".*(\/apps\/.*\/l10n\/).*"` + `compressors` ( { ${fileExtension} :: String }) : Map a desired extension (e.g. `gz`) to a compress program. @@ -35,7 +41,7 @@ compressDrv pkgs.spdx-license-list-data.json { formats = ["json"]; compressors = { - "json" = "${zopfli}/bin/zopfli --keep {}"; + gz = "${zopfli}/bin/zopfli --keep {}"; }; } => @@ -47,7 +53,11 @@ ::: */ drv: -{ formats, compressors }: +{ + formats, + compressors, + extraFindOperands ? "", +}: let validProg = ext: prog: @@ -61,18 +71,22 @@ let ext: prog: assert validProg ext prog; '' - find -L $out -type f -regextype posix-extended -iregex '.*\.(${formatsPipe})' -print0 \ + find -L $out -type f -regextype posix-extended -iregex '.*\.(${formatsPipe})' ${extraFindOperands} -print0 \ | xargs -0 -P$NIX_BUILD_CORES -I{} ${prog} ''; - formatsPipe = builtins.concatStringsSep "|" formats; + formatsPipe = lib.concatStringsSep "|" formats; in -runCommand "${drv.name}-compressed" { } '' - mkdir $out +runCommand "${drv.name}-compressed" + ( + (lib.optionalAttrs (drv ? pname) { inherit (drv) pname; }) + // (lib.optionalAttrs (drv ? version) { inherit (drv) version; }) + ) + '' + mkdir $out - # cannot use lndir here, because it also symlinks directories, - # which we do not need; we only need to symlink files. - (cd ${drv}; find -L -type d -exec mkdir -p $out/{} ';') - (cd ${drv}; find -L -type f -exec ln -s ${drv}/{} $out/{} ';') + # cannot use lndir here, because it stop recursing at symlinks that point to directories + (cd ${drv}; find -L -type d -exec mkdir -p $out/{} ';') + (cd ${drv}; find -L -type f -exec ln -s ${drv}/{} $out/{} ';') - ${lib.concatStringsSep "\n\n" (lib.mapAttrsToList mkCmd compressors)} -'' + ${lib.concatStringsSep "\n\n" (lib.mapAttrsToList mkCmd compressors)} + '' diff --git a/pkgs/build-support/compress-drv/web.nix b/pkgs/build-support/compress-drv/web.nix index 86ed99e26fa7..17deb1c0e3bd 100644 --- a/pkgs/build-support/compress-drv/web.nix +++ b/pkgs/build-support/compress-drv/web.nix @@ -1,7 +1,9 @@ { - zopfli, brotli, compressDrv, + lib, + zopfli, + zstd, }: /** compressDrvWeb compresses a derivation for common web server use. @@ -17,6 +19,10 @@ Defaults to common formats that compress well. + `extraFindOperands` (String) + + : See compressDrv for details. + `extraFormats` ([ String ]) : Extra extensions to compress in addition to `formats`. @@ -108,24 +114,32 @@ drv: { formats ? [ "css" + "eot" + "htm" + "html" "js" + "json" + "map" + "otf" "svg" "ttf" - "eot" "txt" - "xml" - "map" - "html" - "json" "webmanifest" + "xml" ], extraFormats ? [ ], compressors ? { - "gz" = "${zopfli}/bin/zopfli --keep {}"; - "br" = "${brotli}/bin/brotli --keep --no-copy-stat {}"; + br = "${lib.getExe brotli} --keep --no-copy-stat {}"; + gz = "${lib.getExe zopfli} --keep {}"; + # --force is required to not fail on symlinks + # for details on the compression level see + # https://github.com/NixOS/nixpkgs/pull/332752#issuecomment-2275110390 + zstd = "${lib.getExe zstd} --force --keep --quiet -19 {}"; }, + extraFindOperands ? "", }: compressDrv drv { formats = formats ++ extraFormats; compressors = compressors; + inherit extraFindOperands; } diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix index f8012cca6ea9..1cb7096c1cf2 100644 --- a/pkgs/build-support/make-startupitem/default.nix +++ b/pkgs/build-support/make-startupitem/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { target=${name}.desktop cp ${package}/share/applications/${srcPrefix}${name}.desktop $target ${lib.optionalString (prependExtraArgs != [] || appendExtraArgs != []) '' - sed -i -r "s/(Exec=)([^ ]*) (.*)/\1\2 ${prependArgs}\3${appendArgs}/" $target + sed -i -r "s/(Exec=)([^ \n]*) *(.*)/\1\2 ${prependArgs}\3${appendArgs}/" $target ''} chmod +rw $target echo "X-KDE-autostart-phase=${phase}" >> $target diff --git a/pkgs/build-support/php/builders/default.nix b/pkgs/build-support/php/builders/default.nix index ea9bb3350435..d8d60ad6da1e 100644 --- a/pkgs/build-support/php/builders/default.nix +++ b/pkgs/build-support/php/builders/default.nix @@ -6,4 +6,10 @@ mkComposerRepository = callPackage ./v1/build-composer-repository.nix { }; composerHooks = callPackages ./v1/hooks { }; }; + + v2 = { + buildComposerProject = callPackage ./v2/build-composer-project.nix { }; + mkComposerVendor = callPackage ./v2/build-composer-vendor.nix { }; + composerHooks = callPackages ./v2/hooks { }; + }; } diff --git a/pkgs/build-support/php/builders/v2/build-composer-project.nix b/pkgs/build-support/php/builders/v2/build-composer-project.nix new file mode 100644 index 000000000000..6013225e7c59 --- /dev/null +++ b/pkgs/build-support/php/builders/v2/build-composer-project.nix @@ -0,0 +1,108 @@ +{ + nix-update-script, + stdenvNoCC, + lib, + php, +}: + +let + buildComposerProjectOverride = + finalAttrs: previousAttrs: + + let + phpDrv = finalAttrs.php or php; + composer = finalAttrs.composer or phpDrv.packages.composer; + in + { + composerLock = previousAttrs.composerLock or null; + composerNoDev = previousAttrs.composerNoDev or true; + composerNoPlugins = previousAttrs.composerNoPlugins or true; + composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; + + nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ + composer + phpDrv + phpDrv.composerHooks2.composerInstallHook + ]; + + buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ phpDrv ]; + + patches = previousAttrs.patches or [ ]; + strictDeps = previousAttrs.strictDeps or true; + + # Should we keep these empty phases? + configurePhase = + previousAttrs.configurePhase or '' + runHook preConfigure + + runHook postConfigure + ''; + + buildPhase = + previousAttrs.buildPhase or '' + runHook preBuild + + runHook postBuild + ''; + + doCheck = previousAttrs.doCheck or true; + checkPhase = + previousAttrs.checkPhase or '' + runHook preCheck + + runHook postCheck + ''; + + installPhase = + previousAttrs.installPhase or '' + runHook preInstall + + runHook postInstall + ''; + + doInstallCheck = previousAttrs.doInstallCheck or false; + installCheckPhase = + previousAttrs.installCheckPhase or '' + runHook preInstallCheck + + runHook postInstallCheck + ''; + + composerVendor = + previousAttrs.composerVendor or (phpDrv.mkComposerVendor { + inherit composer; + inherit (finalAttrs) + patches + pname + src + vendorHash + version + ; + + composerLock = previousAttrs.composerLock or null; + composerNoDev = previousAttrs.composerNoDev or true; + composerNoPlugins = previousAttrs.composerNoPlugins or true; + composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; + }); + + # Projects providing a lockfile from upstream can be automatically updated. + passthru = previousAttrs.passthru or { } // { + updateScript = + previousAttrs.passthru.updateScript + or (if finalAttrs.composerVendor.composerLock == null then nix-update-script { } else null); + }; + + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_DISABLE_NETWORK = "1"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + }; + + meta = previousAttrs.meta or { } // { + platforms = lib.platforms.all; + }; + }; +in +args: (stdenvNoCC.mkDerivation args).overrideAttrs buildComposerProjectOverride diff --git a/pkgs/build-support/php/builders/v2/build-composer-vendor.nix b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix new file mode 100644 index 000000000000..b68e16e6cc1a --- /dev/null +++ b/pkgs/build-support/php/builders/v2/build-composer-vendor.nix @@ -0,0 +1,103 @@ +{ + stdenvNoCC, + lib, + php, +}: + +let + mkComposerVendorOverride = + /* + We cannot destruct finalAttrs since the attrset below is used to construct it + and Nix currently does not support lazy attribute names. + { + php ? null, + composer ? null, + composerLock ? "composer.lock", + src, + vendorHash, + ... + }@finalAttrs: + */ + finalAttrs: previousAttrs: + + let + phpDrv = finalAttrs.php or php; + composer = finalAttrs.composer or phpDrv.packages.composer; + in + assert (lib.assertMsg (previousAttrs ? src) "mkComposerVendor expects src argument."); + assert (lib.assertMsg (previousAttrs ? vendorHash) "mkComposerVendor expects vendorHash argument."); + assert (lib.assertMsg (previousAttrs ? version) "mkComposerVendor expects version argument."); + assert (lib.assertMsg (previousAttrs ? pname) "mkComposerVendor expects pname argument."); + { + composerNoDev = previousAttrs.composerNoDev or true; + composerNoPlugins = previousAttrs.composerNoPlugins or true; + composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; + + name = "${previousAttrs.pname}-${previousAttrs.version}-composer-repository"; + + # See https://github.com/NixOS/nix/issues/6660 + dontPatchShebangs = previousAttrs.dontPatchShebangs or true; + + nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ + composer + phpDrv + phpDrv.composerHooks2.composerVendorHook + ]; + + buildInputs = previousAttrs.buildInputs or [ ]; + + strictDeps = previousAttrs.strictDeps or true; + + # Should we keep these empty phases? + configurePhase = + previousAttrs.configurePhase or '' + runHook preConfigure + + runHook postConfigure + ''; + + buildPhase = + previousAttrs.buildPhase or '' + runHook preBuild + + runHook postBuild + ''; + + doCheck = previousAttrs.doCheck or true; + checkPhase = + previousAttrs.checkPhase or '' + runHook preCheck + + runHook postCheck + ''; + + installPhase = + previousAttrs.installPhase or '' + runHook preInstall + + runHook postInstall + ''; + + doInstallCheck = previousAttrs.doInstallCheck or false; + installCheckPhase = + previousAttrs.installCheckPhase or '' + runHook preInstallCheck + + runHook postInstallCheck + ''; + + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + COMPOSER_HTACCESS_PROTECT = "0"; + COMPOSER_DISABLE_NETWORK = "0"; + }; + + outputHashMode = "recursive"; + outputHashAlgo = + if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256"; + outputHash = finalAttrs.vendorHash or ""; + }; +in +args: (stdenvNoCC.mkDerivation args).overrideAttrs mkComposerVendorOverride diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh new file mode 100644 index 000000000000..7cc176058b50 --- /dev/null +++ b/pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh @@ -0,0 +1,91 @@ +declare composerVendor +declare version +declare composerNoDev +declare composerNoPlugins +declare composerNoScripts + +preConfigureHooks+=(composerInstallConfigureHook) +preBuildHooks+=(composerInstallBuildHook) +preCheckHooks+=(composerInstallCheckHook) +preInstallHooks+=(composerInstallInstallHook) + +source @phpScriptUtils@ + +composerInstallConfigureHook() { + echo "Executing composerInstallConfigureHook" + + setComposeRootVersion + + if [[ ! -e "${composerVendor}" ]]; then + echo "No local composer vendor found." + exit 1 + fi + + install -Dm644 ${composerVendor}/composer.{json,lock} . + + if [[ ! -f "composer.lock" ]]; then + composer \ + --no-install \ + --no-interaction \ + --no-progress \ + --optimize-autoloader \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ + update + + install -Dm644 composer.lock -t $out/ + + echo + echo -e "\e[31mERROR: No composer.lock found\e[0m" + echo + echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m' + echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m" + echo + echo -e '\e[31mTo fix the issue:\e[0m' + echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m" + echo -e "\e[31m cp $out/composer.lock \e[0m" + echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m' + echo -e '\e[31m composerLock = ./composer.lock;\e[0m' + echo + + exit 1 + fi + + chmod +w composer.{json,lock} + + echo "Finished composerInstallConfigureHook" +} + +composerInstallBuildHook() { + echo "Executing composerInstallBuildHook" + + echo "Finished composerInstallBuildHook" +} + +composerInstallCheckHook() { + echo "Executing composerInstallCheckHook" + + checkComposerValidate + + echo "Finished composerInstallCheckHook" +} + +composerInstallInstallHook() { + echo "Executing composerInstallInstallHook" + + cp -ar ${composerVendor}/* . + + # Copy the relevant files only in the store. + mkdir -p "$out"/share/php/"${pname}" + cp -r . "$out"/share/php/"${pname}"/ + + # Create symlinks for the binaries. + jq -r -c 'try (.bin[] | select(test(".bat$")? | not) )' composer.json | while read -r bin; do + echo -e "\e[32mCreating symlink ${bin}...\e[0m" + mkdir -p "$out"/bin + ln -s "$out"/share/php/"${pname}"/"$bin" "$out"/bin/"$(basename "$bin")" + done + + echo "Finished composerInstallInstallHook" +} diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh new file mode 100644 index 000000000000..7a14e544ae0d --- /dev/null +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -0,0 +1,91 @@ +declare composerLock +declare version +declare composerNoDev +declare composerNoPlugins +declare composerNoScripts +declare composerStrictValidation + +preConfigureHooks+=(composerVendorConfigureHook) +preBuildHooks+=(composerVendorBuildHook) +preCheckHooks+=(composerVendorCheckHook) +preInstallHooks+=(composerVendorInstallHook) + +source @phpScriptUtils@ + +composerVendorConfigureHook() { + echo "Executing composerVendorConfigureHook" + + setComposeRootVersion + + if [[ -e "$composerLock" ]]; then + echo -e "\e[32mUsing user provided \`composer.lock\` file from \`$composerLock\`\e[0m" + install -Dm644 $composerLock ./composer.lock + fi + + if [[ ! -f "composer.lock" ]]; then + composer \ + --no-install \ + --no-interaction \ + --no-progress \ + --optimize-autoloader \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ + update + + install -Dm644 composer.lock -t $out/ + + echo + echo -e "\e[31mERROR: No composer.lock found\e[0m" + echo + echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m' + echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m" + echo + echo -e '\e[31mTo fix the issue:\e[0m' + echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m" + echo -e "\e[31m cp $out/composer.lock \e[0m" + echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m' + echo -e '\e[31m composerLock = ./composer.lock;\e[0m' + echo + + exit 1 + fi + + chmod +w composer.{json,lock} + + echo "Finished composerVendorConfigureHook" +} + +composerVendorBuildHook() { + echo "Executing composerVendorBuildHook" + + composer \ + --apcu-autoloader \ + --apcu-autoloader-prefix="$(jq -r -c 'try ."content-hash"' < composer.lock)" \ + --no-interaction \ + --no-progress \ + --optimize-autoloader \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ + install + + echo "Finished composerVendorBuildHook" +} + +composerVendorCheckHook() { + echo "Executing composerVendorCheckHook" + + checkComposerValidate + + echo "Finished composerVendorCheckHook" +} + +composerVendorInstallHook() { + echo "Executing composerVendorInstallHook" + + mkdir -p $out + cp -ar composer.{json,lock} $(composer config vendor-dir) $out/ + + echo "Finished composerVendorInstallHook" +} diff --git a/pkgs/build-support/php/builders/v2/hooks/default.nix b/pkgs/build-support/php/builders/v2/hooks/default.nix new file mode 100644 index 000000000000..e4d6dcd8ffc7 --- /dev/null +++ b/pkgs/build-support/php/builders/v2/hooks/default.nix @@ -0,0 +1,45 @@ +{ + lib, + makeSetupHook, + jq, + writeShellApplication, + moreutils, + cacert, + buildPackages, +}: + +let + php-script-utils = writeShellApplication { + name = "php-script-utils"; + runtimeInputs = [ jq ]; + text = builtins.readFile ./php-script-utils.bash; + }; +in +{ + composerVendorHook = makeSetupHook { + name = "composer-vendor-hook.sh"; + propagatedBuildInputs = [ + jq + moreutils + cacert + ]; + substitutions = { + phpScriptUtils = lib.getExe php-script-utils; + }; + } ./composer-vendor-hook.sh; + + composerInstallHook = makeSetupHook { + name = "composer-install-hook.sh"; + propagatedBuildInputs = [ + jq + moreutils + cacert + ]; + substitutions = { + # Specify the stdenv's `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong `diff`. + cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; + phpScriptUtils = lib.getExe php-script-utils; + }; + } ./composer-install-hook.sh; +} diff --git a/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash new file mode 100644 index 000000000000..3e8299bf15d3 --- /dev/null +++ b/pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash @@ -0,0 +1,86 @@ +declare version +declare composerStrictValidation +declare composerGlobal + +setComposeRootVersion() { + set +e # Disable exit on error + + if [[ -v version ]]; then + echo -e "\e[32mSetting COMPOSER_ROOT_VERSION to $version\e[0m" + export COMPOSER_ROOT_VERSION=$version + fi + + set -e +} + +checkComposerValidate() { + if [ "1" == "${composerGlobal-}" ]; then + global="global"; + else + global=""; + fi + + command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock" + if ! $command; then + if [ "1" == "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.json is valid.\e[0m' + echo + echo -e '\e[31mTo address the issue efficiently, follow one of these steps:\e[0m' + echo -e '\e[31m 1. File an issue in the project'\''s issue tracker with detailed information, and apply any available remote patches as a temporary solution '\('with fetchpatch'\)'.\e[0m' + echo -e '\e[31m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.json is valid.\e[0m' + echo + echo -e '\e[33mTo address the issue efficiently, follow one of these steps:\e[0m' + echo -e '\e[33m 1. File an issue in the project'\''s issue tracker with detailed information, and apply any available remote patches as a temporary solution with '\('with fetchpatch'\)'.\e[0m' + echo -e '\e[33m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi + + command="composer ${global} validate --strict --no-ansi --no-interaction --quiet --no-check-all --check-lock" + if ! $command; then + if [ "1" == "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + echo -e '\e[31mThis often indicates an issue with the upstream project, which can typically be resolved by reporting the issue to the relevant project maintainers.\e[0m' + echo + echo -e '\e[31mTo address the issue efficiently, follow one of these steps:\e[0m' + echo -e '\e[31m 1. File an issue in the project'\''s issue tracker with detailed information '\('run '\''composer update --lock --no-install'\'' to fix the issue'\)', and apply any available remote patches as a temporary solution with '\('with fetchpatch'\)'.\e[0m' + echo -e '\e[31m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + echo -e '\e[33mThis often indicates an issue with the upstream project, which can typically be resolved by reporting the issue to the relevant project maintainers.\e[0m' + echo + echo -e '\e[33mTo address the issue efficiently, follow one of these steps:\e[0m' + echo -e '\e[33m 1. File an issue in the project'\''s issue tracker with detailed information '\('run '\''composer update --lock --no-install'\'' to fix the issue'\)', and apply any available remote patches as a temporary solution with '\('with fetchpatch'\)'.\e[0m' + echo -e '\e[33m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi +} diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 1aebfe60a8d2..126be2ad99eb 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -43,6 +43,7 @@ , udev , webkitgtk_4_1 , zlib +, buildPackages , ... }: @@ -357,4 +358,15 @@ in buildInputs = [ atk ]; }; + # Assumes it can run Command::new(env::var("CARGO")).arg("locate-project") + # https://github.com/bkchr/proc-macro-crate/blame/master/src/lib.rs#L244 + proc-macro-crate = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "2.0") { + prePatch = (attrs.prePatch or "") + '' + substituteInPlace \ + src/lib.rs \ + --replace-fail \ + 'env::var("CARGO").map_err(|_| Error::CargoEnvVariableNotSet)?' \ + '"${lib.getBin buildPackages.cargo}/bin/cargo"' + ''; + }; } diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 686819725d59..3bccc871a7dc 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -36,17 +36,8 @@ rec { # `runCommandCCLocal` left out on purpose. # We shouldn’t force the user to have a cc in scope. - # TODO: Move documentation for runCommandWith to the Nixpkgs manual - /* - Generalized version of the `runCommand`-variants - which does customized behavior via a single - attribute set passed as the first argument - instead of having a lot of variants like - `runCommand*`. Additionally it allows changing - the used `stdenv` freely and has a more explicit - approach to changing the arguments passed to - `stdenv.mkDerivation`. - */ + # Docs in doc/build-helpers/trivial-build-helpers.chapter.md + # See https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-runCommandWith runCommandWith = let # prevent infinite recursion for the default stdenv value diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 86175d2e636c..9cdf9616f0e5 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -717,6 +717,7 @@ rec { { libraries ? [ ], flakeIgnore ? [ ], + doCheck ? true, ... }@args: let @@ -728,6 +729,7 @@ rec { (builtins.removeAttrs args [ "libraries" "flakeIgnore" + "doCheck" ]) // { interpreter = @@ -735,7 +737,7 @@ rec { if libraries == [ ] then python.interpreter else (python.withPackages (ps: libraries)).interpreter else python.interpreter; - check = optionalString python.isPy3k ( + check = optionalString (python.isPy3k && doCheck) ( writeDash "pythoncheck.sh" '' exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1" '' diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index c28477659b49..e10414204a2d 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -1,13 +1,14 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , telegram-desktop , nix-update-script }: telegram-desktop.overrideAttrs (old: rec { pname = "64gram"; - version = "1.1.31"; + version = "1.1.34"; src = fetchFromGitHub { owner = "TDesktop-x64"; @@ -15,9 +16,21 @@ telegram-desktop.overrideAttrs (old: rec { rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-xYCousLXV9TeQjDNiXkEMbTiiuusLc7Ib2xHkMYBD1M="; + hash = "sha256-DbHbhkInZi8B/0fvbCWutN4noEv7MZ+C5Eg7g+89Moo="; }; + patches = (old.patches or []) ++ [ + (fetchpatch { + url = "https://github.com/TDesktop-x64/tdesktop/commit/c996ccc1561aed089c8b596f6ab3844335bbf1df.patch"; + revert = true; + hash = "sha256-Hz7BXl5z4owe31l9Je3QOXT8FAyKcbsXsKjGfCmXhzE="; + }) + ]; + + cmakeFlags = (old.cmakeFlags or []) ++ [ + (lib.cmakeBool "disable_autoupdate" true) + ]; + passthru.updateScript = nix-update-script {}; meta = with lib; { diff --git a/pkgs/by-name/ad/adif-multitool/package.nix b/pkgs/by-name/ad/adif-multitool/package.nix index 4bce50660d57..8dc0f816513b 100644 --- a/pkgs/by-name/ad/adif-multitool/package.nix +++ b/pkgs/by-name/ad/adif-multitool/package.nix @@ -4,15 +4,15 @@ }: buildGoModule rec { pname = "adif-multitool"; - version = "0.1.12-rc1"; + version = "0.1.15"; - vendorHash = "sha256-h7Gr8qRz6K0xCvR8tGWTeEkwgMQOTZnbEEsda4aJpbc="; + vendorHash = "sha256-oyFL021J/cU+N+mQ6kW3vju39P/uGM6U58uqE9sxIOE="; src = fetchFromGitHub { owner = "flwyd"; repo = "adif-multitool"; rev = "v${version}"; - hash = "sha256-R0Hu/yWiLUpH9qkVQuJw4bRvDeISjg67rZJLeUBPBbM="; + hash = "sha256-zfJTEmjTomd2T/TkdNYZgIJBwx0PaByEkN/E2kgKHes="; }; meta = with lib; { diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index ac39b2f70359..1ea493890bf9 100644 --- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz"; hash = "sha256-S8tTm9ddZNo4XW+gjLqp3erOtqyOgrhbpsQRF79bpk4="; }; diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix index 087d1a056c0a..c36578975241 100644 --- a/pkgs/by-name/ai/aider-chat/package.nix +++ b/pkgs/by-name/ai/aider-chat/package.nix @@ -12,7 +12,7 @@ let self = python3; packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; }; - version = "0.50.0"; + version = "0.51.0"; in python3.pkgs.buildPythonApplication { pname = "aider-chat"; @@ -22,8 +22,8 @@ python3.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "paul-gauthier"; repo = "aider"; - rev = "v${version}"; - hash = "sha256-hRUxzljtgLGEDwHf6UtQzGQM8CgiRtgNLlVoKa2jU3o="; + rev = "refs/tags/v${version}"; + hash = "sha256-vomRXWL3++1R8jpjMKbsGrB+B1FWQxVbLKxuPttnspw="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix index 79a228259960..8a02d0c2fef7 100644 --- a/pkgs/by-name/al/alephone/package.nix +++ b/pkgs/by-name/al/alephone/package.nix @@ -38,26 +38,17 @@ stdenv.mkDerivation (finalAttrs: { "icons" ]; pname = "alephone"; - version = "1.8.1"; + version = "1.10"; src = fetchurl { url = let - date = "20240513"; + date = "20240822"; in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2"; - sha256 = "sha256-IUvMfG4jtN/QXq4DQIDuI0+Bl3MSSwDGKOyjfcRWgvE="; + hash = "sha256-Es2Uo0RIJHYeO/60XiHVLJe9Eoan8DREtAI2KGjuLaM="; }; - patches = [ - # Fix build with miniupnpc 2.2.8 - # https://github.com/Aleph-One-Marathon/alephone/pull/503 - (fetchpatch2 { - url = "https://github.com/Aleph-One-Marathon/alephone/commit/e25c4bc1ac02619e811b8f19bf4c2f617550e124.patch?full_index=1"; - hash = "sha256-BFLLSTjNl/+/kVb+t6EyW1jhAlKN/G+Q99TICV9VHOY="; - }) - ]; - nativeBuildInputs = [ pkg-config icoutils diff --git a/pkgs/by-name/al/alp/package.nix b/pkgs/by-name/al/alp/package.nix index 39f6040f9d98..1f79cd296bf9 100644 --- a/pkgs/by-name/al/alp/package.nix +++ b/pkgs/by-name/al/alp/package.nix @@ -33,7 +33,7 @@ buildGoModule rec { buildPhase = '' runHook preBuild - go build -o $GOPATH/bin/${pname} main.go + go build -o $GOPATH/bin/alp main.go runHook postBuild ''; diff --git a/pkgs/by-name/al/alsa-oss/package.nix b/pkgs/by-name/al/alsa-oss/package.nix index 71c53580c286..5010c1a3dac6 100644 --- a/pkgs/by-name/al/alsa-oss/package.nix +++ b/pkgs/by-name/al/alsa-oss/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.8"; src = fetchurl { - url = "mirror://alsa/oss-lib/${pname}-${version}.tar.bz2"; + url = "mirror://alsa/oss-lib/alsa-oss-${version}.tar.bz2"; sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4"; }; diff --git a/pkgs/by-name/al/alsa-plugins/package.nix b/pkgs/by-name/al/alsa-plugins/package.nix index bba1944f109e..2d123e460a06 100644 --- a/pkgs/by-name/al/alsa-plugins/package.nix +++ b/pkgs/by-name/al/alsa-plugins/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.12"; src = fetchurl { - url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; + url = "mirror://alsa/plugins/alsa-plugins-${version}.tar.bz2"; hash = "sha256-e9ioPTBOji2GoliV2Nyw7wJFqN8y4nGVnNvcavObZvI="; }; diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index b2e2889ee21e..6224bafc6c54 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.11"; src = fetchurl { - url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; + url = "mirror://alsa/lib/alsa-ucm-conf-${version}.tar.bz2"; hash = "sha256-OHwBzzDioWdte49ysmgc8hmrynDdHsKp4zrdW/P+roE="; }; diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix index 401c66beb703..cadf42149fbc 100644 --- a/pkgs/by-name/al/alsa-utils/package.nix +++ b/pkgs/by-name/al/alsa-utils/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { version = "1.2.10"; src = fetchurl { - url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; + url = "mirror://alsa/utils/alsa-utils-${version}.tar.bz2"; sha256 = "sha256-EEti7H8Cp84WynefSBVhbfHMIZM1A3g6kQe1lE+DBjo="; }; patches = [ diff --git a/pkgs/by-name/am/amd-ucodegen/package.nix b/pkgs/by-name/am/amd-ucodegen/package.nix new file mode 100644 index 000000000000..de3de6efefbe --- /dev/null +++ b/pkgs/by-name/am/amd-ucodegen/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + nix-update-script, + callPackage, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "amd-ucodegen"; + version = "0-unstable-2017-06-07"; + + src = fetchFromGitHub { + owner = "AndyLavr"; + repo = "amd-ucodegen"; + rev = "0d34b54e396ef300d0364817e763d2c7d1ffff02"; + hash = "sha256-pgmxzd8tLqdQ8Kmmhl05C5tMlCByosSrwx2QpBu3UB0="; + }; + + strictDeps = true; + + patches = [ + # Extract get_family function and validate processor family + # instead of processor ID + (fetchpatch { + name = "validate-family-not-id.patch"; + url = "https://github.com/AndyLavr/amd-ucodegen/compare/0d34b54e396ef300d0364817e763d2c7d1ffff02...dobo90:amd-ucodegen:7a3c51e821df96910ecb05b22f3e4866b4fb85b2.patch"; + hash = "sha256-jvsvu9QgXikwsxjPiTaRff+cOg/YQmKg1MYKyBoMRQI="; + }) + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 amd-ucodegen $out/bin/amd-ucodegen + + runHook postInstall + ''; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + tests.platomav = callPackage ./test-platomav.nix { amd-ucodegen = finalAttrs.finalPackage; }; + }; + + meta = { + description = "Tool to generate AMD microcode files"; + longDescription = '' + This tool can be used to generate AMD microcode containers as used by the + Linux kernel. It accepts raw AMD microcode files such as those generated + by [MCExtractor](https://github.com/platomav/MCExtractor.git) as input. + The generated output file can be installed in /lib/firmware/amd-ucode. + ''; + homepage = "https://github.com/AndyLavr/amd-ucodegen"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; + mainProgram = "amd-ucodegen"; + maintainers = with lib.maintainers; [ d-brasher ]; + }; +}) diff --git a/pkgs/by-name/am/amd-ucodegen/test-platomav.nix b/pkgs/by-name/am/amd-ucodegen/test-platomav.nix new file mode 100644 index 000000000000..d8e227bd2c0e --- /dev/null +++ b/pkgs/by-name/am/amd-ucodegen/test-platomav.nix @@ -0,0 +1,40 @@ +{ + stdenvNoCC, + fetchFromGitHub, + amd-ucodegen, +}: + +stdenvNoCC.mkDerivation { + name = "amd-ucodegen-test-platomav"; + meta.timeout = 60; + + # Repository of dumped CPU microcodes + src = fetchFromGitHub { + owner = "platomav"; + repo = "CPUMicrocodes"; + rev = "dfc37d654cbe294acb0ec0274763321507dd7838"; + hash = "sha256-Va+ErKID5iyKEee61tlrZwSpujxwMYPC+MAgZKUkrrM="; + }; + + nativeBuildInputs = [ amd-ucodegen ]; + buildPhase = '' + runHook preBuild + + echo -n "Test normal behavior with single input... " + [ "$(amd-ucodegen AMD/cpu00B40F40_ver0B40401A_2024-06-14_544DFCB8.bin)" \ + == "CPU type 0xb40f40 [0xb440], file AMD/cpu00B40F40_ver0B40401A_2024-06-14_544DFCB8.bin" ] + echo "OK" + echo -n "Check output hash... " + [ "$(sha256sum microcode_amd_fam1ah.bin)" \ + == "17f25ec78fa677803684e77ce01a21344b4b33463a964f61bae51b173543b190 microcode_amd_fam1ah.bin" ] + echo "OK" + echo -n "Ensure fail when bad processor ID... " + [ "$(amd-ucodegen AMD/cpu00000F00_ver02000008_2007-06-14_C3A923BB.bin 2>&1)" \ + == "Bad processor ID 0x0n" ] + echo "OK" + + touch $out + + runHook postBuild + ''; +} diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/by-name/am/amdvlk/package.nix similarity index 50% rename from pkgs/development/libraries/amdvlk/default.nix rename to pkgs/by-name/am/amdvlk/package.nix index 5c58b837b305..2b67caeb7fd2 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/by-name/am/amdvlk/package.nix @@ -1,78 +1,89 @@ -{ stdenv -, callPackage -, lib -, fetchRepoProject -, writeScript -, cmake -, directx-shader-compiler -, glslang -, ninja -, patchelf -, perl -, pkg-config -, python3 -, expat -, libdrm -, ncurses -, openssl -, wayland -, xorg -, zlib +{ + stdenv, + callPackage, + lib, + fetchRepoProject, + writeScript, + cmake, + directx-shader-compiler, + glslang, + ninja, + patchelf, + perl, + pkg-config, + python3, + expat, + libdrm, + ncurses, + openssl, + wayland, + xorg, + zlib, }: let suffix = if stdenv.system == "x86_64-linux" then "64" else "32"; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation (finalAttrs: { pname = "amdvlk"; version = "2024.Q3.1"; src = fetchRepoProject { - name = "${pname}-src"; + name = "amdvlk-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; - rev = "refs/tags/v-${version}"; + rev = "refs/tags/v-${finalAttrs.version}"; sha256 = "IZYv9ZfpIllYUhJ3f7AOFmSl7OfWWY8doaG8pe3GE+4="; }; - buildInputs = [ - expat - libdrm - ncurses - openssl - wayland - xorg.libX11 - xorg.libxcb - xorg.xcbproto - xorg.libXext - xorg.libXrandr - xorg.libXft - xorg.libxshmfence - zlib - ]; + buildInputs = + [ + expat + libdrm + ncurses + openssl + wayland + zlib + ] + ++ (with xorg; [ + libX11 + libxcb + xcbproto + libXext + libXrandr + libXft + libxshmfence + ]); - nativeBuildInputs = [ - cmake - directx-shader-compiler - glslang - ninja - patchelf - perl - pkg-config - python3 - ] ++ (with python3.pkgs; [ - jinja2 - ruamel-yaml - ]); + nativeBuildInputs = + [ + cmake + directx-shader-compiler + glslang + ninja + patchelf + perl + pkg-config + python3 + ] + ++ (with python3.pkgs; [ + jinja2 + ruamel-yaml + ]); - rpath = lib.makeLibraryPath [ - libdrm - openssl - stdenv.cc.cc.lib - xorg.libX11 - xorg.libxcb - xorg.libxshmfence - zlib - ]; + rpath = lib.makeLibraryPath ( + [ + libdrm + openssl + stdenv.cc.cc.lib + zlib + ] + ++ (with xorg; [ + libX11 + libxcb + libxshmfence + ]) + ); cmakeDir = "../drivers/xgl"; @@ -95,26 +106,33 @@ in stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils curl gnused jq common-updater-scripts + packagePath="pkgs/by-name/am/amdvlk/package.nix" + function setHash() { - sed -i "pkgs/development/libraries/amdvlk/default.nix" -e 's,sha256 = "[^'"'"'"]*",sha256 = "'"$1"'",' + sed -i $packagePath -e 's,sha256 = "[^'"'"'"]*",sha256 = "'"$1"'",' } version="$(curl -sL "https://api.github.com/repos/GPUOpen-Drivers/AMDVLK/releases?per_page=1" | jq '.[0].tag_name | split("-") | .[1]' --raw-output)" - sed -i "pkgs/development/libraries/amdvlk/default.nix" -e 's/version = "[^'"'"'"]*"/version = "'"$version"'"/' + sed -i $packagePath -e 's/version = "[^'"'"'"]*"/version = "'"$version"'"/' setHash "$(nix-instantiate --eval -A lib.fakeSha256 | xargs echo)" hash="$(nix to-base64 $(nix-build -A amdvlk 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true))" setHash "$hash" ''; - passthru.impureTests = { amdvlk = callPackage ./test.nix {}; }; + passthru.impureTests = { + amdvlk = callPackage ./test.nix { }; + }; - meta = with lib; { + meta = { description = "AMD Open Source Driver For Vulkan"; homepage = "https://github.com/GPUOpen-Drivers/AMDVLK"; - changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}"; - license = licenses.mit; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ Flakebi ]; + changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + maintainers = with lib.maintainers; [ Flakebi ]; }; -} +}) diff --git a/pkgs/development/libraries/amdvlk/test.nix b/pkgs/by-name/am/amdvlk/test.nix similarity index 100% rename from pkgs/development/libraries/amdvlk/test.nix rename to pkgs/by-name/am/amdvlk/test.nix diff --git a/pkgs/by-name/an/andi/package.nix b/pkgs/by-name/an/andi/package.nix new file mode 100644 index 000000000000..85b9cbdf5a13 --- /dev/null +++ b/pkgs/by-name/an/andi/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + glib, + gsl, + libdivsufsort, + llvmPackages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "andi"; + version = "0.14"; + + src = fetchFromGitHub { + owner = "evolbioinf"; + repo = "andi"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-tjQ9exFyqu/xnbUGpF6k0kE5C1D93kISjRErwHfjW9E="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + gsl + libdivsufsort + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; + + configureFlags = [ (lib.enableFeature finalAttrs.finalPackage.doCheck "unit-tests") ]; + + nativeCheckInputs = [ glib ]; + + doCheck = true; + + preCheck = '' + patchShebangs ./test + ''; + + meta = { + description = "Efficient Estimation of Evolutionary Distances"; + homepage = "https://github.com/evolbioinf/andi"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "andi"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix index d12c701d355d..8118a2d09731 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-06-28"; + version = "0-unstable-2024-08-12"; src = fetchFromGitHub { owner = "IvarK"; repo = "AntimatterDimensionsSourceCode"; - rev = "aeaa7a358f605073172ec9eaa28ff6544edca5a5"; - hash = "sha256-rXFXoSOtYeLIBQzJ/J+FMSp9CKHOCzq3HxQMd2Bpm3E="; + rev = "af840eef45bb2120bff4dcebb9b11c181067f9a8"; + hash = "sha256-qlgu/Sw3LMn/ZSXJFi0DW6vYAZyF2D3cCpKmXhID3s4="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 6ea894c95494..66ad50e47dfe 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - install -Dm444 anyrun/res/style.css examples/config.ron -t $out/share/doc/${pname}/examples/ + install -Dm444 anyrun/res/style.css examples/config.ron -t $out/share/doc/anyrun/examples/ ''; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index da7bb52a9dd6..0bc91bde511b 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -19,16 +19,17 @@ udev, wayland, wayland-protocols, + wayland-scanner, }: stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "aquamarine"; rev = "v${finalAttrs.version}"; - hash = "sha256-1RYuBS/CQhtyIeXrLDvGWJhuVG1kiQMG+aYaBkoGnEU="; + hash = "sha256-zushuLkBblDZGVo2qbiMTJ51LSkqYJpje/R2dvfec1U="; }; nativeBuildInputs = [ @@ -51,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { udev wayland wayland-protocols + wayland-scanner ]; strictDeps = true; @@ -65,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/hyprwm/aquamarine/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/hyprwm/aquamarine/releases/tag/v${finalAttrs.version}"; description = "A very light linux rendering backend library"; homepage = "https://github.com/hyprwm/aquamarine"; license = lib.licenses.bsd3; diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix index ea730ba62230..2530c3b31c47 100644 --- a/pkgs/by-name/as/asn/package.nix +++ b/pkgs/by-name/as/asn/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "asn"; - version = "0.77.0"; + version = "0.78.0"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; rev = "refs/tags/v${version}"; - hash = "sha256-A2Z6xNoC6X6ZDL8jecRE3MkW7EmNQ6EHyCBIlNlBoxA="; + hash = "sha256-pXPc6cAPqvbECvP3v3Z1Og8jhIhh5zvXomZrxNX6KVI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/as/assemblyscript/package.nix b/pkgs/by-name/as/assemblyscript/package.nix index 43b630607b76..b2fcb5ff6317 100644 --- a/pkgs/by-name/as/assemblyscript/package.nix +++ b/pkgs/by-name/as/assemblyscript/package.nix @@ -9,7 +9,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "AssemblyScript"; - repo = pname; + repo = "assemblyscript"; rev = "v${version}"; sha256 = "sha256-Jhjq+kLRzDesTPHHonImCnuzt1Ay04n7+O9aK4knb5g="; }; @@ -17,7 +17,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-mWRQPQVprM+9SCYd8M7NMDtiwDjSH5cr4Xlr5VP9eHo="; meta = with lib; { - homepage = "https://github.com/AssemblyScript/${pname}"; + homepage = "https://github.com/AssemblyScript/assemblyscript"; description = "TypeScript-like language for WebAssembly"; license = licenses.asl20; maintainers = with maintainers; [ lucperkins ]; diff --git a/pkgs/by-name/at/attic-client/Cargo.lock b/pkgs/by-name/at/attic-client/Cargo.lock index 165b9a97c872..a8bd1f01fcfe 100644 --- a/pkgs/by-name/at/attic-client/Cargo.lock +++ b/pkgs/by-name/at/attic-client/Cargo.lock @@ -230,6 +230,7 @@ dependencies = [ "async-stream", "base64 0.22.1", "bytes", + "cc", "cxx", "cxx-build", "digest", @@ -250,6 +251,7 @@ dependencies = [ "tempfile", "tokio", "tokio-test", + "version-compare", "wildmatch", "xdg", ] @@ -1050,13 +1052,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -3960,6 +3962,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" +[[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" @@ -4891,6 +4899,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[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" diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index c2b73ed985c6..e9b89cf6d54b 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage { pname = "attic"; - version = "0-unstable-2024-08-01"; + version = "0-unstable-2024-08-19"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "attic"; - rev = "e127acbf9a71ebc0c26bc8e28346822e0a6e16ba"; - hash = "sha256-GJIz4M5HDB948Ex/8cPvbkrNzl/eKUE7/c21JBu4lb8="; + rev = "acf3c351f8de47c6857f31948ab253f9c7ce2a6f"; + hash = "sha256-jcY81r8PdMQ9dCGhT0YLZzxPj3kQJXyWCmvQLXbR1EI="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage { }; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; - ATTIC_DISTRIBUTOR = "attic"; + ATTIC_DISTRIBUTOR = "nixpkgs"; NIX_INCLUDE_PATH = "${lib.getDev nix}/include"; # Attic interacts with Nix directly and its tests require trusted-user access diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix index a1a4df946704..91008472059b 100644 --- a/pkgs/by-name/au/audiobookshelf/package.nix +++ b/pkgs/by-name/au/audiobookshelf/package.nix @@ -20,13 +20,13 @@ let src = fetchFromGitHub { owner = "advplyr"; - repo = pname; + repo = "audiobookshelf"; rev = "refs/tags/v${source.version}"; inherit (source) hash; }; client = buildNpmPackage { - pname = "${pname}-client"; + pname = "audiobookshelf-client"; inherit (source) version; src = runCommand "cp-source" { } '' @@ -74,13 +74,13 @@ buildNpmPackage { installPhase = '' mkdir -p $out/opt/client cp -r index.js server package* node_modules $out/opt/ - cp -r ${client}/lib/node_modules/${pname}-client/dist $out/opt/client/dist + cp -r ${client}/lib/node_modules/audiobookshelf-client/dist $out/opt/client/dist mkdir $out/bin - echo '${wrapper}' > $out/bin/${pname} - echo " exec ${nodejs}/bin/node $out/opt/index.js" >> $out/bin/${pname} + echo '${wrapper}' > $out/bin/audiobookshelf + echo " exec ${nodejs}/bin/node $out/opt/index.js" >> $out/bin/audiobookshelf - chmod +x $out/bin/${pname} + chmod +x $out/bin/audiobookshelf ''; passthru = { diff --git a/pkgs/by-name/aw/aws-sso-cli/package.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix index 9866bffb07dc..6e5b72b1f2d3 100644 --- a/pkgs/by-name/aw/aws-sso-cli/package.nix +++ b/pkgs/by-name/aw/aws-sso-cli/package.nix @@ -32,9 +32,14 @@ buildGoModule rec { nativeCheckInputs = [ getent ]; - checkFlags = [ - "-skip=TestAWSConsoleUrl|TestAWSFederatedUrl" - ] ++ lib.optionals stdenv.isDarwin [ "--skip=TestDetectShellBash" ]; + checkFlags = let + skippedTests = [ + "TestAWSConsoleUrl" + "TestAWSFederatedUrl" + "TestServerWithSSL" # https://github.com/synfinatic/aws-sso-cli/issues/1030 -- remove when version >= 2.x + ] ++ lib.optionals stdenv.isDarwin [ "TestDetectShellBash" ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; meta = with lib; { homepage = "https://github.com/synfinatic/aws-sso-cli"; diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix index 0ae0152ab66a..a4a37cb65ebc 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix @@ -59,9 +59,9 @@ }; aks-preview = mkAzExtension rec { pname = "aks-preview"; - version = "7.0.0b3"; + version = "7.0.0b6"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl"; - sha256 = "04067e9050de7b3560030613232bf51d9ada4b91885285954afe77b3e40ad90a"; + sha256 = "268457ea6463d03775caa822b4b7a70749c503b47cb2aa9c898e1186cfb423f6"; description = "Provides a preview for upcoming AKS features"; }; akshybrid = mkAzExtension rec { @@ -87,9 +87,9 @@ }; amg = mkAzExtension rec { pname = "amg"; - version = "1.3.6"; + version = "2.1.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/amg-${version}-py3-none-any.whl"; - sha256 = "52fbff96d56e381e636f6b2e9f8be80ac7eef766153ba8225a183b73d2972f25"; + sha256 = "b28952d967b9a1e0d81dac280bdff23b44fdbb06dedd66cdf99477bdd7541d6c"; description = "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"; }; amlfs = mkAzExtension rec { @@ -143,9 +143,9 @@ }; azure-firewall = mkAzExtension rec { pname = "azure-firewall"; - version = "1.1.0"; + version = "1.2.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-${version}-py2.py3-none-any.whl"; - sha256 = "562cc396c6afa1ef996c35b7bed801b3fd9677e4c6923f1148cb09255b24d1ef"; + sha256 = "5468cc09b8ea7918176b5e95aa3c24c7ad9b7d1b68c47d16bf522a053fd811e8"; description = "Manage Azure Firewall resources"; }; azurelargeinstance = mkAzExtension rec { @@ -171,9 +171,9 @@ }; bastion = mkAzExtension rec { pname = "bastion"; - version = "1.0.2"; + version = "1.1.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-${version}-py3-none-any.whl"; - sha256 = "1637b37374e8956d555ee89e005ceb952aed4e754b93a8ec887a4f90ce4e36f8"; + sha256 = "d90bc404d2f9d22435a2bd34bd1fd6094d71d6f1719763c72ee6e4835ec8a99d"; description = "Microsoft Azure Command-Line Tools Bastion Extension"; }; billing-benefits = mkAzExtension rec { @@ -318,9 +318,9 @@ }; dataprotection = mkAzExtension rec { pname = "dataprotection"; - version = "1.5.2"; + version = "1.5.3"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-${version}-py3-none-any.whl"; - sha256 = "534ba81cbfece53352e1862d4bfadc8a5b3fd0449178c482e13fc1925970dac3"; + sha256 = "4671ce89e39065695f21626350dfcad5438bdbefc714cf35e85ee5eab0f96661"; description = "Microsoft Azure Command-Line Tools DataProtectionClient Extension"; }; datashare = mkAzExtension rec { @@ -444,9 +444,9 @@ }; fleet = mkAzExtension rec { pname = "fleet"; - version = "1.2.0"; + version = "1.2.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-${version}-py3-none-any.whl"; - sha256 = "6e9504f22893636a14990955bfb731e77a2f681b100f2cb20cc2455ce15a2b8b"; + sha256 = "d7e3525249c0c4e5ae0988500e36847b4363d734f7b16e7a0f9a9e54623081ae"; description = "Microsoft Azure Command-Line Tools Fleet Extension"; }; fluid-relay = mkAzExtension rec { @@ -647,9 +647,9 @@ }; managednetworkfabric = mkAzExtension rec { pname = "managednetworkfabric"; - version = "6.2.0"; + version = "6.4.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-${version}-py3-none-any.whl"; - sha256 = "3761e2319e0a6bccde79d59e2ab2d508f00e601562c0b7e4bf290ff9d9b14479"; + sha256 = "9d41078e0654aaae36a5f0f283f51de98cc4360582920536542546ed34ca0bc4"; description = "Support for managednetworkfabric commands based on 2023-06-15 API version"; }; managementpartner = mkAzExtension rec { diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 821400868ffb..1b6bd5effd66 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -60,6 +60,29 @@ meta.maintainers = with lib.maintainers; [ obreitwi ]; }; + ssh = mkAzExtension rec { + pname = "ssh"; + version = "2.0.5"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/ssh-${version}-py3-none-any.whl"; + sha256 = "80c98b10d7bf1ce4005b7694aedd05c47355456775ba6125308be65fb0fefc93"; + description = "SSH into Azure VMs using RBAC and AAD OpenSSH Certificates"; + propagatedBuildInputs = with python3Packages; [ + oras + oschmod + ]; + meta.maintainers = with lib.maintainers; [ gordon-bp ]; + }; + + storage-preview = mkAzExtension rec { + pname = "storage-preview"; + version = "1.0.0b2"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_preview-${version}-py2.py3-none-any.whl"; + sha256 = "2de8fa421622928a308bb70048c3fdf40400bad3b34afd601d0b3afcd8b82764"; + description = "Provides a preview for upcoming storage features"; + propagatedBuildInputs = with python3Packages; [ azure-core ]; + meta.maintainers = with lib.maintainers; [ katexochen ]; + }; + # Removed extensions blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index f7f7f8cb0b26..6af667f57673 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -223,7 +223,7 @@ py.pkgs.toPythonApplication ( postInstall = '' substituteInPlace az.completion.sh \ - --replace register-python-argcomplete ${py.pkgs.argcomplete}/bin/register-python-argcomplete + --replace-fail register-python-argcomplete ${py.pkgs.argcomplete}/bin/register-python-argcomplete installShellCompletion --bash --name az.bash az.completion.sh installShellCompletion --zsh --name _az az.completion.sh '' diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index 7c46ba257210..12281851ee53 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -42,27 +42,30 @@ let ./0001-optional-immutable-configuration-dir.patch ]; - propagatedBuildInputs = with self; [ - argcomplete - azure-cli-telemetry - azure-common - azure-mgmt-core - cryptography - distro - humanfriendly - jmespath - knack - msal-extensions - msal - msrestazure - packaging - paramiko - pkginfo - psutil - pyjwt - pyopenssl - requests - ]; + propagatedBuildInputs = + with self; + [ + argcomplete + azure-cli-telemetry + azure-common + azure-mgmt-core + cryptography + distro + humanfriendly + jmespath + knack + msal-extensions + msal + msrestazure + packaging + paramiko + pkginfo + psutil + pyjwt + pyopenssl + requests + ] + ++ requests.optional-dependencies.socks; nativeCheckInputs = with self; [ pytest ]; diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix index 1a2580bd1d9f..a2ba961b2039 100644 --- a/pkgs/by-name/b3/b3sum/package.nix +++ b/pkgs/by-name/b3/b3sum/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "1.5.3"; + version = "1.5.4"; src = fetchCrate { inherit version pname; - hash = "sha256-wyr5LuFn3yRPJCyNfLT1Vgn6Sz1U4VNo0nppJrqE7IY="; + hash = "sha256-+aC6yyQ9IcdliYqteB/UTMqwGNCWW0LZWYfMxnaPMm0="; }; - cargoHash = "sha256-v2sQKZ0DG08MDLho8fQ8O7fiNu+kxZB1sPNMgF5W2HA="; + cargoHash = "sha256-2E6SU4fMHj0NCIMrn0YNfkllZrFwCLn1wGJfzBPqtKQ="; meta = { description = "BLAKE3 cryptographic hash function"; diff --git a/pkgs/by-name/ba/baobab/package.nix b/pkgs/by-name/ba/baobab/package.nix index 3978661baabb..c57ea6c12942 100644 --- a/pkgs/by-name/ba/baobab/package.nix +++ b/pkgs/by-name/ba/baobab/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/baobab/${lib.versions.major version}/baobab-${version}.tar.xz"; hash = "sha256-zk3vXILQVnGlAJ9768+FrJhnXZ2BYNKK2RgbJppy43w="; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "baobab"; }; }; diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index f6358d06b48b..e61571c20c22 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -11,13 +11,13 @@ }: let - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-sNSMVPPHSqy4sOpM3H07R3WL8OUrQ4//baxiWSOBXP8="; + hash = "sha256-GVdUxuUgnM4yr0gW+NDKYFk0Roc/U4eG/OFK8QR/vvw="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -47,7 +47,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-jNvV1+2qKGNr0LjSCORi3A2IxJspc7/PTazcCCjeMe4="; + npmDepsHash = "sha256-ODN7FRAw9pd/CnVQrnnl/hNng+byDr1Rb3EFCOT0EQI="; dontNpmBuild = true; # Uncomment this flag when using unreleased peer dependencies # npmFlags = [ "--legacy-peer-deps" ]; @@ -94,7 +94,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-n2UU1wNN+wbHsAv7pJHNJTDjEE5ZpjRxBGSVPF4ADm8="; + npmDepsHash = "sha256-YdqbfA5Bb7s1iT8TzSc1fpy6QCtXfazjTQmUGsC9j2Y="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index d755b2aaf785..0ea0c06ea167 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.9.4"; + version = "1.11.0"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-qPnlSl1s9QWkODqbrfzIVFLXtDVEmTOihBlDmvHoknY="; + hash = "sha256-L2eIYdQnnmKNI8QWSy8nk4GzJ8jv+qt98gqdzcJH31Q="; }; nativeBuildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; - hash = "sha256-ufzxFEgeOaOcZKEPx7kT64Pj2oz6m35exqXQlKxXGb4="; + hash = "sha256-Ol3wKdxKYJWDC/JREOfVSQRNnWVano7qilMRvqrLsgA=="; }; makeFlags = [ diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix index 17030eb6ccd9..96057b2a49ab 100644 --- a/pkgs/by-name/be/beeper-bridge-manager/package.nix +++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bbctl"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "beeper"; repo = "bridge-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-xaBLI5Y7PxHbmlwD72AKNrgnz3D+3WVhb2GJr5cmyfs="; + hash = "sha256-MAve7ZNS20XBJ7Qp3mehznli04+MS7RiVWW1txdf19U="; }; - vendorHash = "sha256-VnqihTEGfrLxRfuscrWWBbhZ/tr8BhVnCd+FKblW5gI="; + vendorHash = "sha256-uz4pao8Y/Sb3fffi9d0lbWQEUMohbthA6t6k6PfQz2M="; meta = { description = "Tool for running self-hosted bridges with the Beeper Matrix server. "; diff --git a/pkgs/by-name/be/beidconnect/package.nix b/pkgs/by-name/be/beidconnect/package.nix new file mode 100644 index 000000000000..5acd92acefab --- /dev/null +++ b/pkgs/by-name/be/beidconnect/package.nix @@ -0,0 +1,86 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pcsclite, + boost, + pkg-config, + testers, + beidconnect, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "beidconnect"; + version = "2.10"; + + src = fetchFromGitHub { + owner = "Fedict"; + repo = "fts-beidconnect"; + rev = finalAttrs.version; + hash = "sha256-xkBldXOlgLMgrvzm7ajXzJ92mpXrxHD1RX4DeBxU3kk="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + pcsclite.dev + boost + ]; + + strictDeps = true; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail '$(DESTDIR)/usr/bin' '$(DESTDIR)/bin' + ''; + + makeFlags = [ "DESTDIR=$(out)" ]; + sourceRoot = "${finalAttrs.src.name}/linux"; + + postInstall = '' + install -d \ + $out/etc/chromium/native-messaging-hosts \ + $out/etc/opt/chrome/native-messaging-hosts/ \ + $out/etc/opt/edge/native-messaging-hosts/ \ + $out/etc/opt/vivaldi/native-messaging-hosts/ \ + $out/etc/opt/brave/native-messaging-hosts/ \ + $out/lib/mozilla/native-messaging-hosts \ + + $out/bin/beidconnect -setup $out/bin \ + $out/etc/chromium/native-messaging-hosts \ + $out/lib/mozilla/native-messaging-hosts + + # Chrome + install $out/etc/chromium/native-messaging-hosts/be.bosa.beidconnect.json $out/etc/opt/chrome/native-messaging-hosts/ + + # Edge + install $out/etc/chromium/native-messaging-hosts/be.bosa.beidconnect.json $out/etc/opt/edge/native-messaging-hosts/ + + # Vivaldi + install $out/etc/chromium/native-messaging-hosts/be.bosa.beidconnect.json $out/etc/opt/vivaldi/native-messaging-hosts/ + + # Brave + install $out/etc/chromium/native-messaging-hosts/be.bosa.beidconnect.json $out/etc/opt/brave/native-messaging-hosts/ + ''; + + passthru.tests.version = testers.testVersion { + package = beidconnect; + command = "${beidconnect}/bin/beidconnect -version"; + }; + + meta = { + description = "BeIDConnect native messaging component"; + longDescription = '' + The beidconnect is a program to help implementing digital signing services + and/or an identity service using the Belgian eID card. It provides + services to webbrowsers to read data from cards, and is intended to work + together with a WebExtension in the browser. + + This package contains the native code. For the WebExtension, see your + webbrowser's extension store. + ''; + homepage = "https://github.com/Fedict/fts-beidconnect/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jovandeginste ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix new file mode 100644 index 000000000000..c95bfbeb427c --- /dev/null +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule rec { + pname = "bitrise"; + version = "2.19.0"; + + src = fetchFromGitHub { + owner = "bitrise-io"; + repo = "bitrise"; + rev = version; + hash = "sha256-VjuDeRl/rqA7bdhn9REdxdjRon5WxHkFIveOYNpQqa8="; + }; + + # many tests rely on writable $HOME/.bitrise and require network access + doCheck = false; + + vendorHash = null; + ldflags = [ + "-X github.com/bitrise-io/bitrise/version.Commit=${src.rev}" + "-X github.com/bitrise-io/bitrise/version.BuildNumber=0" + ]; + CGO_ENABLED = 0; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/bitrise-io/bitrise/releases"; + description = "CLI for running your Workflows from Bitrise on your local machine"; + homepage = "https://bitrise.io/cli"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + mainProgram = "bitrise"; + maintainers = with lib.maintainers; [ ofalvai ]; + }; +} diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 654fa709a9b1..7ec901fbc648 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -11,21 +11,26 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.7.2"; + version = "2024.8.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-MqIznJe5GeRTJ+sgOJoTHAQaac0obuBDb63XxQeG1iY="; + hash = "sha256-vosEc8HCMHEaaQadzA+jDjQA1liEtD8sS1Zndz/Iv00="; }; + postPatch = '' + # remove code under unfree license + rm -r bitwarden_license + ''; + nodejs = nodejs_20; - npmDepsHash = "sha256-XDN92VPKTA9KeSg5CQXxhXyEARZBwpERZ3400xqwg7U="; + npmDepsHash = "sha256-5neEpU7ZhVO5OR181owsvAnFfl7lr0MymvqbRFCPs3M="; nativeBuildInputs = [ - (python3.withPackages (ps: with ps; [ setuptools ])) + python3 ] ++ lib.optionals stdenv.isDarwin [ cctools xcbuild.xcrun diff --git a/pkgs/by-name/br/braa/package.nix b/pkgs/by-name/br/braa/package.nix index a3b416ae482e..b4a482bfa8e4 100644 --- a/pkgs/by-name/br/braa/package.nix +++ b/pkgs/by-name/br/braa/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.82"; src = fetchzip { - url = "http://s-tech.elsat.net.pl/${pname}/${pname}-${version}.tar.gz"; + url = "http://s-tech.elsat.net.pl/braa/braa-${version}.tar.gz"; hash = "sha256-GS3kk432BdGx/sLzzjXvotD9Qn4S3U4XtMmM0fWMhGA="; }; diff --git a/pkgs/by-name/br/brill/package.nix b/pkgs/by-name/br/brill/package.nix index f5ed5d0882dc..0ea130064e3d 100644 --- a/pkgs/by-name/br/brill/package.nix +++ b/pkgs/by-name/br/brill/package.nix @@ -14,8 +14,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 *agreement.pdf -t $out/share/licenses/${pname} - install -Dm644 *use.pdf -t $out/share/doc/${pname} + install -Dm644 *agreement.pdf -t $out/share/licenses/brill + install -Dm644 *use.pdf -t $out/share/doc/brill runHook postInstall ''; diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 3a62debde824..9c2dafc1aeae 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -26,13 +26,13 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-+rnZid+2E3xP6GTHKXki+MeRuoU8gAB34/MVyKu9oEQ="; + hash = "sha256-TXEe0ICrkljxfnvW1wv/e1BB7J6p/KW3JklCvYyjqSs="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index 128813f7bea3..8da59b372413 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -13,16 +13,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.76.2"; + version = "3.77.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-XAMrc8HEdCGeI0l6u4n81xhiGkI39b7Poly5CP/b0R8="; + sha256 = "sha256-QsSCIAy0ekkZiqO/cFcPNNkXa3FLL3Z1LJoKsjzB6jw="; }; - vendorHash = "sha256-0P6EXqQa6WxhjNJ4X6THvjJRK/UQvqXTv+7IJViFAQs="; + vendorHash = "sha256-xp836ZT2x20ZbkTEubhiZlLmK9n2F8mCSWZTHmAuu6A="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index e9de0cc5e295..ab9068277871 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -1,35 +1,48 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, + nix-update-script, + testers, + bunbun, }: rustPlatform.buildRustPackage rec { pname = "bunbun"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "devraza"; repo = "bunbun"; - rev = "refs/tags/v${version}"; - hash = "sha256-jqokKvJYu/xHJHJVuNlTns3cYPLx1osbRUrCpVTCJZ0="; + # TODO: remove '-bump' at next release + rev = "refs/tags/v${version}-bump"; + hash = "sha256-r4xBUfNY+Q3uAC919ZQbIDgiF981FVqZCOT8XNojZP4="; }; - cargoHash = "sha256-dWZ5aNaHyTkEmkn88Dx5nCnGyiBmpJ6p5iYC7xj/mBw="; + cargoHash = "sha256-CcGfaSyCMv0Wm4QsYASBwEnpX8fKbLHRqyEcUmj2w2o="; - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreFoundation + IOKit + SystemConfiguration + ] + ); - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = bunbun; }; + }; + + meta = { description = "Simple and adorable sysinfo utility written in Rust"; homepage = "https://github.com/devraza/bunbun"; changelog = "https://github.com/devraza/bunbun/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "bunbun"; }; } diff --git a/pkgs/by-name/bu/buttermanager/package.nix b/pkgs/by-name/bu/buttermanager/package.nix index 80c3dd4e3084..8127703d0e01 100644 --- a/pkgs/by-name/bu/buttermanager/package.nix +++ b/pkgs/by-name/bu/buttermanager/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "buttermanager"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; src = fetchFromGitHub { owner = "egara"; repo = "buttermanager"; rev = version; - hash = "sha256-MLYJt7OMYlTFk8FCAlZJ1RGlFFXKfeAthWGp4JN+PfY="; + hash = "sha256-/U5IVJvYCw/YzBWjQ949YP9uoxsTNRJ5FO7rrI6Cvhs="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix new file mode 100644 index 000000000000..214b304ff577 --- /dev/null +++ b/pkgs/by-name/ca/caprine/package.nix @@ -0,0 +1,93 @@ +{ + stdenv, + lib, + fetchFromGitHub, + buildNpmPackage, + makeDesktopItem, + copyDesktopItems, + electron, +}: + +let + electronDist = electron + (if stdenv.isDarwin then "/Applications" else "/libexec/electron"); +in +buildNpmPackage rec { + pname = "caprine"; + version = "2.60.1"; + + src = fetchFromGitHub { + owner = "sindresorhus"; + repo = "caprine"; + rev = "v${version}"; + hash = "sha256-y4W295i7FhgJC3SlwSr801fLOGJY1WF136bbkkBUvyw="; + }; + + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + npmDepsHash = "sha256-JHaUc2p+wHsqWtls8xquHK9qnypuCrR0AQMGxcrTsC0="; + + nativeBuildInputs = [ copyDesktopItems ]; + + postBuild = '' + cp -r ${electronDist} electron-dist + chmod -R u+w electron-dist + + npm exec electron-builder -- \ + --dir \ + -c.npmRebuild=true \ + -c.asarUnpack="**/*.node" \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron.version} + ''; + + installPhase = '' + runHook preInstall + + ${lib.optionalString stdenv.isLinux '' + mkdir -p $out/share/caprine + cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/caprine + + makeWrapper ${lib.getExe electron} $out/bin/caprine \ + --add-flags $out/share/caprine/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + + install -Dm644 build/icon.png $out/share/icons/hicolor/512x512/apps/caprine.png + ''} + + ${lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r dist/mac*/"Caprine.app" $out/Applications + makeWrapper "$out/Applications/Caprine.app/Contents/MacOS/Caprine" $out/bin/caprine + ''} + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "caprine"; + exec = "caprine %U"; + icon = "caprine"; + desktopName = "Caprine"; + comment = meta.description; + categories = [ + "Network" + "InstantMessaging" + "Chat" + ]; + mimeTypes = [ "x-scheme-handler/caprine" ]; + terminal = false; + }) + ]; + + meta = { + changelog = "https://github.com/sindresorhus/caprine/releases/tag/${src.rev}"; + description = "Elegant Facebook Messenger desktop app"; + homepage = "https://github.com/sindresorhus/caprine"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ astronaut0212 ]; + inherit (electron.meta) platforms; + }; +} diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 88b8a4b9fc3a..9ff861190d04 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 = "1.1.1"; + version = "1.1.2"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-4HGI0G3fOzj787fXyUMt4XK4KMtrilOJUw1DqRpUoYY="; + hash = "sha256-JnQrQBx9VuXI0wj1mMLfl15lxC85f1kUBucgC3Q8F0c="; }; - cargoHash = "sha256-sQiWd8onSJMo7+ouCPye7IaGzYp0N3rMC4PZv+/DPt4="; + cargoHash = "sha256-iFcW9REkEolrDDbEwoepUSO79OgUdsLUhSkk12y4yxk="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/cb/cbtemulator/package.nix b/pkgs/by-name/cb/cbtemulator/package.nix index 7c7bf7ffb230..916d349e633f 100644 --- a/pkgs/by-name/cb/cbtemulator/package.nix +++ b/pkgs/by-name/cb/cbtemulator/package.nix @@ -8,18 +8,22 @@ buildGoModule rec { pname = "cbtemulator"; - version = "1.22.0"; + version = "1.29.0"; - # There's a go.{mod,sum} in the root and in the "bigtable" subdir. - # We only ever use things in that subdir. - src = (fetchFromGitHub { + src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-go"; rev = "bigtable/v${version}"; - hash = "sha256-eOi4QFthnmZb5ry/5L7wzr4Fy1pF/H07BzxOnXtmSu4="; - }) + "/bigtable"; + hash = "sha256-prDwy65pxWDrIJOURe2JHo4sY4yP8IE1Rp1pLUL/IAA="; + }; + + # There's a go.{mod,sum} in the root and in the "bigtable" subdir. + # We only ever use things in that subdir. + sourceRoot = "${src.name}/bigtable"; + env.GOWORK = "off"; + + vendorHash = "sha256-EDfxT56LKEu/iXPp5RJXb4UIRV2jFFNxh3ZINPbwKTM="; - vendorHash = "sha256-7M7YZfl0usjN9hLGozqJV2bGh+M1ec4PZRGYUhEckpY="; subPackages = [ "cmd/emulator" ]; postInstall = '' @@ -57,7 +61,7 @@ buildGoModule rec { meta = with lib; { description = "In-memory Google Cloud Bigtable server"; - homepage = "https://github.com/googleapis/google-cloud-go/blob/bigtable/v1.22.0/bigtable/cmd/emulator/cbtemulator.go"; + homepage = "https://github.com/googleapis/google-cloud-go/blob/bigtable/v${version}/bigtable/cmd/emulator/cbtemulator.go"; license = licenses.asl20; maintainers = [ maintainers.flokli ]; mainProgram = "cbtemulator"; diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix new file mode 100644 index 000000000000..0ddfdfe3f3c8 --- /dev/null +++ b/pkgs/by-name/cc/ccextractor/package.nix @@ -0,0 +1,157 @@ +{ + lib, + stdenv, + fetchFromGitHub, + writeTextFile, + + pkg-config, + cmake, + ninja, + cargo, + rustc, + corrosion, + rustPlatform, + + gpac, + protobufc, + libpng, + zlib, + utf8proc, + freetype, + ffmpeg_7, + libarchive, + curl, + libiconv, + + enableOcr ? true, + leptonica, + tesseract, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ccextractor"; + version = "0.94-unstable-2024-08-12"; + + src = fetchFromGitHub { + owner = "CCExtractor"; + repo = "ccextractor"; + rev = "92f2ce0fa026b01fb07db6751210e6bd8c8944d3"; + hash = "sha256-bp7T9uJK4bauR2Co4lKqqnM6oGa3WZ+1toEKmzOx4mI="; + }; + + patches = [ + ./remove-default-commit-hash.patch + ./remove-vendored-libraries.patch + ] ++ finalAttrs.cargoDeps.patches; + + cmakeDir = "../src"; + + cargoRoot = "src/rust"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; + patches = [ ./use-rsmpeg-0.15.patch ]; + patchFlags = [ "-p3" ]; + hash = "sha256-jh8hHKAad+tCJGwuGdoJp/TMm/IsMrZmz8aag9lj0BA="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ninja + cargo + rustc + corrosion + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + ]; + + buildInputs = + [ + gpac + protobufc + libpng + zlib + utf8proc + freetype + ffmpeg_7 + libarchive + curl + libiconv + ] + ++ lib.optionals enableOcr [ + leptonica + tesseract + ]; + + cmakeFlags = + [ + # The tests are all part of one `cargo test` invocation, so let’s + # get the output from it. + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--verbose") + + # TODO: This (and the corresponding patch) should probably be + # removed for the next stable release. + (lib.cmakeFeature "GIT_COMMIT_HASH" finalAttrs.src.rev) + ] + ++ lib.optionals enableOcr [ + (lib.cmakeBool "WITH_OCR" true) + (lib.cmakeBool "WITH_HARDSUBX" true) + ]; + + env = { + FFMPEG_INCLUDE_DIR = "${lib.getDev ffmpeg_7}/include"; + + # Upstream’s FFmpeg binding crate needs an explicit path to a shared + # object to do dynamic linking. The key word is *an* explicit path; + # they don’t support passing more than one. This linker script hack + # pulls in all the FFmpeg libraries they bind to. + # + # See: + FFMPEG_DLL_PATH = + let + ffmpegLibNames = [ + "avcodec" + "avdevice" + "avfilter" + "avformat" + "avutil" + "swresample" + "swscale" + ]; + ffmpegLibDir = "${lib.getLib ffmpeg_7}/lib"; + ffmpegLibExt = stdenv.hostPlatform.extensions.library; + ffmpegLibPath = ffmpegLibName: "${ffmpegLibDir}/lib${ffmpegLibName}.${ffmpegLibExt}"; + ffmpegLinkerScript = writeTextFile { + name = "ccextractor-ffmpeg-linker-script"; + destination = "/lib/ffmpeg.ld"; + text = "INPUT(${lib.concatMapStringsSep " " ffmpegLibPath ffmpegLibNames})"; + }; + in + "${ffmpegLinkerScript}/lib/ffmpeg.ld"; + }; + + doCheck = true; + + postPatch = lib.optionalString enableOcr '' + substituteInPlace src/lib_ccx/ocr.c \ + --replace-fail 'getenv("TESSDATA_PREFIX")' '"${tesseract}/share"' + ''; + + meta = { + homepage = "https://www.ccextractor.org/"; + changelog = "${finalAttrs.src.meta.homepage}/blob/${finalAttrs.src.rev}/docs/CHANGES.TXT"; + description = "Tool that produces subtitles from closed caption data in videos"; + longDescription = '' + A tool that analyzes video files and produces independent subtitle files from + closed captions data. CCExtractor is portable, small, and very fast. + It works on Linux, Windows, and OSX. + ''; + platforms = lib.platforms.unix; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.emily ]; + mainProgram = "ccextractor"; + }; +}) diff --git a/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch b/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch new file mode 100644 index 000000000000..07872941084e --- /dev/null +++ b/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch @@ -0,0 +1,14 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d7fdda02e3...2738cab631 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -24,9 +24,6 @@ + OUTPUT_VARIABLE GIT_COMMIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +-ELSE(EXISTS "${BASE_PROJ_DIR}/.git") +- set(GIT_BRANCH "Unknown") +- set(GIT_COMMIT_HASH "Unknown") + ENDIF(EXISTS "${BASE_PROJ_DIR}/.git") + + #Get the date diff --git a/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch b/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch new file mode 100644 index 000000000000..122707c7f21e --- /dev/null +++ b/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch @@ -0,0 +1,187 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2738cab631...5bb2b7d17a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -48,93 +48,20 @@ + include_directories(${PROJECT_SOURCE_DIR}) + include_directories(${PROJECT_SOURCE_DIR}/lib_ccx) + include_directories(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi) +-include_directories(${PROJECT_SOURCE_DIR}/thirdparty) +-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c) + include_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash) +-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libpng) + +-# Check if the operating system is macOS (Darwin) +-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "arm64") +- # ARM Macs +- include_directories("/opt/homebrew/include") +- include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libpng/arm) +- aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/libpng/arm SOURCEFILE) +- else() +- include_directories("/usr/local/include") +- endif() +-endif() +- +-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/zlib) +-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/freetype/include) + aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash/ SOURCEFILE) +-aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/libpng/ SOURCEFILE) +-aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/ SOURCEFILE) +-aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/zlib/ SOURCEFILE) + aux_source_directory(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi/ SOURCEFILE) + +-set(UTF8PROC_SOURCE ${PROJECT_SOURCE_DIR}/thirdparty/utf8proc/utf8proc.c) ++set(UTF8PROC_SOURCE) + +-set(FREETYPE_SOURCE +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/autofit/autofit.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftbase.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftbbox.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftbdf.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftbitmap.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftcid.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftfntfmt.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftfstype.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftgasp.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftglyph.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftgxval.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftinit.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftlcdfil.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftmm.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftotval.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftpatent.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftpfr.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftstroke.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftsynth.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftsystem.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/fttype1.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftwinfnt.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/bdf/bdf.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/bzip2/ftbzip2.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/cache/ftcache.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/cff/cff.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/cid/type1cid.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/gzip/ftgzip.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/lzw/ftlzw.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/pcf/pcf.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/pfr/pfr.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/psaux/psaux.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/pshinter/pshinter.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/psnames/psnames.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/raster/raster.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/sfnt/sfnt.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/smooth/smooth.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/truetype/truetype.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/type1/type1.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/type42/type42.c +- ${PROJECT_SOURCE_DIR}/thirdparty/freetype/winfonts/winfnt.c +- ) ++set(FREETYPE_SOURCE) + #Windows specific libraries and linker flags + if(WIN32) + include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_spec_incld/") + include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/") + aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/" SOURCEFILE) + set (EXTRA_LIBS ${EXTRA_LIBS} ws2_32 winmm Bcrypt) +-else (WIN32) +- # Adding some platform specific library path +- if(UNIX AND NOT APPLE) +- link_directories (/usr/local/lib) +- endif() +- +- if(APPLE) +- # Homebrew library paths +- link_directories(/usr/local/lib) +- link_directories(/opt/homebrew/lib) +- endif() + endif(WIN32) + + if(MSVC) +@@ -212,9 +139,6 @@ + pkg_check_modules (NANOMSG REQUIRED libnanomsg) + set (EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_STATIC_LIBRARIES}) + +- include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/") +- aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/" SOURCEFILE) +- + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_SHARING") + endif (PKG_CONFIG_FOUND AND WITH_SHARING) + +diff --git a/src/lib_ccx/CMakeLists.txt b/src/lib_ccx/CMakeLists.txt +index 4f329bcaab...a334d20c4d 100644 +--- a/src/lib_ccx/CMakeLists.txt ++++ b/src/lib_ccx/CMakeLists.txt +@@ -13,9 +13,39 @@ + find_package(PkgConfig) + pkg_check_modules (GPAC REQUIRED gpac) + ++set (REQUIRES_PRIVATE "libpng libprotobuf-c") ++ ++if (WITH_FFMPEG) ++ set (REQUIRES_PRIVATE "${REQUIRES_PRIVATE} libavutil") ++endif (WITH_FFMPEG) ++ ++if (WITH_HARDSUBX) ++ set (REQUIRES_PRIVATE "${REQUIRES_PRIVATE} libavcodec libavformat libswscale tesseract lept") ++endif (WITH_HARDSUBX) ++ + set (EXTRA_INCLUDES ${EXTRA_INCLUDES} ${GPAC_INCLUDE_DIRS}) + set (EXTRA_LIBS ${EXTRA_LIBS} ${GPAC_LIBRARIES}) + ++pkg_check_modules (PROTOBUFC REQUIRED libprotobuf-c) ++set (EXTRA_LIBS ${EXTRA_LIBS} ${PROTOBUFC_LIBRARIES}) ++set (EXTRA_INCLUDES ${EXTRA_INCLUDES} ${PROTOBUFC_INCLUDE_DIRS}/protobuf-c) ++ ++pkg_check_modules (LIBPNG REQUIRED libpng) ++set (EXTRA_LIBS ${EXTRA_LIBS} ${LIBPNG_LIBRARIES}) ++set (EXTRA_INCLUDES ${EXTRA_INCLUDES} ${LIBPNG_INCLUDE_DIRS}) ++ ++pkg_check_modules (ZLIB REQUIRED zlib) ++set (EXTRA_LIBS ${EXTRA_LIBS} ${ZLIB_LIBRARIES}) ++set (EXTRA_INCLUDES ${EXTRA_INCLUDES} ${ZLIB_INCLUDE_DIRS}) ++ ++pkg_check_modules (UTF8PROC REQUIRED libutf8proc) ++set (EXTRA_LIBS ${EXTRA_LIBS} ${UTF8PROC_LIBRARIES}) ++set (EXTRA_INCLUDES ${EXTRA_INCLUDES} ${UTF8PROC_INCLUDE_DIRS}) ++ ++pkg_check_modules (FREETYPE REQUIRED freetype2) ++set (EXTRA_LIBS ${EXTRA_LIBS} ${FREETYPE_LIBRARIES}) ++set (EXTRA_INCLUDES ${EXTRA_INCLUDES} ${FREETYPE_INCLUDE_DIRS}) ++ + if (WITH_FFMPEG) + find_package(PkgConfig) + +@@ -94,7 +124,7 @@ + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_RUST") + endif (WITHOUT_RUST) + +-file (GLOB HeaderFiles *.h) ++file (GLOB_RECURSE HeaderFiles *.h) + file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n" + "includedir=\${prefix}/include\n" + "libdir=\${prefix}/lib\n\n" +@@ -102,8 +132,8 @@ + "Description: Closed Caption Extraction library\n" + "Version: 0.75\n" + "Cflags: -I\${includedir}/\n" +- "Libs: -L\${libdir} -lccx -lpng\n" +- "Libs.private: -lpng\n" ++ "Libs: -L\${libdir} -lccx\n" ++ "Requires.private: ${REQUIRES_PRIVATE}\n" + ) + + install (TARGETS ccx DESTINATION lib) +diff --git a/src/lib_ccx/params.c b/src/lib_ccx/params.c +index eb1562e50c...984070a285 100644 +--- a/src/lib_ccx/params.c ++++ b/src/lib_ccx/params.c +@@ -14,7 +14,7 @@ + #include "../lib_hash/sha2.h" + #include + #include +-#include ++#include + + #ifdef ENABLE_OCR + #include diff --git a/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch b/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch new file mode 100644 index 000000000000..89af3884639d --- /dev/null +++ b/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch @@ -0,0 +1,43 @@ +diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock +index 5c49573775..3e855aa637 100644 +--- a/src/rust/Cargo.lock ++++ b/src/rust/Cargo.lock +@@ -665,11 +665,10 @@ + + [[package]] + name = "rsmpeg" +-version = "0.14.2+ffmpeg.6.1" ++version = "0.15.1+ffmpeg.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "927012cd6ae43519f519741f4a69602ce3a47cf84750784da124dffd03527cc0" ++checksum = "d3ffbead667d06e0c77c4363f83d49a3481cc3838bc9a61882aa07b01e3f63e1" + dependencies = [ +- "libc", + "paste", + "rusty_ffmpeg", + "thiserror", +@@ -711,9 +710,9 @@ + + [[package]] + name = "rusty_ffmpeg" +-version = "0.13.3+ffmpeg.6.1" ++version = "0.14.1+ffmpeg.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "716adffa5f909c8533611b1dab9ab5666bece35687845865b75ed6a990fc239c" ++checksum = "40f4db8e3e23d4a3044d53a41aba5324eae70d3e7fe82375ce833521533bc315" + dependencies = [ + "bindgen 0.69.4", + "camino", +diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml +index 4c1e73dcf0..68502915dc 100644 +--- a/src/rust/Cargo.toml ++++ b/src/rust/Cargo.toml +@@ -15,7 +15,7 @@ + env_logger = "0.8.4" + iconv = "0.1.1" + palette = "0.6.0" +-rsmpeg = { version = "0.14.1", optional = true, features = [ ++rsmpeg = { version = "0.15.1", optional = true, features = [ + "link_system_ffmpeg", + ] } + tesseract-sys = { version = "0.5.14", optional = true, default-features = false } diff --git a/pkgs/by-name/cd/cdecl/package.nix b/pkgs/by-name/cd/cdecl/package.nix index 20cac4a653f6..c500e095d1f2 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 = "18.2"; + version = "18.3"; src = fetchFromGitHub { owner = "paul-j-lucas"; repo = "cdecl"; rev = "refs/tags/cdecl-${finalAttrs.version}"; - hash = "sha256-6mj5M4SI0TG+N4exu3xdAqh8a98VOFtS1DbuRIYmW+Y="; + hash = "sha256-w6n/7oAl6D7cBG/YIauhjFjHs+ygF3ugKWv0lgY1G9Q="; }; strictDeps = true; diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index d170da92d8c7..c195ead5764c 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -43,7 +43,7 @@ buildGoModule rec { inherit (nixosTests) centrifugo; version = testers.testVersion { package = centrifugo; - command = "${pname} version"; + command = "centrifugo version"; version = "v${version}"; }; }; diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/by-name/ce/ceph-csi/package.nix similarity index 51% rename from pkgs/tools/filesystems/ceph-csi/default.nix rename to pkgs/by-name/ce/ceph-csi/package.nix index 5d0a4c5a53a9..6c45b0aa2435 100644 --- a/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/pkgs/by-name/ce/ceph-csi/package.nix @@ -1,34 +1,50 @@ -{ stdenv, lib, go, ceph, fetchFromGitHub }: +{ + ceph, + fetchFromGitHub, + go, + lib, + stdenv, +}: stdenv.mkDerivation rec { pname = "ceph-csi"; version = "3.11.0"; - nativeBuildInputs = [ go ]; - buildInputs = [ ceph ]; - src = fetchFromGitHub { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "sha256-EgHl74kJ6lTS3pqz/Hxh/2tpc1xiDNcJxzERwKops+A="; + hash = "sha256-EgHl74kJ6lTS3pqz/Hxh/2tpc1xiDNcJxzERwKops+A="; }; preConfigure = '' export GOCACHE=$(pwd)/.cache ''; + strictDeps = true; + + nativeBuildInputs = [ go ]; + + buildInputs = [ ceph ]; + installPhase = '' + runHook preInstall mkdir -p $out/bin cp ./_output/* $out/bin + runHook postInstall ''; - meta = with lib; { - homepage = "https://ceph.com/"; + meta = { description = "Container Storage Interface (CSI) driver for Ceph RBD and CephFS"; + downloadPage = "https://github.com/ceph/ceph-csi"; + changelog = "https://github.com/ceph/ceph-csi/releases/tag/v${version}"; + homepage = "https://ceph.com/"; + license = lib.licenses.asl20; mainProgram = "cephcsi"; - license = [ licenses.asl20 ]; - maintainers = with maintainers; [ johanot ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with lib.maintainers; [ johanot ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; } diff --git a/pkgs/by-name/ch/cheese/package.nix b/pkgs/by-name/ch/cheese/package.nix index 9ac53092c114..4a39d865d363 100644 --- a/pkgs/by-name/ch/cheese/package.nix +++ b/pkgs/by-name/ch/cheese/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/cheese/${lib.versions.major version}/cheese-${version}.tar.xz"; sha256 = "XyGFxMmeVN3yuLr2DIKBmVDlSVLhMuhjmHXz7cv49o4="; }; diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index 3fd4a1af80b4..f96db4760b68 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.88"; + version = "1.0.89"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-fPCafa0V5lbzXocUa1gabLxAcPbg8rqOExMT0QnGUk8="; + sha256 = "sha256-hX/tmeQYcTDs3JZSFhvzCrcbqvfa78MXtTo8VcuAqxY="; }; - vendorHash = "sha256-bEyknQc7TCxbWj7VsjJ2WGz65BG8HaP8ldL2kb+bbtc="; + vendorHash = "sha256-bwmJnKxdvVskrrTCa0cdpiYeFVZWTYyaFNEbeymT7P0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 2a0a368d28f7..228b3e608a6e 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -9,7 +9,7 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "3.8.1"; + version = "3.8.2"; nodejs = nodejs_18; @@ -17,10 +17,10 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-8dxV57uivjcXz6JHttFNvivcIbNRAwZKSvGv/SST81E="; + hash = "sha256-cBFdxJrH/1l6YpvdJTeLQf1zl6pm3IbPryimtewh9fc="; }; - npmDepsHash = "sha256-2lROdsq3tR4SYxMoTJYY6EyHxudS7p7wOJq+RxE2btk="; + npmDepsHash = "sha256-cY7wB0IQPLHOOuOLunjeJASp1Ba7ri8cj05/2HveJ7A="; dontNpmBuild = true; diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix index 2e0a07fe5d5e..9fe357071439 100644 --- a/pkgs/by-name/cl/cljfmt/package.nix +++ b/pkgs/by-name/cl/cljfmt/package.nix @@ -11,7 +11,7 @@ buildGraalvmNativeImage rec { version = "0.12.0"; src = fetchurl { - url = "https://github.com/weavejester/${pname}/releases/download/${version}/${pname}-${version}-standalone.jar"; + url = "https://github.com/weavejester/cljfmt/releases/download/${version}/cljfmt-${version}-standalone.jar"; sha256 = "sha256-JdrMsRmTT8U8RZDI2SnQxM5WGMpo1pL2CQ5BqLxcf5M="; }; diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index 3109ad9885fd..fb56f3e86573 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.32.0"; + version = "15.33.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-Uk7QUbcYqbWgu6pKs4iiRwPJASZTDmN1Kv338ZKJQgk="; + sha256 = "sha256-Fdy/Ovx8VCBe+pO/87VHVEnafJ9Ms8Pop0DOLYOHuQY="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/co/compose2nix/package.nix b/pkgs/by-name/co/compose2nix/package.nix new file mode 100644 index 000000000000..87b875ab33f3 --- /dev/null +++ b/pkgs/by-name/co/compose2nix/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + compose2nix, +}: + +buildGoModule rec { + pname = "compose2nix"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "aksiksi"; + repo = "compose2nix"; + rev = "v${version}"; + hash = "sha256-2t4pXTzd5TDpAOzNS8MfnE9p8Rm55OPLaEpSPF4/UbE="; + }; + + vendorHash = "sha256-SwJzyOXE23BLoJ+efFuSIhDTMjirEUmBhGGmgrnKhXw="; + + passthru.tests = { + version = testers.testVersion { + package = compose2nix; + version = "compose2nix v${version}"; + }; + }; + + meta = { + homepage = "https://github.com/aksiksi/compose2nix"; + changelog = "https://github.com/aksiksi/compose2nix/releases/tag/${src.rev}"; + description = "Generate a NixOS config from a Docker Compose project"; + license = lib.licenses.mit; + mainProgram = "compose2nix"; + maintainers = with lib.maintainers; [ aksiksi ]; + }; +} diff --git a/pkgs/by-name/co/convmv/package.nix b/pkgs/by-name/co/convmv/package.nix new file mode 100644 index 000000000000..65fbd85e37d6 --- /dev/null +++ b/pkgs/by-name/co/convmv/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchzip, + perl, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "convmv"; + version = "2.05"; + + outputs = [ + "out" + "man" + ]; + + src = fetchzip { + url = "https://www.j3e.de/linux/convmv/convmv-${finalAttrs.version}.tar.gz"; + hash = "sha256-ts9xAPRGUoS0XBRTmpb+BlGW1hmGyUs+rQLyUEgiZ54="; + }; + + strictDeps = true; + + nativeBuildInputs = [ perl ]; + + buildInputs = [ perl ]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "MANDIR=${placeholder "man"}/share/man" + ]; + + checkTarget = "test"; + + # testsuite.tar contains filenames that aren't valid UTF-8. Extraction of + # testsuite.tar will fail as APFS enforces that filenames are valid UTF-8. + doCheck = !stdenv.isDarwin; + + prePatch = + lib.optionalString finalAttrs.doCheck '' + tar -xf testsuite.tar + '' + + '' + patchShebangs --host . + ''; + + dontPatchShebangs = true; + + meta = with lib; { + description = "Converts filenames from one encoding to another"; + downloadPage = "https://www.j3e.de/linux/convmv/"; + license = with licenses; [ + gpl2Only + gpl3Only + ]; + maintainers = with maintainers; [ al3xtjames ]; + mainProgram = "convmv"; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix index 25a0952fc7da..78c692181f4e 100644 --- a/pkgs/by-name/co/coppwr/package.nix +++ b/pkgs/by-name/co/coppwr/package.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { ''; postFixup = '' - patchelf $out/bin/${pname} \ + patchelf $out/bin/coppwr \ --add-rpath ${lib.makeLibraryPath [ libGL libxkbcommon wayland ]} ''; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 127837e3f322..2c8cd21562de 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-edit"; rev = "epoch-${version}"; hash = "sha256-ZG5Ctyp2crTDS0WxhQqwN4T6WR5qW79HTbICMlOA3P8="; }; @@ -93,7 +93,7 @@ rustPlatform.buildRustPackage rec { # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2 postInstall = '' - wrapProgram "$out/bin/${pname}" \ + wrapProgram "$out/bin/cosmic-edit" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon wayland diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 4e03188b5faf..32994724519a 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-files"; rev = "epoch-${version}"; hash = "sha256-UwQwZRzOyMvLRRmU2noxGrqblezkR8J2PNMVoyG0M0w="; }; @@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec { # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2 postInstall = '' - wrapProgram "$out/bin/${pname}" \ + wrapProgram "$out/bin/cosmic-files" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi wayland ]} ''; diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 216be5d959fb..c2859ba558de 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-store"; rev = "epoch-${version}"; hash = "sha256-RuqWO2/sqMMd9xMRClAy7cwv7iCTEC15TZ7JLBZ2zwM="; fetchSubmodules = true; @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec { # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2 postInstall = '' - wrapProgram "$out/bin/${pname}" \ + wrapProgram "$out/bin/cosmic-store" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index bd0fde3b8c95..699c8a8564e3 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "cosmic-term"; rev = "epoch-${version}"; hash = "sha256-dY4QGQXJFL+yjCYRGCg3NfMLMjlEBSEmxHn68PvhCAQ="; }; @@ -95,7 +95,7 @@ rustPlatform.buildRustPackage rec { # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2 postInstall = '' - wrapProgram "$out/bin/${pname}" \ + wrapProgram "$out/bin/cosmic-term" \ --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libxkbcommon diff --git a/pkgs/by-name/cr/crate2nix/package.nix b/pkgs/by-name/cr/crate2nix/package.nix index 12ce3f76edeb..8016d2db2fe2 100644 --- a/pkgs/by-name/cr/crate2nix/package.nix +++ b/pkgs/by-name/cr/crate2nix/package.nix @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "nix-community"; - repo = pname; + repo = "crate2nix"; rev = version; hash = "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE="; }; - sourceRoot = "${src.name}/${pname}"; + sourceRoot = "${src.name}/crate2nix"; cargoHash = "sha256-nQ1VUCFMmpWZWvKFbyJFIZUJ24N9ZPY8JCHWju385NE="; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; postInstall = '' - wrapProgram $out/bin/${pname} \ + wrapProgram $out/bin/crate2nix \ --prefix PATH ":" ${ lib.makeBinPath [ cargo @@ -44,8 +44,8 @@ rustPlatform.buildRustPackage rec { for shell in bash zsh fish do - $out/bin/${pname} completions -s $shell - installShellCompletion ${pname}.$shell || installShellCompletion --$shell _${pname} + $out/bin/crate2nix completions -s $shell + installShellCompletion crate2nix.$shell || installShellCompletion --$shell _crate2nix done ''; diff --git a/pkgs/by-name/cr/cronie/package.nix b/pkgs/by-name/cr/cronie/package.nix new file mode 100644 index 000000000000..3cad6e4d1d7a --- /dev/null +++ b/pkgs/by-name/cr/cronie/package.nix @@ -0,0 +1,41 @@ +{ + lib, + autoreconfHook, + fetchFromGitHub, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cronie"; + version = "1.7.2"; + + src = fetchFromGitHub { + owner = "cronie-crond"; + repo = "cronie"; + rev = "cronie-${finalAttrs.version}"; + hash = "sha256-WrzdpE9t7vWpc8QFoFs+S/HgHwsidRNmfcHp7ltSWQw="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + outputs = [ + "out" + "man" + ]; + + strictDeps = true; + + meta = { + homepage = "https://github.com/cronie-crond/cronie"; + description = "Cron replacement, based on vixie-cron"; + changelog = "https://github.com/cronie-crond/cronie/blob/master/ChangeLog"; + license = with lib.licenses; [ + gpl2Plus + isc + lgpl21Plus + ]; + mainProgram = "crond"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/cs/csv-tui/package.nix b/pkgs/by-name/cs/csv-tui/package.nix new file mode 100644 index 000000000000..cab49e4ddaa7 --- /dev/null +++ b/pkgs/by-name/cs/csv-tui/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "csv-tui"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "nathangavin"; + repo = "csv-tui"; + rev = "v${version}"; + hash = "sha256-IRXLwZ2FHcCDmDVJ0xnV/4q+X2AFXPX/+Ph4Xxo3DyM="; + }; + + cargoHash = "sha256-wgeVcX0zSXffAuvKw2eKXC846WlC8F9UGMoxP3IXoLE="; + + meta = { + description = "Terminal based csv editor which is designed to be memory efficient but still useful"; + homepage = "https://github.com/nathangavin/csv-tui"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ottoblep ]; + mainProgram = "csv_tui"; + }; +} diff --git a/pkgs/by-name/cu/cups-idprt-barcode/package.nix b/pkgs/by-name/cu/cups-idprt-barcode/package.nix new file mode 100644 index 000000000000..1f9bb0b168f9 --- /dev/null +++ b/pkgs/by-name/cu/cups-idprt-barcode/package.nix @@ -0,0 +1,52 @@ +{ + stdenvNoCC, + lib, + fetchurl, + autoPatchelfHook, + cups, + unzip, +}: + +stdenvNoCC.mkDerivation { + pname = "cups-idprt-barcode"; + version = "1.2.1"; + + src = fetchurl { + name = "idprt_label_printer_linux_driver.zip"; # This is not the original name, but there was debate about whether rec or finalAttrs should be used, so I just renamed it + url = "https://www.idprt.com/prt_v2/files/down_file/id/265/fid/600.html"; # NOTE: This is NOT an HTML page, but a ZIP file + hash = "sha256-jp8DDaTmCgNrHCJSSz1K3xDcSB8dQm6i1pICaMrBFaQ="; + }; + + buildInputs = [ cups ]; + nativeBuildInputs = [ + autoPatchelfHook + unzip + ]; + + installPhase = + let + arch = builtins.getAttr stdenvNoCC.hostPlatform.system { + x86_64-linux = "x64"; + x86-linux = "x86"; + }; + in + '' + runHook preInstall + mkdir -p $out/share/cups/model $out/lib/cups/filter + cp -r filter/${arch}/. $out/lib/cups/filter + cp -r ppd/. $out/share/cups/model + chmod +x $out/lib/cups/filter/* + runHook postInstall + ''; + + meta = { + description = "CUPS drivers for iDPRT barcode printers (iD2P, iD2X, iD4P, iD4S, iE2P, iE2X, iE4P, iE4S, iT4B, iT4E, iT4P, iT4S, iT4X, iX4E, iX4L, iX4P, iX4E, iX6P)"; + platforms = [ + "x86_64-linux" + "x86-linux" + ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ pandapip1 ]; + }; +} diff --git a/pkgs/by-name/cu/cups-idprt-mt888/package.nix b/pkgs/by-name/cu/cups-idprt-mt888/package.nix new file mode 100644 index 000000000000..27441a467b30 --- /dev/null +++ b/pkgs/by-name/cu/cups-idprt-mt888/package.nix @@ -0,0 +1,52 @@ +{ + stdenvNoCC, + lib, + fetchurl, + autoPatchelfHook, + cups, + unzip, +}: + +stdenvNoCC.mkDerivation { + pname = "cups-idprt-mt888"; + version = "1.2.0"; + + src = fetchurl { + name = "idprt_mt888_printer_linux_driver.zip"; + url = "https://www.idprt.com/prt_v2/files/down_file/id/324/fid/780.html"; # NOTE: This is NOT an HTML page, but a ZIP file + hash = "sha256-fmKDRa6NOXMM6IuxRK8sjToGhdPiHO6ZdfUVvR1KKb0="; + }; + + buildInputs = [ cups ]; + nativeBuildInputs = [ + autoPatchelfHook + unzip + ]; + + installPhase = + let + arch = builtins.getAttr stdenvNoCC.hostPlatform.system { + x86_64-linux = "x64"; + x86-linux = "x86"; + }; + in + '' + runHook preInstall + mkdir -p $out/share/cups/model $out/lib/cups/filter + cp -r filter/${arch}/. $out/lib/cups/filter + cp -r ppd/. $out/share/cups/model + chmod +x $out/lib/cups/filter/* + runHook postInstall + ''; + + meta = { + description = "CUPS driver for the iDPRT MT888"; + platforms = [ + "x86_64-linux" + "x86-linux" + ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ pandapip1 ]; + }; +} diff --git a/pkgs/by-name/cu/cups-idprt-mt890/package.nix b/pkgs/by-name/cu/cups-idprt-mt890/package.nix new file mode 100644 index 000000000000..ca3baacbcfe4 --- /dev/null +++ b/pkgs/by-name/cu/cups-idprt-mt890/package.nix @@ -0,0 +1,53 @@ +{ + stdenvNoCC, + lib, + fetchurl, + autoPatchelfHook, + cups, + unzip, +}: + +stdenvNoCC.mkDerivation { + pname = "cups-idprt-mt890"; + version = "1.2.0"; + + src = fetchurl { + name = "idprt_mt890_printer_linux_driver.zip"; + url = "https://www.idprt.com/prt_v2/files/down_file/id/320/fid/778.html"; # NOTE: This is NOT an HTML page, but a ZIP file + hash = "sha256-8yH+DSPRp4mjKOXw90TiGA4OzxJKHpBUMSLh3L2njw8="; + }; + + buildInputs = [ cups ]; + nativeBuildInputs = [ + autoPatchelfHook + unzip + ]; + + installPhase = + let + arch = builtins.getAttr stdenvNoCC.hostPlatform.system { + x86_64-linux = "x64"; + x86-linux = "x86"; + }; + in + '' + runHook preInstall + mkdir -p $out/share/cups/model $out/lib/cups/filter + cp -r filter/${arch}/. $out/lib/cups/filter + cp -r ppd/. $out/share/cups/model + rm $out/share/cups/model/*.ppd~ + chmod +x $out/lib/cups/filter/* + runHook postInstall + ''; + + meta = { + description = "CUPS driver for the iDPRT MT890"; + platforms = [ + "x86_64-linux" + "x86-linux" + ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ pandapip1 ]; + }; +} diff --git a/pkgs/by-name/cu/cups-idprt-sp900/package.nix b/pkgs/by-name/cu/cups-idprt-sp900/package.nix new file mode 100644 index 000000000000..ed07c4fc36be --- /dev/null +++ b/pkgs/by-name/cu/cups-idprt-sp900/package.nix @@ -0,0 +1,61 @@ +{ + stdenvNoCC, + lib, + fetchurl, + autoPatchelfHook, + cups, + e2fsprogs, + krb5, + libxcrypt-legacy, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cups-idprt-sp900"; + version = "1.4.0"; + + src = fetchurl { + name = "idprt_sp900_printer_linux_driver.zip"; + url = "https://www.idprt.com/prt_v2/files/down_file/id/176/fid/498.html"; # NOTE: This is NOT an HTML page, but a ZIP file + hash = "sha256-+YVQTrqpi16xX+d/ulMtffpA9X7hwtWRiS/mIAw13n8="; + }; + sourceRoot = "idprt_sp900_printer_linux_driver_v${finalAttrs.version}/idprt_sp900_printer_linux_driver_v${finalAttrs.version}"; # >:| + + buildInputs = [ + cups + e2fsprogs + krb5 + libxcrypt-legacy + ]; + nativeBuildInputs = [ + autoPatchelfHook + unzip + ]; + + installPhase = + let + arch = builtins.getAttr stdenvNoCC.hostPlatform.system { + x86_64-linux = "x64"; + x86-linux = "x86"; + }; + in + '' + runHook preInstall + mkdir -p $out/share/cups/model $out/lib/cups/filter + cp -r filter/${arch}/. $out/lib/cups/filter + cp -r ppd/. $out/share/cups/model + chmod +x $out/lib/cups/filter/* + runHook postInstall + ''; + + meta = { + description = "CUPS driver for the iDPRT SP900"; + platforms = [ + "x86_64-linux" + "x86-linux" + ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ pandapip1 ]; + }; +}) diff --git a/pkgs/by-name/cu/cups-idprt-tspl/package.nix b/pkgs/by-name/cu/cups-idprt-tspl/package.nix new file mode 100644 index 000000000000..60aa4c8c80d8 --- /dev/null +++ b/pkgs/by-name/cu/cups-idprt-tspl/package.nix @@ -0,0 +1,61 @@ +{ + stdenvNoCC, + lib, + fetchurl, + autoPatchelfHook, + cups, + e2fsprogs, + krb5, + libxcrypt-legacy, + unzip, +}: + +stdenvNoCC.mkDerivation { + pname = "cups-idprt-tspl"; + version = "1.4.7"; + + src = fetchurl { + name = "idprt_tspl_printer_linux_driver.zip"; # This is not the original name, but there was debate about whether rec or finalAttrs should be used, so I just renamed it + url = "https://www.idprt.com/prt_v2/files/down_file/id/283/fid/668.html"; # NOTE: This is NOT an HTML page, but a ZIP file + hash = "sha256-P3AKSqCh5onOv0itJayEJ6P5pmlkOwOh1OtUjg40BRw="; + }; + + buildInputs = [ + cups + e2fsprogs + krb5 + libxcrypt-legacy + ]; + nativeBuildInputs = [ + autoPatchelfHook + unzip + ]; + + installPhase = + let + arch = builtins.getAttr stdenvNoCC.hostPlatform.system { + x86_64-linux = "x64"; + x86-linux = "x86"; + }; + in + '' + runHook preInstall + mkdir -p $out/share/cups/model $out/lib/cups/filter + cp -r filter/${arch}/. $out/lib/cups/filter + cp -r ppd/. $out/share/cups/model + rm $out/share/cups/model/*.ppd~ + chmod +x $out/lib/cups/filter/* + runHook postInstall + ''; + + meta = { + description = "CUPS drivers for TSPL-based iDPRT thermal label printers (SP210, SP310, SP320, SP320E, SP410, SP410BT, SP420, SP450, SP460BT)"; + platforms = [ + "x86_64-linux" + "x86-linux" + ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ pandapip1 ]; + }; +} diff --git a/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix b/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix index 14f89056daf9..32470d4ab4ba 100644 --- a/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix +++ b/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { # for lib/cups/filter/kyofilter_pre_H wrapPythonProgramsIn $out/lib/cups/filter "$propagatedBuildInputs" - install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/${pname}/copyright + install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/cups-kyocera-3500-4500/copyright ''; meta = with lib; { diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix index 6e4891f10eba..798e87d2877e 100644 --- a/pkgs/by-name/da/dapr-cli/package.nix +++ b/pkgs/by-name/da/dapr-cli/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-DIhedooEJTRdszl59V2lTkCBkj471ZEVEyqOFEQniSY="; + sha256 = "sha256-NjGTH9aKupv/32ibqMSmPPaNA0TSq6AXjN8cjVD6r/M="; }; vendorHash = "sha256-Ec1z8Wvq8gk8dYcm10ujy7zYWR7Mus1nl21Od3SUFrU="; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 2ce474f5969f..d741337c78b3 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -8,11 +8,14 @@ gnused, autoPatchelfHook, wrapGAppsHook3, + gtk3, + swt, + glib, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.1.4"; + version = "24.1.5"; src = let @@ -25,10 +28,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-xO9hQxiEtZJyoO3PQrNPuLPBj8iGF9tvpHkj9Z8oMMc="; - aarch64-linux = "sha256-4dkR0DR/e+gkMytFGNS5gJ/Eo6ih2pacYMR3LdLMv/E="; - x86_64-darwin = "sha256-LUlw7PMP1NpqIJ3qwY3ft+8gsQP8Cu6YqkaiH5Z5qZw="; - aarch64-darwin = "sha256-+7SkO6gv8kn4z9ccY5HIfLjnpsv89MBYil3H2zpQSZs="; + x86_64-linux = "sha256-FdrQDQ+2nsZp44+sARXT89/ZXlkl/OGej1JuezXGgU4="; + aarch64-linux = "sha256-oNP0ntsQ79ckNXuQ3TeVf9ooGzwCq7WXI0TbjTLC5DI="; + x86_64-darwin = "sha256-YcmMZPigykA9vNEF32NzCQWMWPt1GM7VaWGSAZp/1YM="; + aarch64-darwin = "sha256-tz+Ap/YZJbc+obCLqq2b2HgRUORWkaOHVGEEJtwEJXo="; }; in fetchurl { @@ -59,7 +62,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp -r * $out/opt/dbeaver makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : "${openjdk17}/bin" \ - --set JAVA_HOME "${openjdk17.home}" + --set JAVA_HOME "${openjdk17.home}" \ + --prefix CLASSPATH : "$out/dbeaver/plugins/*:${swt}/jars/swt.jar" \ + --prefix LD_LIBRARY_PATH : "$out/lib:${ + lib.makeLibraryPath [ + swt + gtk3 + glib + ] + }" mkdir -p $out/share/icons/hicolor/256x256/apps ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png diff --git a/pkgs/by-name/db/dbqn/package.nix b/pkgs/by-name/db/dbqn/package.nix index ff7f8fe14a7f..0e9d311c4dc7 100644 --- a/pkgs/by-name/db/dbqn/package.nix +++ b/pkgs/by-name/db/dbqn/package.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { '' + (if buildNativeImage then '' mv dbqn $out/bin '' else '' - mkdir -p $out/share/${pname} - mv BQN.jar $out/share/${pname}/ + mkdir -p $out/share/dbqn + mv BQN.jar $out/share/dbqn/ makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dbqn" \ - --add-flags "-jar $out/share/${pname}/BQN.jar" + --add-flags "-jar $out/share/dbqn/BQN.jar" '') + '' ln -s $out/bin/dbqn $out/bin/bqn diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix index 44fca17bec32..b40371f51487 100644 --- a/pkgs/by-name/dc/dconf-editor/package.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "45.0.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz"; sha256 = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0="; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "dconf-editor"; }; }; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/by-name/de/deltachat-desktop/package.nix similarity index 94% rename from pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix rename to pkgs/by-name/de/deltachat-desktop/package.nix index e02d1972ee13..bf70d4672a05 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , copyDesktopItems -, electron +, electron_30 , buildGoModule , esbuild , fetchFromGitHub @@ -15,12 +15,13 @@ , roboto , sqlcipher , stdenv -, CoreServices +, darwin , testers , deltachat-desktop }: let + electron = electron_30; esbuild' = esbuild.override { buildGoModule = args: buildGoModule (args // rec { version = "0.19.12"; @@ -36,16 +37,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.46.2"; + version = "1.46.5"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-5XGtyfc7Kak7qSQOQAH5gFtSaHeWclRhtsYSGPIQo6w="; + hash = "sha256-u/2/lCQpUf5bxKPseHz6SFmiW0m9SywuA5Ng3BBnX88="; }; - npmDepsHash = "sha256-4UPDNz0aw4VH3bMT+s/7DE6+ZPNP5w1iGCRpZZMXzPc="; + npmDepsHash = "sha256-jnuSL0yr6E8P0Tev9rMsfCLs59WStaH19DhZe0zthmw="; nativeBuildInputs = [ jq @@ -59,7 +60,7 @@ buildNpmPackage rec { buildInputs = [ deltachat-rpc-server ] ++ lib.optionals stdenv.isDarwin [ - CoreServices + darwin.apple_sdk.frameworks.CoreServices ]; env = { diff --git a/pkgs/by-name/de/devhelp/package.nix b/pkgs/by-name/de/devhelp/package.nix index 97795c1d9f7a..54991136da64 100644 --- a/pkgs/by-name/de/devhelp/package.nix +++ b/pkgs/by-name/de/devhelp/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/devhelp-${version}.tar.xz"; sha256 = "Y87u/QU5LgIESIHvHs1yQpNVPaVzW378CCstE/6F3QQ="; }; diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix new file mode 100644 index 000000000000..d2660fff82ab --- /dev/null +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -0,0 +1,33 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "dezoomify-rs"; + version = "2.12.4"; + + src = fetchFromGitHub { + owner = "lovasoa"; + repo = "dezoomify-rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-7CRwlnIItJ89qqemkJbx5QjcLrwYrvpcjVYX5ZWP0W4="; + }; + + cargoHash = "sha256-v48eM43+/dt2M1J9yfjfTpBetv6AA2Hhzu8rrL3gojg="; + + checkFlags = [ + # Tests failing due to networking errors in Nix build environment + "--skip=local_generic_tiles" + "--skip=custom_size_local_zoomify_tiles" + ]; + + meta = { + description = "Zoomable image downloader for Google Arts & Culture, Zoomify, IIIF, and others"; + homepage = "https://github.com/lovasoa/dezoomify-rs/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fsagbuya ]; + mainProgram = "dezoomify-rs"; + }; +} diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index 4df0c8b11c34..d0e76fc29c4f 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , bash , nix +, nixos-install-tools , coreutils }: @@ -26,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { for i in disko disko-install; do sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i" chmod 755 "$out/bin/$i" - wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils ]} + wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install-tools ]} done runHook postInstall ''; diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix index 8121f554a291..0c9265415f15 100644 --- a/pkgs/by-name/dm/dmarc-report-converter/package.nix +++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { ]; passthru.tests = { - simple = runCommand "${pname}-test" { } '' + simple = runCommand "dmarc-report-converter-test" { } '' ${dmarc-report-converter}/bin/dmarc-report-converter -h > $out ''; }; diff --git a/pkgs/by-name/dn/dnsmap/package.nix b/pkgs/by-name/dn/dnsmap/package.nix new file mode 100644 index 000000000000..1d72d26f2390 --- /dev/null +++ b/pkgs/by-name/dn/dnsmap/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoconf, + automake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dnsmap"; + tag = "0.36"; + version = "${finalAttrs.tag}-unstable-2024-08-20"; + + src = fetchFromGitHub { + owner = "resurrecting-open-source-projects"; + repo = "dnsmap"; + rev = "b5b4b1a7764e141f2551584d9fad3a973951eafe"; + hash = "sha256-RTZe0kb/Fq9kIdnHQO//OP+Uop2Z5r22Z7+rQdCFsl4="; + }; + + strictDeps = true; + + preConfigure = '' + autoreconf -i + ''; + + configureFlags = [ "--prefix=$(out)" ]; + + nativeBuildInputs = [ + autoconf + automake + ]; + + meta = { + description = "Scan for subdomains using brute-force techniques"; + homepage = "https://github.com/resurrecting-open-source-projects/dnsmap"; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ heywoodlh ]; + changelog = "https://github.com/resurrecting-open-source-projects/dnsmap/releases/tag/${finalAttrs.tag}"; + mainProgram = "dnsmap"; + }; +}) diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index a2dae9664cb9..a285b546d75b 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; rev = "refs/tags/v${version}"; - hash = "sha256-AEgf46LCqQCKdq7yEvvumtVVZltPUn8ktLuFiLJar3g="; + hash = "sha256-j30ZEYO8OBMhEPn+LDipZ/aciWrI9QWStz6tHq0uX7E="; }; - npmDepsHash = "sha256-TdMGkw5/aP9Ki65Ik7286fH5FD5VAfFgATul9ZOHWxA="; + npmDepsHash = "sha256-ZSnrV1C9NX/Wq7cjKlM1w/m6T7snfnPru5g0pqFTGis="; dontNpmBuild = true; diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 4f85c25244d7..fa15709d3c0a 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.16"; + version = "1.1.17"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-jVK4CKd4QkJp4bu9OrEo8oHxfVpEJd0saSbgc+aeKxU="; + hash = "sha256-TKlhPvfnq62XWTo2twKO8hEjBZW0mWkKruXWhwirtR4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix index 9e2add99d634..a4f7384637fe 100644 --- a/pkgs/by-name/ds/dsda-doom/package.nix +++ b/pkgs/by-name/ds/dsda-doom/package.nix @@ -1,63 +1,56 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, SDL2 -, SDL2_mixer -, SDL2_image -, fluidsynth -, soundfont-fluid -, portmidi -, dumb -, libvorbis -, libmad -, libGLU -, libzip +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + SDL2, + SDL2_mixer, + SDL2_image, + fluidsynth, + portmidi, + dumb, + libvorbis, + libmad, + libGLU, + libzip, + alsa-lib, }: stdenv.mkDerivation rec { pname = "dsda-doom"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "kraflab"; repo = "dsda-doom"; rev = "v${version}"; - hash = "sha256-4oVQcZ/GOYc9lXMgb3xMXg9ZNB9rYBosbf09cXge6MI="; + hash = "sha256-X2v9eKiIYX4Zi3C1hbUoW4mceRVa6sxpBsP4Npyo4hM="; }; sourceRoot = "${src.name}/prboom2"; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - SDL2 - SDL2_mixer - SDL2_image - fluidsynth - portmidi + alsa-lib dumb - libvorbis - libmad + fluidsynth libGLU + libmad + libvorbis libzip + portmidi + SDL2 + SDL2_image + SDL2_mixer ]; - # Fixes impure path to soundfont - prePatch = '' - substituteInPlace src/m_misc.c --replace \ - "/usr/share/sounds/sf3/default-GM.sf3" \ - "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2" - ''; - - meta = with lib; { + meta = { homepage = "https://github.com/kraflab/dsda-doom"; description = "Advanced Doom source port with a focus on speedrunning, successor of PrBoom+"; mainProgram = "dsda-doom"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.Gliczy ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ Gliczy ]; }; } diff --git a/pkgs/by-name/du/dualsensectl/package.nix b/pkgs/by-name/du/dualsensectl/package.nix index 63eefab713dc..347edafa9aee 100644 --- a/pkgs/by-name/du/dualsensectl/package.nix +++ b/pkgs/by-name/du/dualsensectl/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dualsensectl"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "nowrep"; repo = "dualsensectl"; rev = "v${finalAttrs.version}"; - hash = "sha256-+OSp9M0A0J4nm7ViDXG63yrUZuZxR7gyckwSCdy3qm0="; + hash = "sha256-Wu3TcnHoMZELC7I2PlE8z00+CycgpNd6SiZd5MjYD+I="; }; postPatch = '' diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix index 433649629cb0..0676e970a81f 100644 --- a/pkgs/by-name/du/dummyhttp/package.nix +++ b/pkgs/by-name/du/dummyhttp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dummyhttp"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "dummyhttp"; rev = "v${version}"; - hash = "sha256-MDkyJAVNpCaAomAEweYrQeQWtil8bYo34ko9rAu+VBU="; + hash = "sha256-LgOIL4kg3cH0Eo+Z+RGwxZTPzCNSGAdKT7N8tZWHSQQ="; }; - cargoHash = "sha256-JkA0qW/MQH+XmiD9eiT0s70HxNNYyk9ecBo4k5nUF10="; + cargoHash = "sha256-bw0VlPHjNZkpLVJZrB3aaQGkwvQpkJGIn+hi0yn2M4s="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 71f0882371af..21d897bc2fde 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -33,27 +33,27 @@ pkg-config, rnnoise, rubberband, - speexdsp, soundtouch, + speexdsp, tbb, wrapGAppsHook4, zam-plugins, zita-convolver, }: + let # Fix crashes with speexdsp effects speexdsp' = speexdsp.override { withFftw3 = false; }; in - stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.1.7"; + version = "7.1.8"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; - rev = "v${version}"; - hash = "sha256-y7we7/MQWweAoZkM8SuHiOTVyWFj9/foufLYBum/KKc="; + rev = "refs/tags/v${version}"; + hash = "sha256-eDjtmr100WOCd0k0p3rUEtu6O9LlSGs43oaIXT07ikI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix index 9ee5fe949590..0e2970f04097 100644 --- a/pkgs/by-name/ei/eigenlayer/package.nix +++ b/pkgs/by-name/ei/eigenlayer/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "eigenlayer"; - version = "0.10.0"; + version = "0.10.2"; src = fetchFromGitHub { owner = "Layr-Labs"; repo = "eigenlayer-cli"; rev = "v${version}"; - hash = "sha256-bn61E2oKkeQTLeckAdQcX7h8rYLJZF+Cd4AtVbsH/KA="; + hash = "sha256-RfDDmGuG+WRGLTrCdqgGsNWlsfn6x0w21Sh+yc4MwpA="; }; - vendorHash = "sha256-Yrj+UkZL+8yHQdzIS8fI6fPLcdAHpcL9PV9Ql8P0Pfo="; + vendorHash = "sha256-mvV/AsSSRsCf7TrKLZgo+AHEWXCnPUEsnLOvt73eFf4="; ldflags = ["-s" "-w"]; subPackages = ["cmd/eigenlayer"]; diff --git a/pkgs/by-name/ei/eintopf/frontend.nix b/pkgs/by-name/ei/eintopf/frontend.nix index f16198b30484..80cb19001f5b 100644 --- a/pkgs/by-name/ei/eintopf/frontend.nix +++ b/pkgs/by-name/ei/eintopf/frontend.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/backstage"; offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; + yarnLock = "${finalAttrs.src}/backstage/yarn.lock"; hash = "sha256-Z/Pkk/qCWwr99g11DjEgnisPfxOhfD8+OCn6otxJtfI="; }; diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 2b985134584b..58ce467b2030 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.188.0"; + version = "0.189.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-ZEMTPvmRhUFqaugtvgWv9EbuE6sF489ay0C3QUuAxfo="; + hash = "sha256-YG1p7T2K1b3LO2MiTkCC88ZpgCpVTSCBUoCEcJK+V7I="; }; - vendorHash = "sha256-xz+hEgLNplXJIfqyNE10Zc5SwSdedLAL3tHuh6875+A="; + vendorHash = "sha256-W7tAdImEsPWSQkK8FnXgx5ADZ2JOdVc2xNBkNM11FOw="; doCheck = false; diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 585d072dae42..b355f96513c9 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage { src = fetchFromGitLab { domain = "gitlab.computer.surgery"; owner = "charles"; - repo = pname; + repo = "engage"; rev = "v${version}"; hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk="; }; @@ -27,11 +27,11 @@ rustPlatform.buildRustPackage { ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ( - "installShellCompletion --cmd ${pname} " + "installShellCompletion --cmd engage " + builtins.concatStringsSep " " (builtins.map - (shell: "--${shell} <($out/bin/${pname} completions ${shell})") + (shell: "--${shell} <($out/bin/engage completions ${shell})") [ "bash" "fish" diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix index 27aa4149e6c5..9ef4b303828b 100644 --- a/pkgs/by-name/eo/eog/package.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/eog/${lib.versions.major version}/eog-${version}.tar.xz"; sha256 = "sha256-tQ8yHHCsZK97yqW0Rg3GdbPKYP2tOFYW86x7dw4GZv4="; }; @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "eog"; }; }; diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index fce52129f0ac..228e20ae0eab 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz"; hash = "sha256-GzaoOdscjYmAZuGb54uZWTCgovKohvFJ5PZOF1XwZPc="; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { prePatch = '' substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \ - --subst-var-by EDS ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ + --subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${version}"} \ --subst-var-by GDS ${glib.getSchemaPath gsettings-desktop-schemas} patches="$patches $PWD/hardcode-gsettings.patch" ''; @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { ''; postInstall = lib.optionalString stdenv.isDarwin '' - ln -s $out/lib/${pname}/*.dylib $out/lib/ + ln -s $out/lib/evolution-data-server/*.dylib $out/lib/ ''; passthru = { diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index ef846a9fb406..e3f8a04e97a4 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.21.2"; + version = "2.21.3"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-wh8k/+2Wj5XhYvBD+s7IHLGi7v7gxn6rxLHlZTvw+Rk="; + hash = "sha256-AnURAH5tSIwmbLtB7FjjrOODGxrXbMOIqVjIBwOU+lo="; }; outputs = [ diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index c506b2e3747b..b0c1d682f305 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -3,7 +3,7 @@ stdenv, buildNpmPackage, fetchFromGitHub, - electron_30, + electron_31, darwin, copyDesktopItems, makeDesktopItem, @@ -15,12 +15,12 @@ let src = fetchFromGitHub { owner = "jeffvli"; - repo = pname; + repo = "feishin"; rev = "v${version}"; hash = "sha256-UOY0wjWGK7sal/qQbbkHjFUIA49QtbO+Ei6hSTOyHWk="; }; - electron = electron_30; + electron = electron_31; in buildNpmPackage { inherit pname version; @@ -123,7 +123,7 @@ buildNpmPackage { mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps ln -s \ $out/share/feishin/resources/assets/icons/"$size"x"$size".png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + $out/share/icons/hicolor/"$size"x"$size"/apps/feishin.png done '' + '' @@ -135,7 +135,7 @@ buildNpmPackage { name = "feishin"; desktopName = "Feishin"; comment = "Full-featured Subsonic/Jellyfin compatible desktop music player"; - icon = pname; + icon = "feishin"; exec = "feishin %u"; categories = [ "Audio" diff --git a/pkgs/by-name/fi/find-billy/package.nix b/pkgs/by-name/fi/find-billy/package.nix index aae851fbacd5..6ff964c684e9 100644 --- a/pkgs/by-name/fi/find-billy/package.nix +++ b/pkgs/by-name/fi/find-billy/package.nix @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot mkdir -p $out/share/find-billy - godot3-headless --export-pack 'Linux/X11' $out/share/${pname}/${pname}.pck - makeWrapper ${godot3}/bin/godot3 $out/bin/${pname} \ + godot3-headless --export-pack 'Linux/X11' $out/share/find-billy/find-billy.pck + makeWrapper ${godot3}/bin/godot3 $out/bin/find-billy \ --add-flags "--main-pack" \ - --add-flags "$out/share/${pname}/${pname}.pck" + --add-flags "$out/share/find-billy/find-billy.pck" runHook postBuild ''; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { runHook preInstall just build-icons - install -D ${pname}.desktop -t $out/share/applications + install -D find-billy.desktop -t $out/share/applications runHook postInstall ''; diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 5425fd2da084..b84ec2044032 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -76,7 +76,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; postInstall = '' - mv $out/share/php/${pname}/* $out/ + mv $out/share/php/firefly-iii/* $out/ rm -R $out/share $out/storage $out/bootstrap/cache $out/node_modules ln -s ${dataDir}/storage $out/storage ln -s ${dataDir}/cache $out/bootstrap/cache diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index a557e872536f..55a0017e69f2 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-3pHqKBRMxPdgicxRN0H2OT3qp8+p0tp4ej83OWEh5OQ="; + hash = "sha256-l33DDS7rk/uLCGTU5WTGvQH0JUEarKo3cxMrXn5eefc="; }; # optional only to avoid linux rebuild diff --git a/pkgs/by-name/fo/foomatic-db/package.nix b/pkgs/by-name/fo/foomatic-db/package.nix index 494216228a06..4f2a08952a4a 100644 --- a/pkgs/by-name/fo/foomatic-db/package.nix +++ b/pkgs/by-name/fo/foomatic-db/package.nix @@ -13,15 +13,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "foomatic-db"; - version = "unstable-2024-05-04"; + version = "unstable-2024-08-13"; src = fetchFromGitHub { # there is also a daily snapshot at the `downloadPage`, # but it gets deleted quickly and would provoke 404 errors owner = "OpenPrinting"; repo = "foomatic-db"; - rev = "eaad4c0d2406d4cd38a6d15e5dc93d1bc8358c30"; - hash = "sha256-A+Op1E16woNl/ppVj0QfdV4XgT1M8sbrpTXtdOz3PYk="; + rev = "359508733741039b65c86e7a1318a89862e03b13"; + hash = "sha256-DSduuSC9XX2+fS2XOQ4/FrmBzOu7rgfNDeLzpcBplsY="; }; buildInputs = [ cups cups-filters ghostscript gnused perl ]; diff --git a/pkgs/by-name/fr/framework-tool/Cargo.lock b/pkgs/by-name/fr/framework-tool/Cargo.lock index f887187a7c75..9ad6d33df6be 100644 --- a/pkgs/by-name/fr/framework-tool/Cargo.lock +++ b/pkgs/by-name/fr/framework-tool/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -38,6 +38,15 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + [[package]] name = "built" version = "0.5.2" @@ -179,6 +188,25 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +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 = "cxx" version = "1.0.94" @@ -236,6 +264,16 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "env_logger" version = "0.10.0" @@ -301,6 +339,7 @@ dependencies = [ "redox_hwio", "regex", "rusb", + "sha2", "smbios-lib", "spin 0.9.4", "uefi", @@ -325,6 +364,16 @@ dependencies = [ "uefi-services", ] +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "getopts" version = "0.2.21" @@ -584,9 +633,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" @@ -797,9 +846,21 @@ checksum = "8eb516ad341a84372b5b15a5a35cf136ba901a639c8536f521b108253d7fce74" [[package]] name = "regex" -version = "1.7.0" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +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", @@ -808,9 +869,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rusb" @@ -903,6 +964,17 @@ dependencies = [ "serde", ] +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "smbios-lib" version = "0.9.1" @@ -995,6 +1067,12 @@ dependencies = [ "serde", ] +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + [[package]] name = "ucs2" version = "0.3.2" diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index 1f8cde1b6c5c..b3797ff56293 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage { # Latest stable version 0.1.0 has an ssh:// git URL in Cargo.lock, # so use unstable for now - version = "unstable-2023-11-14"; + version = "0.1.0-unstable-2024-06-14"; src = fetchFromGitHub { owner = "FrameworkComputer"; repo = "framework-system"; - rev = "491a587342a5d79366a25d803b7065169314279c"; - hash = "sha256-qDtW4DvY19enCfkOBRaako9ngAkmSreoNWlL4QE2FAk="; + rev = "705805ce3fd9acf23ae4e310227ca62b7d686a69"; + hash = "sha256-crMA0jdCGNDvwTzYXiDpz+1O2Tk84j5cLcQAaplCDFs="; }; cargoLock = { diff --git a/pkgs/by-name/fr/freesasa/package.nix b/pkgs/by-name/fr/freesasa/package.nix new file mode 100644 index 000000000000..a20ace885373 --- /dev/null +++ b/pkgs/by-name/fr/freesasa/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + autoreconfHook, + libtool, + pkg-config, + libxml2, + json_c, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "freesasa"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "mittinatten"; + repo = "freesasa"; + rev = "refs/tags/${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-OH1/GGFtMBnHuoOu3pdR+ohVO1m0I/jmCZbxPQ0C0jo="; + }; + + patches = [ + (fetchpatch { + # https://github.com/mittinatten/freesasa/issues/85 + name = "fix-linker-error.patch"; + url = "https://github.com/mittinatten/freesasa/commit/d5898c13af0f272697726c567a22f1c48af53d62.patch"; + includes = [ "src/Makefile.am" ]; + hash = "sha256-NA4jMue9ATxP+A0tYIptwz0qCXTmAqoMRBsi5d5uv3E="; + }) + ]; + + nativeBuildInputs = [ + autoreconfHook + libtool + pkg-config + ]; + + buildInputs = [ + json_c + libxml2 + ]; + + passthru.tests = { + version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + + meta = { + description = "C-library for calculating Solvent Accessible Surface Areas"; + homepage = "https://github.com/mittinatten/freesasa"; + changelog = "https://github.com/mittinatten/freesasa/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "freesasa"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fu/fuchsia-cursor/package.nix b/pkgs/by-name/fu/fuchsia-cursor/package.nix index 96fd659e47e7..990414e219c9 100644 --- a/pkgs/by-name/fu/fuchsia-cursor/package.nix +++ b/pkgs/by-name/fu/fuchsia-cursor/package.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "ful1e5"; - repo = pname; + repo = "fuchsia-cursor"; rev = "v${version}"; hash = "sha256-WnDtUsjRXT7bMppgwU5BIDqphP69DmPzQM/0qXES5tM="; }; diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index 4e038635492c..9fefa3ad331e 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -7,13 +7,13 @@ }: buildDotnetModule rec { pname = "garnet"; - version = "1.0.16"; + version = "1.0.18"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; rev = "v${version}"; - hash = "sha256-0c6iJMSB9ThJVookibZL5CoAhrVMtY6oHYn92nN0114="; + hash = "sha256-vKjFUa/f/nsBaBkxwIhtMox2qtbBzy+ipuqFHtLhbr4="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; diff --git a/pkgs/by-name/ge/geary/package.nix b/pkgs/by-name/ge/geary/package.nix index 565ed9ae2d23..66f7bc222c27 100644 --- a/pkgs/by-name/ge/geary/package.nix +++ b/pkgs/by-name/ge/geary/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/geary/${lib.versions.major version}/geary-${version}.tar.xz"; sha256 = "r60VEwKBfd8Ji15BbnrH8tXupWejuAu5C9PGKv0TuaE="; }; @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "geary"; }; }; diff --git a/pkgs/by-name/gf/gfal2/package.nix b/pkgs/by-name/gf/gfal2/package.nix index f9ad9d06ae45..3b3debaf7fef 100644 --- a/pkgs/by-name/gf/gfal2/package.nix +++ b/pkgs/by-name/gf/gfal2/package.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gfal2"; - version = "2.22.2"; + version = "2.23.0"; src = fetchFromGitHub { owner = "cern-fts"; repo = "gfal2"; rev = "v${finalAttrs.version}"; - hash = "sha256-xcM29mZRUrnSE0//rHMaJFgPBeT6E4WdB9tCFa/y5+g="; + hash = "sha256-LEvmjd3A+7JHfUOAnyRyXMsJd/8JO2rVpcIT7QGSJoo="; }; passthru.enablePluginStatus = { diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index 95c4448025ef..0d81d0ba969f 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/ghex/${lib.versions.major version}/ghex-${version}.tar.xz"; hash = "sha256-ocRvMCDLNYuDIwJds6U5yX2ZSkxG9wH0jtxjV/f7y9E="; }; diff --git a/pkgs/by-name/gi/gifsicle/package.nix b/pkgs/by-name/gi/gifsicle/package.nix index d4d90b118598..7e604d6c536a 100644 --- a/pkgs/by-name/gi/gifsicle/package.nix +++ b/pkgs/by-name/gi/gifsicle/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.95"; src = fetchurl { - url = "https://www.lcdf.org/gifsicle/${pname}-${version}.tar.gz"; + url = "https://www.lcdf.org/gifsicle/gifsicle-${version}.tar.gz"; sha256 = "sha256-snEWRwCf0qExMPO+FgUy7UZTjnYr/A8CDepQYYp9yVA="; }; diff --git a/pkgs/by-name/gi/gitg/package.nix b/pkgs/by-name/gi/gitg/package.nix index 923f1ccc28bf..5c99f00c1206 100644 --- a/pkgs/by-name/gi/gitg/package.nix +++ b/pkgs/by-name/gi/gitg/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { version = "44"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gitg/${lib.versions.majorMinor version}/gitg-${version}.tar.xz"; hash = "sha256-NCoxaE2rlnHNNBvT485mWtzuBGDCoIHdxJPNvAMTJTA="; }; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gitg"; }; }; diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix index 0406ba52e231..15500ed8ea9d 100644 --- a/pkgs/by-name/gl/glasskube/package.nix +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -51,7 +51,7 @@ in buildGoModule rec { "-X github.com/glasskube/glasskube/internal/config.Commit=${src.rev}" ]; - subPackages = [ "cmd/${pname}" "cmd/package-operator" ]; + subPackages = [ "cmd/glasskube" "cmd/package-operator" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gm/gmobile/package.nix b/pkgs/by-name/gm/gmobile/package.nix new file mode 100644 index 000000000000..da85a98db244 --- /dev/null +++ b/pkgs/by-name/gm/gmobile/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitLab, + gtk-doc, + meson, + ninja, + pkg-config, + glib, + json-glib, + libuev, + gobject-introspection, +}: + +stdenv.mkDerivation (finalAttrs: { + name = "gmobile"; + version = "0.2.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; + repo = "gmobile"; + rev = "v${finalAttrs.version}"; + hash = "sha256-5OQ2JT7YeEYzKXafwgg0xJk2AvtFw2dtcH3mt+cm1bI="; + }; + + nativeBuildInputs = [ + gtk-doc + meson + ninja + pkg-config + gobject-introspection + ]; + + buildInputs = [ + glib + json-glib + libuev + ]; + + meta = { + description = "Functions useful in mobile related, glib based projects"; + homepage = "https://gitlab.gnome.org/World/Phosh/gmobile"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/gn/gnome-autoar/package.nix b/pkgs/by-name/gn/gnome-autoar/package.nix index dfbcc24898b5..75c971559f7b 100644 --- a/pkgs/by-name/gn/gnome-autoar/package.nix +++ b/pkgs/by-name/gn/gnome-autoar/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/gnome-autoar-${version}.tar.xz"; sha256 = "wK++MzvPPLFEGh9XTMjsexuBl3eRRdTt7uKJb9rPw8I="; }; diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index 577a8245426a..d1008f4867b7 100644 --- a/pkgs/by-name/gn/gnome-calculator/package.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "46.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz"; hash = "sha256-LTZ1CnOJAIYSLPPwyD5oUXiRWFYVFlMG+hWWqRhmgkc="; }; diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix index a751ee382271..15108e40856e 100644 --- a/pkgs/by-name/gn/gnome-calendar/package.nix +++ b/pkgs/by-name/gn/gnome-calendar/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "46.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz"; hash = "sha256-mGH/e4q9W3sgaQulXrdULH7FNLVmJp4ptbHoWMFhCJc="; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gnome-calendar"; }; }; diff --git a/pkgs/by-name/gn/gnome-common/package.nix b/pkgs/by-name/gn/gnome-common/package.nix index 0f9a1269b6ba..1954088e6587 100644 --- a/pkgs/by-name/gn/gnome-common/package.nix +++ b/pkgs/by-name/gn/gnome-common/package.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.18.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-common/${lib.versions.majorMinor version}/gnome-common-${version}.tar.xz"; sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; }; diff --git a/pkgs/by-name/gn/gnome-dictionary/package.nix b/pkgs/by-name/gn/gnome-dictionary/package.nix index 9db61b591eb7..7e11d1dec189 100644 --- a/pkgs/by-name/gn/gnome-dictionary/package.nix +++ b/pkgs/by-name/gn/gnome-dictionary/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/gnome-dictionary-${version}.tar.xz"; sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"; }; diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index 4ca25e2cf822..dd65e5727623 100644 --- a/pkgs/by-name/gn/gnome-disk-utility/package.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/gnome-disk-utility-${version}.tar.xz"; hash = "sha256-RkZJFIxtZ3HxrC6/5DpOUZIFsRwtkUoJ8qABgh0GlX0="; }; diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix index c97bad1879b8..c05243ecb529 100644 --- a/pkgs/by-name/gn/gnome-font-viewer/package.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/gnome-font-viewer-${version}.tar.xz"; hash = "sha256-WS9AHkhdAswETUh7tcjgTJYdpoViFnaKWfH/mL0tU3w="; }; diff --git a/pkgs/by-name/gn/gnome-keyring/package.nix b/pkgs/by-name/gn/gnome-keyring/package.nix index ee5b243adfc7..c26662eaec0b 100644 --- a/pkgs/by-name/gn/gnome-keyring/package.nix +++ b/pkgs/by-name/gn/gnome-keyring/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/gnome-keyring-${version}.tar.xz"; hash = "sha256-vybJZriot/MoXsyLs+RnucIPlTW5TcRRycVZ3c/2GSU="; }; diff --git a/pkgs/by-name/gn/gnome-screenshot/package.nix b/pkgs/by-name/gn/gnome-screenshot/package.nix index e282277469f0..7af7cec11bfc 100644 --- a/pkgs/by-name/gn/gnome-screenshot/package.nix +++ b/pkgs/by-name/gn/gnome-screenshot/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "41.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-screenshot/${lib.versions.major version}/gnome-screenshot-${version}.tar.xz"; sha256 = "Stt97JJkKPdCY9V5ZnPPFC5HILbnaPVGio0JM/mMlZc="; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gnome-screenshot"; }; }; diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix index 27c4576e0170..4ce32f874b19 100644 --- a/pkgs/by-name/gn/gnome-system-monitor/package.nix +++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/gnome-system-monitor-${version}.tar.xz"; hash = "sha256-U3YkgVjGhsMIJVRy6MKp5MFyVWQsFJ/HGYxtA05UdZk="; }; diff --git a/pkgs/by-name/gn/gnucap/package.nix b/pkgs/by-name/gn/gnucap/package.nix index b80e46b42d51..d67fc5d2c74b 100644 --- a/pkgs/by-name/gn/gnucap/package.nix +++ b/pkgs/by-name/gn/gnucap/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${pname}-${version}.tar.gz"; + url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/gnucap-${version}.tar.gz"; hash = "sha256-MUCtGw3BxGWgXgUwzklq5T1y9kjBTnFBa0/GK0hhl0E="; }; diff --git a/pkgs/by-name/go/goflow2/package.nix b/pkgs/by-name/go/goflow2/package.nix index 1fbedf14e5fa..4baed64bc723 100644 --- a/pkgs/by-name/go/goflow2/package.nix +++ b/pkgs/by-name/go/goflow2/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: let - version = "2.1.5"; + version = "2.2.0"; in buildGoModule { pname = "goflow2"; @@ -14,7 +14,7 @@ buildGoModule { owner = "netsampler"; repo = "goflow2"; rev = "v${version}"; - hash = "sha256-Xo0SG9s39fPBGkPaVUbfWrHVVqZ7gQvjp4PJE/Z/jog="; + hash = "sha256-kqoHYNuyzT1gsBR00KuMe/+D0YT3ZvXOvoceWGKg7G8="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule { "-X=main.version=${version}" ]; - vendorHash = "sha256-6Wuf6trx8Epyv3FWAtEyAjGBM4OQyK0C8bpRWX0NUdo="; + vendorHash = "sha256-4I4gIRJ80x9lmPpbJraSo1OD9CzT6povZDUAr1ZZEa0="; meta = { description = "High performance sFlow/IPFIX/NetFlow Collector"; diff --git a/pkgs/by-name/go/gofumpt/package.nix b/pkgs/by-name/go/gofumpt/package.nix index f2b0875a3e6c..697ab47010fe 100644 --- a/pkgs/by-name/go/gofumpt/package.nix +++ b/pkgs/by-name/go/gofumpt/package.nix @@ -1,29 +1,29 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, nix-update-script -, testers -, gofumpt +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + testers, + gofumpt, }: buildGoModule rec { pname = "gofumpt"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; rev = "v${version}"; - hash = "sha256-94aaLqoalFredkxaSPgJEnFtKw7GmkkL5N+I8ws9zxY="; + hash = "sha256-mJM0uKztX0OUQvynnxeKL9yft7X/Eh28ERg8SbZC5Ws="; }; - vendorHash = "sha256-q8+Blzab9TLTRY2/KncIlVp53+K6YWzg1D0SS7FPM9I="; + vendorHash = "sha256-kJysyxROvB0eMAHbvNF+VXatEicn4ln2Vqkzp7GDWAQ="; CGO_ENABLED = "0"; ldflags = [ "-s" - "-w" "-X main.version=v${version}" ]; @@ -45,7 +45,10 @@ buildGoModule rec { homepage = "https://github.com/mvdan/gofumpt"; changelog = "https://github.com/mvdan/gofumpt/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ rvolosatovs katexochen ]; + maintainers = with maintainers; [ + rvolosatovs + katexochen + ]; mainProgram = "gofumpt"; }; } diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 4288e3de6e20..49b712351787 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -164,11 +164,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "127.0.6533.99"; + version = "128.0.6613.84"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-pMGLSai4C/XifFkRmUoTRG/3dETGJXWhJbewtb/szVg="; + hash = "sha256-4hABtHDq/8lIP6YbpU1VJdmgZNmLN2qb0VMPYw3dsBg="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -256,11 +256,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "127.0.6533.100"; + version = "128.0.6613.85"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/knybzo7stwsgi7z5xw6krwtnym_127.0.6533.100/GoogleChrome-127.0.6533.100.dmg"; - hash = "sha256-slZ1FHXZqCCgWEStfnVTU4ykQBqa3H35KTVuqTXSHQs="; + url = "http://dl.google.com/release2/chrome/adnfqet5f4kxrux64zb25vwits5a_128.0.6613.85/GoogleChrome-128.0.6613.85.dmg"; + hash = "sha256-mWTNwfMfCLPV+w1VCMUdv7lFtYSEVr4mnDgKURlDV3Q="; }; dontPatch = true; diff --git a/pkgs/by-name/go/goredo/package.nix b/pkgs/by-name/go/goredo/package.nix index beb62fc1ce8a..57835efc4acc 100644 --- a/pkgs/by-name/go/goredo/package.nix +++ b/pkgs/by-name/go/goredo/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { version = "2.6.0"; src = fetchurl { - url = "http://www.goredo.cypherpunks.ru/download/${pname}-${version}.tar.zst"; + url = "http://www.goredo.cypherpunks.ru/download/goredo-${version}.tar.zst"; hash = "sha256-XTL/otfCKC55TsUBBVors2kgFpOFh+6oekOOafOhcUs="; }; diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix index 92da454785b2..c68a6255fd25 100644 --- a/pkgs/by-name/go/gotenberg/package.nix +++ b/pkgs/by-name/go/gotenberg/package.nix @@ -23,16 +23,16 @@ let in buildGoModule rec { pname = "gotenberg"; - version = "8.8.1"; + version = "8.9.1"; src = fetchFromGitHub { owner = "gotenberg"; repo = "gotenberg"; rev = "refs/tags/v${version}"; - hash = "sha256-vXrSPu/iY6JsOvPKDRdg6TnUjNV7X5GEb5l9bk4lSpY="; + hash = "sha256-y54DtOYIzFAk05TvXFcLdStfAXim3sVHBkW+R8CrtMM="; }; - vendorHash = "sha256-Hxava/dRQ2TFWrg7fIvRkp3NW61QWmWNEQiBP71wlR8="; + vendorHash = "sha256-BYcdqZ8TNEG6popRt+Dg5xW5Q7RmYvdlV+niUNenRG0="; postPatch = '' find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \; diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index 55d833749409..c5cc597f3985 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.4.1", + "version": "1.4.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.4.1", + "version": "1.4.2", "hasInstallScript": true, "license": "None", "dependencies": { diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index a3a9689c60c6..a20561199e5e 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.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-aYxNV50TVIu9/Xe3s5/SwI3Tf0ywo1KFhX8/uBOQ5ac="; + hash = "sha256-bh5BSpzmxSMgr1wKOCrOTQSpsSdgaVtBcw9jiE4IzI8="; }; - npmDepsHash = "sha256-pxDj67W8bvi954C4UPuR7xQixoZ1CQGJO8NIHU5JOvM="; + npmDepsHash = "sha256-gluPxs1NPVjv5K64FtED7b4zWmOXufVquuBHqz1JUzU="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/gt/gtfocli/package.nix b/pkgs/by-name/gt/gtfocli/package.nix index 3ce328daa024..e797e3975bf4 100644 --- a/pkgs/by-name/gt/gtfocli/package.nix +++ b/pkgs/by-name/gt/gtfocli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gtfocli"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "cmd-tools"; repo = "gtfocli"; rev = "refs/tags/${version}"; - hash = "sha256-fSk/OyeUffYZOkHXM1m/a9traDxdllYBieMEfsv910Q="; + hash = "sha256-yvL9H9yOiYTaWtm5cj9A8y+kKXLQgLqUMu9JMnm1llI="; }; - vendorHash = "sha256-yhN2Ve4mBw1HoC3zXYz+M8+2CimLGduG9lGTXi+rPNw="; + vendorHash = "sha256-M1/XTY4ihkPNDiCv87I+kPgsTPU+sCqdnRoP09iVFu4="; ldflags = [ "-s" diff --git a/pkgs/by-name/gu/guile-semver/package.nix b/pkgs/by-name/gu/guile-semver/package.nix index ac2a95b09f1a..3d4713f70966 100644 --- a/pkgs/by-name/gu/guile-semver/package.nix +++ b/pkgs/by-name/gu/guile-semver/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "0.1.1"; src = fetchurl { - url = "https://files.ngyro.com/guile-semver/${pname}-${version}.tar.gz"; + url = "https://files.ngyro.com/guile-semver/guile-semver-${version}.tar.gz"; hash = "sha256-T3kJGTdf6yBKjqLtqSopHZu03kyOscZ3Z4RYmoYlN4E="; }; diff --git a/pkgs/development/guile-modules/guile-sqlite3/default.nix b/pkgs/by-name/gu/guile-sqlite3/package.nix similarity index 52% rename from pkgs/development/guile-modules/guile-sqlite3/default.nix rename to pkgs/by-name/gu/guile-sqlite3/package.nix index 4b309f7fbe5d..5c90db74be3a 100644 --- a/pkgs/development/guile-modules/guile-sqlite3/default.nix +++ b/pkgs/by-name/gu/guile-sqlite3/package.nix @@ -1,46 +1,51 @@ -{ lib -, stdenv -, fetchFromGitea -, guile -, autoreconfHook -, pkg-config -, texinfo -, sqlite +{ + lib, + autoreconfHook, + fetchFromGitea, + guile, + pkg-config, + sqlite, + stdenv, + texinfo, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guile-sqlite3"; version = "0.1.3"; src = fetchFromGitea { domain = "notabug.org"; - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-C1a6lMK4O49043coh8EQkTWALrPolitig3eYf+l+HmM="; + owner = "guile-sqlite3"; + repo = "guile-sqlite3"; + rev = "v${finalAttrs.version}"; + hash = "sha256-C1a6lMK4O49043coh8EQkTWALrPolitig3eYf+l+HmM="; }; - strictDeps = true; nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; + buildInputs = [ guile sqlite ]; - doCheck = true; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + + strictDeps = true; + + doCheck = true; + enableParallelBuilding = true; - meta = with lib; { - description = "Guile bindings for the SQLite3 database engine"; + meta = { homepage = "https://notabug.org/guile-sqlite3/guile-sqlite3"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ miangraham ]; - platforms = guile.meta.platforms; + description = "Guile bindings for the SQLite3 database engine"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (guile.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/h2/h2/package.nix b/pkgs/by-name/h2/h2/package.nix index 5398d1eef0c5..004d48011133 100644 --- a/pkgs/by-name/h2/h2/package.nix +++ b/pkgs/by-name/h2/h2/package.nix @@ -9,7 +9,7 @@ maven.buildMavenPackage rec { pname = "h2"; - version = "2.3.230"; + version = "2.3.232"; outputs = [ "out" @@ -20,7 +20,7 @@ maven.buildMavenPackage rec { owner = "h2database"; repo = "h2database"; rev = "refs/tags/version-${version}"; - hash = "sha256-zF33xqsTIXSdOSqBeX/uuEdi36btn6gS/fmbxcgsSpg="; + hash = "sha256-voqQ4JqYkHRxVdxMGsHmKirQXMP7s44rTXeasWWW2Jw="; }; mvnParameters = "-f h2/pom.xml"; diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index a7787fd8ece6..8caaddf8b465 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "halo"; version = "2.18.0"; src = fetchurl { - url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar"; + url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; hash = "sha256-XFV+cdqtBJID/s0I3Z6TBfeyzN/e9euUoQVTWy64NYM="; }; diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index c3c760abafec..940c343b556b 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -1,29 +1,36 @@ -{ lib -, stdenv -, fetchPypi -, python3 -, cargo -, git -, uv +{ + lib, + python3, + fetchFromGitHub, + uv, + git, + cargo, + stdenv, + darwin, + nix-update-script, + testers, + hatch, }: python3.pkgs.buildPythonApplication rec { pname = "hatch"; version = "1.12.0"; - format = "pyproject"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-roBHjRAxLfK0TWWck7wu1NM67N3OS3Y3gjG9+ByL9q0="; + src = fetchFromGitHub { + owner = "pypa"; + repo = "hatch"; + rev = "refs/tags/hatch-v${version}"; + hash = "sha256-HW2vDVsFrdFRRaPNuGDg9DZpJd8OuYDIqA3KQRa3m9o="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ hatchling hatch-vcs uv ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ click hatchling httpx @@ -41,51 +48,88 @@ python3.pkgs.buildPythonApplication rec { zstandard ]; - nativeCheckInputs = [ - cargo - ] ++ (with python3.pkgs; [ - binary - git - pytestCheckHook - pytest-mock - pytest-xdist - setuptools - ]); + nativeCheckInputs = + with python3.pkgs; + [ + binary + git + pytestCheckHook + pytest-mock + pytest-xdist + setuptools + ] + ++ [ cargo ] + ++ lib.optionals stdenv.isDarwin [ + darwin.ps + ]; preCheck = '' export HOME=$(mktemp -d); ''; - disabledTests = [ - # AssertionError: assert (1980, 1, 2, 0, 0, 0) == (2020, 2, 2, 0, 0, 0) - "test_default" - # Loosen hatchling runtime version dependency - "test_core" - # 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" + disabledTests = + [ + # AssertionError: assert (1980, 1, 2, 0, 0, 0) == (2020, 2, 2, 0, 0, 0) + "test_default" + "test_editable_default" + "test_editable_default_extra_dependencies" + "test_editable_default_force_include" + "test_editable_default_force_include_option" + "test_editable_default_symlink" + "test_editable_exact" + "test_editable_exact_extra_dependencies" + "test_editable_exact_force_include" + "test_editable_exact_force_include_build_data_precedence" + "test_editable_exact_force_include_option" + "test_editable_pth" + "test_explicit_path" - # This test assumes it is running on macOS with a system shell on the PATH. - # It is not possible to run it in a nix build using a /nix/store shell. - # See https://github.com/pypa/hatch/pull/709 for the relevant code. - "test_populate_default_popen_kwargs_executable" - ] ++ lib.optionals stdenv.isAarch64 [ - "test_resolve" + # Loosen hatchling runtime version dependency + "test_core" + # 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" + + # This test assumes it is running on macOS with a system shell on the PATH. + # It is not possible to run it in a nix build using a /nix/store shell. + # See https://github.com/pypa/hatch/pull/709 for the relevant code. + "test_populate_default_popen_kwargs_executable" + + # Those tests fail because the final wheel is named '...2-macosx_11_0_arm64.whl' instead of + # '...2-macosx_14_0_arm64.whl' + "test_macos_archflags" + "test_macos_max_compat" + ] + ++ lib.optionals stdenv.isAarch64 [ "test_resolve" ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # AssertionError: assert [call('test h...2p32/bin/sh')] == [call('test h..., shell=True)] + # At index 0 diff: + # call('test hatch-test.py3.10', shell=True, executable='/nix/store/b34ianga4diikh0kymkpqwmvba0mmzf7-bash-5.2p32/bin/sh') + # != call('test hatch-test.py3.10', shell=True) + "tests/cli/fmt/test_fmt.py" + "tests/cli/test/test_test.py" ]; - meta = with lib; { + passthru = { + tests.version = testers.testVersion { package = hatch; }; + updateScript = nix-update-script { }; + }; + + meta = { description = "Modern, extensible Python project manager"; - mainProgram = "hatch"; homepage = "https://hatch.pypa.io/latest/"; changelog = "https://github.com/pypa/hatch/blob/hatch-v${version}/docs/history/hatch.md"; - license = licenses.mit; - maintainers = with maintainers; [ onny ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ onny ]; + mainProgram = "hatch"; }; } diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix new file mode 100644 index 000000000000..0051ade78809 --- /dev/null +++ b/pkgs/by-name/he/heptabase/package.nix @@ -0,0 +1,39 @@ +{ + lib, + appimageTools, + fetchurl, +}: +let + pname = "heptabase"; + version = "1.35.3"; + src = fetchurl { + url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; + hash = "sha256-2HEBQI+C/LKrIUb+6qNmm+xjvTOxS+vk5WTsOZKz3+s="; + }; + + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + install -Dm444 ${appimageContents}/project-meta.desktop -T $out/share/applications/heptabase.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/0x0/apps/project-meta.png $out/share/icons/hicolor/512x512/apps/${pname}.png + + substituteInPlace $out/share/applications/heptabase.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=heptabase %U' \ + --replace-fail 'Icon=project-meta' 'Icon=${pname}' + + ''; + + meta = { + changelog = "https://github.com/heptameta/project-meta/releases/tag/v${version}"; + description = "A visual note-taking tool for learning complex topics"; + homepage = "https://heptabase.com/"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + mainProgram = "heptabase"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix index 05a287a5db3d..fcb8167f428a 100644 --- a/pkgs/by-name/he/hermitcli/package.nix +++ b/pkgs/by-name/he/hermitcli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hermit"; - version = "0.39.3"; + version = "0.40.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "cashapp"; repo = "hermit"; - hash = "sha256-Cp96OOAEwBz83Fsex7DeI5LSp1gBhP8VP0I6bJAZC4U="; + hash = "sha256-oRDkuYmTR5SvmWJ9/tpW+926ShY3KrsgTiwWjQfeIEg="; }; - vendorHash = "sha256-vEv/sciynvxQE7KpxqpaSO1p5R3xYBK6o4EeuJ2JYmg="; + vendorHash = "sha256-+phwbG2ODhzfzqOJ6IuT/XDzTevPrdOfJH6PKLKeJlM="; subPackages = [ "cmd/hermit" ]; diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index bb8141c15a83..96c4aef56d39 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-08-11"; + version = "0-unstable-2024-08-18"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "086f619dd991a4d355c07837448244029fc2d9ab"; - hash = "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4="; + rev = "2598861031b78aadb4da7269df7ca9ddfc3e1671"; + hash = "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index d8c023c533cb..7c94776ed431 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.40.4"; + version = "0.42.0"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - hash = "sha256-dWL27Fe8bU8/ikNSh0T3/67XBvFkxd71uvArbJRbqKA="; + hash = "sha256-2NvTo+EDw7GcDbND7epHWnHehcVBo11QyuZ0PoJf7Nc="; }; - cargoHash = "sha256-BAOFPsHjd5EaWhtzzUxzKvsBtO/kOB5mUo3nUlf7mlY="; + cargoHash = "sha256-YSpYg10IeuqUAmjIQzrA59IT7r86/q8DtEKnazjo9rQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix new file mode 100644 index 000000000000..c0de2d264862 --- /dev/null +++ b/pkgs/by-name/hw/hwinfo/package.nix @@ -0,0 +1,96 @@ +{ + lib, + stdenv, + fetchFromGitHub, + flex, + libuuid, + libx86emu, + perl, + kmod, + systemdMinimal, + testers, + binutils, + writeText, + runCommand, + validatePkgConfig, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hwinfo"; + version = "23.2"; + + src = fetchFromGitHub { + owner = "opensuse"; + repo = "hwinfo"; + rev = finalAttrs.version; + hash = "sha256-YAhsnE1DJ5UlYAuhDxS/5IpfIJB6DrhCT3E0YiKENjU="; + }; + + nativeBuildInputs = [ + flex + validatePkgConfig + ]; + + buildInputs = [ + libuuid + libx86emu + perl + ]; + + postPatch = '' + # Replace /usr paths with Nix store paths + substituteInPlace Makefile \ + --replace-fail "/sbin" "/bin" \ + --replace-fail "/usr/" "/" + substituteInPlace src/isdn/cdb/Makefile \ + --replace-fail "lex isdn_cdb.lex" "flex isdn_cdb.lex" + substituteInPlace hwinfo.pc.in \ + --replace-fail "prefix=/usr" "prefix=$out" + substituteInPlace src/isdn/cdb/cdb_hwdb.h \ + --replace-fail "/usr/share" "$out/share" + + # Replace /sbin and /usr/bin paths with Nix store paths + substituteInPlace src/hd/hd_int.h \ + --replace-fail "/sbin/modprobe" "${kmod}/bin/modprobe" \ + --replace-fail "/sbin/rmmod" "${kmod}/bin/rmmod" \ + --replace-fail "/usr/bin/udevinfo" "${systemdMinimal}/bin/udevinfo" \ + --replace-fail "/usr/bin/udevadm" "${systemdMinimal}/bin/udevadm" + ''; + + makeFlags = [ + "LIBDIR=/lib" + "HWINFO_VERSION=${finalAttrs.version}" + ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + passthru = { + tests = { + version = testers.testVersion { package = finalAttrs.finalPackage; }; + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + no-usr = testers.testEqualContents { + assertion = "There should be no /usr/ paths in the binaries"; + # There is a bash script that refers to lshal, which is deprecated and not available in Nixpkgs. + # We'll allow this line, but nothing else. + expected = writeText "expected" '' + if [ -x /usr/bin/lshal ] ; then + ''; + actual = runCommand "actual" { nativeBuildInputs = [ binutils ]; } '' + strings ${finalAttrs.finalPackage}/bin/* | grep /usr/ > $out + ''; + }; + }; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Hardware detection tool from openSUSE"; + license = licenses.gpl2Only; + homepage = "https://github.com/openSUSE/hwinfo"; + maintainers = with maintainers; [ bobvanderlinden ]; + platforms = platforms.linux; + mainProgram = "hwinfo"; + pkgConfigModules = [ "hwinfo" ]; + }; +}) diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index e098f80cce7a..aa9c8acb2b4b 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -144,12 +144,12 @@ stdenv.mkDerivation (finalAttrs: { tomlplusplus wayland wayland-protocols + xorg.libXcursor ] ++ lib.optionals stdenv.hostPlatform.isBSD [ epoll-shim ] ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ] ++ lib.optionals enableXWayland [ xorg.libxcb - xorg.libXcursor xorg.libXdmcp xorg.xcbutil xorg.xcbutilerrors diff --git a/pkgs/by-name/in/ingress2gateway/package.nix b/pkgs/by-name/in/ingress2gateway/package.nix index da3550ac8df6..66200676793b 100644 --- a/pkgs/by-name/in/ingress2gateway/package.nix +++ b/pkgs/by-name/in/ingress2gateway/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ingress2gateway"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - hash = "sha256-+ImMpO1qRkXYLy+MDloKSoDCmMmJSBorgDjzaeSCBdY="; + hash = "sha256-xAoJREGktbSNGYdrmPuYG2G+xaQ+kReSSA1JBgWaPVY="; }; - vendorHash = "sha256-IEU9cfYCkrQagxzJT6jPz2nRCz1BAaiGvkEPhNRQr4E="; + vendorHash = "sha256-T6I8uYUaubcc1dfDu6PbQ9bDDLqGuLGXWnCZhdvkycE="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 186c4918b994..7353a8ed6aca 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -14,7 +14,7 @@ flutterPackages.v3_19.buildFlutterApplication rec { version = "2.6.0"; src = fetchFromGitHub { owner = "intiface"; - repo = pname; + repo = "intiface-central"; rev = "v${version}"; hash = "sha256-7+rw0cD8MJPFOkgmfHD6y+EojTGQhb15o1mn2p14eoE="; }; diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index 945efaec3c19..8fa8aa976e34 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { version = "1.2405.17-jammy"; src = fetchurl { - url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb"; + url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb"; hash = "sha256-WpVPWzh8jN092MaY2rMXhLfpVXsflMl9hOY9nNGJlLk="; }; diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix index 581576f68fb3..d1c7a1903ec0 100644 --- a/pkgs/by-name/ir/irrd/package.nix +++ b/pkgs/by-name/ir/irrd/package.nix @@ -14,13 +14,16 @@ let self = py; packageOverrides = final: prev: { # sqlalchemy 1.4.x or 2.x are not supported - sqlalchemy = prev.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + sqlalchemy = prev.sqlalchemy_1_4.overridePythonAttrs (oldAttrs: rec { version = "1.3.24"; src = fetchPypi { pname = "SQLAlchemy"; inherit version; hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; }; + postPatch = '' + sed -i '/tag_build = dev/d' setup.cfg + ''; doCheck = false; }); alembic = prev.alembic.overridePythonAttrs (lib.const { diff --git a/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff b/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff new file mode 100644 index 000000000000..0bf0a9bd6177 --- /dev/null +++ b/pkgs/by-name/is/isc-cron/0000-nixpkgs-specific.diff @@ -0,0 +1,45 @@ +diff -Naur cron-old/externs.h cron-new/externs.h +--- cron-old/externs.h 2024-08-23 09:04:25.525752797 -0300 ++++ cron-new/externs.h 2024-08-23 10:12:05.304311078 -0300 +@@ -121,3 +121,14 @@ + #ifndef WCOREDUMP + # define WCOREDUMP(st) (((st) & 0200) != 0) + #endif ++ ++/* Nixpkgs-specific patch begin */ ++ ++/* ++ Implicit saved UIDs do not work here due to way NixOS uses setuid wrappers ++ See https://github.com/NixOS/nixpkgs/issues/16518 ++ */ ++ ++#undef HAVE_SAVED_UIDS ++ ++/* Nixpkgs-specific patch end */ +diff -Naur cron-old/pathnames.h cron-new/pathnames.h +--- cron-old/pathnames.h 2024-08-23 09:04:25.524752791 -0300 ++++ cron-new/pathnames.h 2024-08-23 10:11:33.186749198 -0300 +@@ -105,4 +105,23 @@ + # define _PATH_DEVNULL "/dev/null" + #endif + ++/* Nixpkgs-specific patch begin */ ++ ++/* ++ We want to ignore the $glibc/include/paths.h definition of sendmail path. ++ Further, set a usable default PATH ++ See https://github.com/NixOS/nixpkgs/issues/16518 ++ */ ++ ++#undef _PATH_SENDMAIL ++#define _PATH_SENDMAIL "@sendmailPath@" ++ ++#undef _PATH_VI ++#define _PATH_VI "@VIPATH@" ++ ++#undef _PATH_DEFPATH ++#define _PATH_DEFPATH "@DEFPATH@" ++ ++/* Nixpkgs-specific patch end */ ++ + #endif /* _PATHNAMES_H_ */ diff --git a/pkgs/by-name/is/isc-cron/package.nix b/pkgs/by-name/is/isc-cron/package.nix new file mode 100644 index 000000000000..b52086fca473 --- /dev/null +++ b/pkgs/by-name/is/isc-cron/package.nix @@ -0,0 +1,71 @@ +{ + lib, + fetchurl, + stdenv, + substituteAll, + vim, + sendmailPath ? "/usr/sbin/sendmail", +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cron"; + version = "4.1"; + + src = fetchurl { + url = "ftp://ftp.isc.org/isc/cron/cron_${finalAttrs.version}.shar"; + hash = "sha256-xEWDd1b7mI8slduNxV15N9FLygzfopLegTIsolVuw5o="; + }; + + patches = [ + (substituteAll { + src = ./0000-nixpkgs-specific.diff; + inherit sendmailPath; + VIPATH = lib.getExe' vim "vim"; + DEFPATH = lib.concatStringsSep ":" [ + "/run/wrappers/bin" + "/nix/var/nix/profiles/default/bin" + "/run/current-system/sw/bin" + "/usr/bin" + "/bin" + ]; + }) + ]; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "DESTROOT=$(out)" + ]; + + hardeningEnable = [ "pie" ]; + + unpackCmd = '' + mkdir cron + pushd cron + sh $curSrc + popd + ''; + + # do not set sticky bit in /nix/store + # further, do not strip during install since it breaks on cross-compilation + # and we will do this ourselves as needed + postPatch = '' + substituteInPlace Makefile \ + --replace ' -o root' ' ' \ + --replace 111 755 \ + --replace 4755 0755 \ + --replace ' -s cron' ' cron' + ''; + + preInstall = '' + mkdir -p $out/{{,s}bin,share/man/man{1,5,8}} + ''; + + meta = { + homepage = "https://ftp.isc.org/isc/cron/"; + description = "Daemon for running commands at specific times"; + license = lib.licenses.bsd0; + mainProgram = "cron"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/is/iscc/package.nix b/pkgs/by-name/is/iscc/package.nix index e8228113881f..03f231ca365c 100644 --- a/pkgs/by-name/is/iscc/package.nix +++ b/pkgs/by-name/is/iscc/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" cp -r ./app/* "$out/bin" - cat << 'EOF' > "$out/bin/${pname}" + cat << 'EOF' > "$out/bin/iscc" #!${runtimeShell} export PATH=${wineWow64Packages.stable}/bin:$PATH export WINEDLLOVERRIDES="mscoree=" # disable mono @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { ${wineWow64Packages.stable}/bin/wine "$out/bin/ISCC.exe" "$wineInputFile" EOF - substituteInPlace $out/bin/${pname} \ + substituteInPlace $out/bin/iscc \ --replace "\$out" "$out" - chmod +x "$out/bin/${pname}" + chmod +x "$out/bin/iscc" runHook postInstall ''; diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 7c88f7e4634d..01c82469f5ed 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.4.0.32175"; + version = "2.4.1.32573"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - hash = "sha256-+EKl8o+S5nwV3u+RrhxuOm/6dLH6zRSvFnyaZRO8xc0="; + hash = "sha256-6sfO9tDIdp/xuNtqZ7UXqzP1SuLd6ZAF7lMTlaF3Z80="; stripRoot = false; }; @@ -22,7 +22,7 @@ let nativeBuildInputs = [ appimageTools.appimage-exec ]; } '' - appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname} + appimage-exec.sh -x $out ${src}/jetbrains-toolbox-${version}/jetbrains-toolbox # JetBrains ship a broken desktop file. Despite registering a custom # scheme handler for jetbrains:// URLs, they never mark the command as @@ -46,7 +46,7 @@ stdenv.mkDerivation { runHook preInstall install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg - makeWrapper ${appimage}/bin/${pname} $out/bin/${pname} \ + makeWrapper ${appimage}/bin/jetbrains-toolbox $out/bin/jetbrains-toolbox \ --append-flags "--update-failed" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [icu]} diff --git a/pkgs/by-name/jn/jnr-posix/package.nix b/pkgs/by-name/jn/jnr-posix/package.nix index 8ae46e7f5dc8..80f35d3d827d 100644 --- a/pkgs/by-name/jn/jnr-posix/package.nix +++ b/pkgs/by-name/jn/jnr-posix/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D target/${pname}-${version}.jar $out/share/java/${pname}-${version}.jar + install -D target/jnr-posix-${version}.jar $out/share/java/jnr-posix-${version}.jar runHook postInstall ''; diff --git a/pkgs/by-name/jr/jreleaser-cli/package.nix b/pkgs/by-name/jr/jreleaser-cli/package.nix new file mode 100644 index 000000000000..21e2b99b7931 --- /dev/null +++ b/pkgs/by-name/jr/jreleaser-cli/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jre, +}: +stdenv.mkDerivation rec { + pname = "jreleaser-cli"; + version = "1.13.1"; + + src = fetchurl { + url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar"; + hash = "sha256-aqpyEbu+UY0jToP09Wt5X9dRFs85+4uGnHu0IgdK1aM="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/share/java/ $out/bin/ + cp $src $out/share/java/${pname}.jar + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${pname}.jar" + ''; + + meta = { + homepage = "https://jreleaser.org/"; + description = "Release projects quickly and easily"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.i-al-istannen ]; + mainProgram = "jreleaser-cli"; + }; +} diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index dc032583ae07..840b21b04d35 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -28,16 +28,16 @@ let in rustPlatform.buildRustPackage rec { pname = "kanidm"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YFmWZlDcsSk+7EGkoK0SkAhNsrIQa55IRIVqisX3zqE="; + hash = "sha256-W5G7osV4du6w/BfyY9YrDzorcLNizRsoz70RMfO2AbY="; }; - cargoHash = "sha256-8ZENe576gqm+FkQPCgz6mScqdacHilARFWmfe+kDL2A="; + cargoHash = "sha256-gJrzOK6vPPBgsQFkKrbMql00XSfKGjgpZhYJLTURxoI="; KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; @@ -110,7 +110,14 @@ rustPlatform.buildRustPackage rec { inherit (nixosTests) kanidm kanidm-provisioning; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + # avoid spurious releases and tags such as "debs" + extraArgs = [ + "-vr" + "v(.*)" + ]; + }; + inherit enableSecretProvisioning; withSecretProvisioning = kanidm.override { enableSecretProvisioning = true; }; }; diff --git a/pkgs/by-name/ka/kata-runtime/kata-images.nix b/pkgs/by-name/ka/kata-runtime/kata-images.nix new file mode 100644 index 000000000000..b145c9a340d4 --- /dev/null +++ b/pkgs/by-name/ka/kata-runtime/kata-images.nix @@ -0,0 +1,49 @@ +# Derived from https://github.com/colemickens/nixpkgs-kubernetes +{ + fetchzip, + lib, + stdenv, + version, +}: + +let + imageSuffix = + { + "x86_64-linux" = "amd64"; + "aarch64-linux" = "arm64"; + } + ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + imageHash = + { + "x86_64-linux" = "sha256-6ySKAqrbHDRgVlI7wm2p4Uw96ZMzUpP00liujxlruSM="; + "aarch64-linux" = "sha256-pEPkDXT4OunfN2sGb8Ru05tFHaBsYUcmG5Iy7yH4kX8="; + } + ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + +in +fetchzip { + name = "kata-images-${version}"; + url = "https://github.com/kata-containers/kata-containers/releases/download/${version}/kata-static-${version}-${imageSuffix}.tar.xz"; + hash = imageHash; + + postFetch = '' + mv $out/kata/share/kata-containers kata-containers + rm -r $out + mkdir -p $out/share + mv kata-containers $out/share/kata-containers + ''; + + meta = { + description = "Lightweight Virtual Machines like containers that provide the workload isolation and security of VMs"; + homepage = "https://github.com/kata-containers/kata-containers"; + changelog = "https://github.com/kata-containers/kata-containers/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thomasjm ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/ka/kata-runtime/package.nix b/pkgs/by-name/ka/kata-runtime/package.nix new file mode 100644 index 000000000000..403ea76d21ba --- /dev/null +++ b/pkgs/by-name/ka/kata-runtime/package.nix @@ -0,0 +1,92 @@ +# Derived from https://github.com/colemickens/nixpkgs-kubernetes +{ + buildGoModule, + callPackage, + fetchFromGitHub, + lib, + qemu_kvm, + stdenv, + virtiofsd, + yq-go, +}: + +let + version = "3.7.0"; + + kata-images = callPackage ./kata-images.nix { inherit version; }; + + qemuSystemBinary = + { + "x86_64-linux" = "qemu-system-x86_64"; + "aarch64-linux" = "qemu-system-aarch64"; + } + ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + +in +buildGoModule rec { + pname = "kata-runtime"; + inherit version; + + # https://github.com/NixOS/nixpkgs/issues/25959 + hardeningDisable = [ "fortify" ]; + + src = fetchFromGitHub { + owner = "kata-containers"; + repo = "kata-containers"; + rev = version; + hash = "sha256-Ir+/ZZJHm6E+044wczU3UvL+Py9Wprgw2QKJaYyDrKU="; + }; + + sourceRoot = "source/src/runtime"; + + vendorHash = null; + + dontConfigure = true; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "DEFAULT_HYPERVISOR=qemu" + "HYPERVISORS=qemu" + "QEMUPATH=${qemu_kvm}/bin/${qemuSystemBinary}" + ]; + + buildPhase = '' + runHook preBuild + mkdir -p $TMPDIR/gopath/bin + ln -s ${yq-go}/bin/yq $TMPDIR/gopath/bin/yq + HOME=$TMPDIR GOPATH=$TMPDIR/gopath make ${toString makeFlags} + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + HOME=$TMPDIR GOPATH=$TMPDIR/gopath make ${toString makeFlags} install + ln -s $out/bin/containerd-shim-kata-v2 $out/bin/containerd-shim-kata-qemu-v2 + ln -s $out/bin/containerd-shim-kata-v2 $out/bin/containerd-shim-kata-clh-v2 + + # Update a few paths to the Nix-provided versions: kata-images, virtiofsd, and qemu_kvm + sed -i \ + -e "s!$out/share/kata-containers!${kata-images}/share/kata-containers!" \ + -e "s!^virtio_fs_daemon.*!virtio_fs_daemon=\"${virtiofsd}/bin/virtiofsd\"!" \ + -e "s!^valid_virtio_fs_daemon_paths.*!valid_virtio_fs_daemon_paths=[\"${qemu_kvm}/libexec/virtiofsd\"]!" \ + "$out/share/defaults/kata-containers/"*.toml + + runHook postInstall + ''; + + passthru = { + inherit kata-images; + }; + + meta = { + description = "Lightweight Virtual Machines like containers that provide the workload isolation and security of VMs"; + homepage = "https://github.com/kata-containers/kata-containers"; + changelog = "https://github.com/kata-containers/kata-containers/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ thomasjm ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +} diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix index 5b28107f7b2d..5438236d1a7b 100644 --- a/pkgs/by-name/ke/keymapp/package.nix +++ b/pkgs/by-name/ke/keymapp/package.nix @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -m755 -D keymapp "$out/bin/${pname}" - install -Dm644 icon.png "$out/share/pixmaps/${pname}.png" + install -m755 -D keymapp "$out/bin/keymapp" + install -Dm644 icon.png "$out/share/pixmaps/keymapp.png" runHook postInstall ''; diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix index 2f5a0bced240..49bef476bccd 100644 --- a/pkgs/by-name/ki/kikit/default.nix +++ b/pkgs/by-name/ki/kikit/default.nix @@ -17,14 +17,14 @@ , pcbnewtransition , pybars3 , versioneer -, shapely_1_8 +, shapely }: let solidpython = callPackage ./solidpython { }; in buildPythonApplication rec { pname = "kikit"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonApplication rec { owner = "yaqwsx"; repo = "KiKit"; rev = "refs/tags/v${version}"; - hash = "sha256-f8FB6EEy9Ch4LcMKd9PADXV9QrSb7e22Ui86G6AnQKE="; + hash = "sha256-r8LQcy3I6hmcrU/6HfPAYJd+cEZdhad6DUldC9HvXZU="; }; propagatedBuildInputs = [ @@ -49,8 +49,7 @@ buildPythonApplication rec { wxpython pcbnewtransition pybars3 - # https://github.com/yaqwsx/KiKit/issues/574 - shapely_1_8 + shapely # https://github.com/yaqwsx/KiKit/issues/576 solidpython ]; diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix index 8008802849bd..ee1f5fcf85ff 100644 --- a/pkgs/by-name/ki/kitex/package.nix +++ b/pkgs/by-name/ki/kitex/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kitex"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "cloudwego"; repo = "kitex"; rev = "v${version}"; - hash = "sha256-TvWFbjmKIvX26KV3JZRXcd7jF823tdTr5pCP/N66nIc="; + hash = "sha256-aSvN8yjCHxhzLHwQovWFMaoD6ljy8aikxI7jUoeRvDs="; }; vendorHash = "sha256-nscMcJGFZ1YPPynTV+Mp8tXndtlIcszDZm36zMbNBYs="; diff --git a/pkgs/by-name/ki/kiwitalk/Cargo.lock b/pkgs/by-name/ki/kiwitalk/Cargo.lock index fb0409c5152d..c15c9b2d3672 100644 --- a/pkgs/by-name/ki/kiwitalk/Cargo.lock +++ b/pkgs/by-name/ki/kiwitalk/Cargo.lock @@ -2678,6 +2678,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -4606,13 +4612,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa 1.0.9", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -4628,10 +4635,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/pkgs/by-name/ki/kiwitalk/package.nix b/pkgs/by-name/ki/kiwitalk/package.nix index 327e219d185d..efc9c55337d3 100644 --- a/pkgs/by-name/ki/kiwitalk/package.nix +++ b/pkgs/by-name/ki/kiwitalk/package.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ - --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + --replace-warn "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + ln -sf ${./Cargo.lock} Cargo.lock ''; pnpmDeps = pnpm.fetchDeps { diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index fccf2b208874..0891bb98450d 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kor"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-ZjFLcxp5keL4N8B7hZC8/x2Xk0c87p44yCfGunjLUNA="; + hash = "sha256-/GXTfArNaD1Y6hpec3tNUSSNVqIq6QLpsZS7jWFi5g4="; }; - vendorHash = "sha256-rlDaQPR9sReAX4gAlbDGAsA1ei9Fo2sXoU9cbBCexfc="; + vendorHash = "sha256-FrO+ZyisuDLplpoKsGOwpxz+jXd36MEs5bFz3RujZDY="; preCheck = '' HOME=$(mktemp -d) diff --git a/pkgs/tools/networking/labctl/default.nix b/pkgs/by-name/la/labctl/package.nix similarity index 63% rename from pkgs/tools/networking/labctl/default.nix rename to pkgs/by-name/la/labctl/package.nix index 89c84e4f1832..231d0984b207 100644 --- a/pkgs/tools/networking/labctl/default.nix +++ b/pkgs/by-name/la/labctl/package.nix @@ -1,30 +1,21 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, fetchpatch -, installShellFiles +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, }: buildGoModule rec { pname = "labctl"; - version = "0.0.22"; + version = "0.0.22-unstable-2024-05-10"; src = fetchFromGitHub { owner = "labctl"; repo = "labctl"; - rev = "v${version}"; - hash = "sha256-84t7qhLafNyPLgHmFQUsizEn6Us44dDTercGEm9lup4="; + rev = "1a8b11402def10819d36b9f7f44e82612ef22674"; + hash = "sha256-px5jrfllo6teJaNrqIQVyqMwArCw625xSVM7V/xW/IA="; }; - patches = [ - # Fix build failure with Go 1.21 by updating go4.org/unsafe/assume-no-moving-gc - # See https://github.com/labctl/labctl/pull/4 - (fetchpatch { - url = "https://github.com/labctl/labctl/commit/615d05e94b991362beddce71c7ee34eae7fc93ff.patch"; - hash = "sha256-4JrXSsg8rfuH6i8XyLd/qO6AibkRMDBIpfT8r1yS75c="; - }) - ]; - nativeBuildInputs = [ installShellFiles ]; vendorHash = "sha256-Ycr/IZckIFysS9Goes58hhgh96UMRHjYWfWlQU23mXk="; diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 137097779a7b..594a255bb989 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -1,41 +1,46 @@ -{ lib -, cairo -, fetchFromGitHub -, gettext -, glib -, libdrm -, libinput -, libpng -, librsvg -, libxcb -, libxkbcommon -, libxml2 -, meson -, ninja -, pango -, pkg-config -, scdoc -, stdenv -, wayland -, wayland-protocols -, wayland-scanner -, wlroots -, xcbutilwm -, xwayland +{ + lib, + cairo, + fetchFromGitHub, + gettext, + glib, + libdrm, + libinput, + libpng, + librsvg, + libxcb, + libxkbcommon, + libxml2, + meson, + ninja, + pango, + pkg-config, + scdoc, + stdenv, + wayland, + wayland-protocols, + wayland-scanner, + wlroots_0_18, + xcbutilwm, + xwayland, }: stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; - rev = finalAttrs.version; - hash = "sha256-7MH1mMfyMkaTVwEBJWvI1Lt3M6kosXOwkowuBTZej3c="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-1PyPk6r/hXkC0EfOIeDqNGrrpvo616derD9u7i3XjkA="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "doc" + "man" + ]; nativeBuildInputs = [ gettext @@ -59,16 +64,14 @@ stdenv.mkDerivation (finalAttrs: { pango wayland wayland-protocols - wlroots + wlroots_0_18 xcbutilwm xwayland ]; - strictDeps = true; + mesonFlags = [ (lib.mesonEnable "xwayland" true) ]; - mesonFlags = [ - (lib.mesonEnable "xwayland" true) - ]; + strictDeps = true; passthru = { providedSessions = [ "labwc" ]; @@ -77,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/labwc/labwc"; description = "Wayland stacking compositor, inspired by Openbox"; - changelog = "https://github.com/labwc/labwc/blob/${finalAttrs.src.rev}/NEWS.md"; license = with lib.licenses; [ gpl2Plus ]; mainProgram = "labwc"; maintainers = with lib.maintainers; [ AndersonTorres ]; diff --git a/pkgs/by-name/la/lazyjj/package.nix b/pkgs/by-name/la/lazyjj/package.nix new file mode 100644 index 000000000000..7db0709d47b0 --- /dev/null +++ b/pkgs/by-name/la/lazyjj/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + makeWrapper, + jujutsu, + rustPlatform, + testers, + lazyjj, +}: +rustPlatform.buildRustPackage rec { + pname = "lazyjj"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "Cretezy"; + repo = "lazyjj"; + rev = "v${version}"; + hash = "sha256-VlGmOdF/XsrZ/9vQ14UuK96LIK8NIkPZk4G4mbS8brg="; + }; + + cargoHash = "sha256-TAq9FufGsNVsmqCE41REltYRSSLihWJwTMoj0bTxdFc="; + + postInstall = '' + wrapProgram $out/bin/lazyjj \ + --prefix PATH : ${lib.makeBinPath [ jujutsu ]} + ''; + + nativeBuildInputs = [ makeWrapper ]; + + nativeCheckInputs = [ jujutsu ]; + + passthru.tests.version = testers.testVersion { package = lazyjj; }; + + meta = with lib; { + description = "TUI for Jujutsu/jj"; + homepage = "https://github.com/Cretezy/lazyjj"; + mainProgram = "lazyjj"; + license = licenses.asl20; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index f8933e0763d5..947fbaace104 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.7.12"; + version = "1.7.14"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-lPjxd3a97abPUJxazgL+BQmGOMqF9RlP/6qEgjS5aXw="; + hash = "sha256-yGxEeNn6YnzivvQW+HXMAkSaKZ5mmAflyDlNYfjqguc="; }; vendorHash = "sha256-YrBFcRQoqZPe/USZj3oJK5KR7y0LimCVGS9w4uNMG6M="; diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix index 6bf32f339418..e0a3d022163e 100644 --- a/pkgs/by-name/lg/lgogdownloader/package.nix +++ b/pkgs/by-name/lg/lgogdownloader/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lgogdownloader"; - version = "3.14"; + version = "3.15"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "refs/tags/v${version}"; - hash = "sha256-pxYiSefscglHN53wvp38Ec4/3X46sWc56Y4YKNtqABQ="; + hash = "sha256-h2N5pRwwZZ3jAvRrT4Ebk4N5WO9tQjDrp8KRqriwUi4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index c533b8fdb872..fc61d7c0d48f 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -73,7 +73,7 @@ buildDotnetModule rec { preFixup = '' # remove binaries for other platform, like upstream does - pushd $out/lib/${pname} + pushd $out/lib/libation rm -f *.x86.dll *.x64.dll ${lib.optionalString (stdenv.system != "x86_64-linux") "rm -f *.x64.so"} ${lib.optionalString (stdenv.system != "aarch64-linux") "rm -f *.arm64.so"} @@ -81,9 +81,9 @@ buildDotnetModule rec { ${lib.optionalString (stdenv.system != "aarch64-darwin") "rm -f *.arm64.dylib"} popd - wrapDotnetProgram $out/lib/${pname}/Libation $out/bin/libation - wrapDotnetProgram $out/lib/${pname}/LibationCli $out/bin/libationcli - wrapDotnetProgram $out/lib/${pname}/Hangover $out/bin/hangover + wrapDotnetProgram $out/lib/libation/Libation $out/bin/libation + wrapDotnetProgram $out/lib/libation/LibationCli $out/bin/libationcli + wrapDotnetProgram $out/lib/libation/Hangover $out/bin/hangover ''; meta = { diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/by-name/li/libdeltachat/Cargo.lock similarity index 94% rename from pkgs/development/libraries/libdeltachat/Cargo.lock rename to pkgs/by-name/li/libdeltachat/Cargo.lock index 753fa8032a37..a10f1fc1c63b 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/by-name/li/libdeltachat/Cargo.lock @@ -225,24 +225,8 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ - "asn1-rs-derive 0.4.0", - "asn1-rs-impl 0.1.0", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time 0.3.36", -] - -[[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", + "asn1-rs-derive", + "asn1-rs-impl", "displaydoc", "nom", "num-traits", @@ -260,19 +244,7 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "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", - "quote", - "syn 2.0.68", - "synstructure 0.13.1", + "synstructure", ] [[package]] @@ -286,17 +258,6 @@ 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", - "quote", - "syn 2.0.68", -] - [[package]] name = "async-broadcast" version = "0.7.1" @@ -413,7 +374,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -608,9 +569,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -737,9 +698,9 @@ checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" [[package]] name = "byteorder" @@ -820,9 +781,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" [[package]] name = "cfb-mode" @@ -926,7 +887,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", - "clap_derive", ] [[package]] @@ -935,22 +895,8 @@ version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ - "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", -] - -[[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.68", ] [[package]] @@ -1287,7 +1233,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1335,7 +1281,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1357,7 +1303,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core 0.20.9", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1367,7 +1313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown", "lock_api", "once_cell", "parking_lot_core", @@ -1407,7 +1353,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.142.1" +version = "1.142.7" dependencies = [ "ansi_term", "anyhow", @@ -1417,7 +1363,6 @@ dependencies = [ "async-native-tls", "async-smtp", "async_zip", - "backtrace", "base64 0.22.1", "brotli", "chrono", @@ -1457,19 +1402,17 @@ dependencies = [ "proptest", "qrcodegen", "quick-xml", - "quinn 0.10.2", "quoted_printable", "rand 0.8.5", "ratelimit", "regex", - "reqwest 0.12.5", + "reqwest", "rusqlite", "rust-hsluv", "sanitize-filename", "serde", "serde_json", "sha-1", - "sha2 0.10.8", "smallvec", "strum", "strum_macros", @@ -1501,7 +1444,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.142.1" +version = "1.142.7" dependencies = [ "anyhow", "async-channel 2.3.1", @@ -1526,7 +1469,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.142.1" +version = "1.142.7" dependencies = [ "ansi_term", "anyhow", @@ -1541,7 +1484,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.142.1" +version = "1.142.7" dependencies = [ "anyhow", "deltachat", @@ -1565,12 +1508,12 @@ name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] name = "deltachat_ffi" -version = "1.142.1" +version = "1.142.7" dependencies = [ "anyhow", "deltachat", @@ -1616,21 +1559,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "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", + "asn1-rs", "displaydoc", "nom", "num-bigint", @@ -1658,7 +1587,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1689,7 +1618,7 @@ dependencies = [ "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1699,7 +1628,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1717,22 +1646,22 @@ dependencies = [ [[package]] name = "derive_more" -version = "1.0.0-beta.6" +version = "1.0.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d" +checksum = "3249c0372e72f5f93b5c0ca54c0ab76bbf6216b6f718925476fd9bc4ffabb4fe" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "1.0.0-beta.6" +version = "1.0.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e" +checksum = "27d919ced7590fc17b5d5a3c63b662e8a7d2324212c4e4dbbed975cafd22d16d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", "unicode-xid", ] @@ -1822,7 +1751,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -2184,7 +2113,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -2197,7 +2126,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -2217,7 +2146,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -2232,9 +2161,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -2535,11 +2464,12 @@ dependencies = [ [[package]] name = "futures-concurrency" -version = "7.6.0" +version = "7.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ee14e256b9143bfafbf2fddeede6f396650bacf95d06fc1b3f2b503df129a0" +checksum = "4b14ac911e85d57c5ea6eef76d7b4d4a3177ecd15f4bea2e61927e9e3823e19f" dependencies = [ "bitvec", + "futures-buffered", "futures-core", "futures-lite 1.13.0", "pin-project", @@ -2606,7 +2536,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -2645,22 +2575,6 @@ dependencies = [ "slab", ] -[[package]] -name = "genawaiter" -version = "0.99.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86bd0361bcbde39b13475e6e36cb24c329964aa2611be285289d1e4b751c1a0" -dependencies = [ - "futures-core", - "genawaiter-macro", -] - -[[package]] -name = "genawaiter-macro" -version = "0.99.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b32dfe1fdfc0bbde1f22a5da25355514b5e450c33a6af6770884c8750aedfbc" - [[package]] name = "generic-array" version = "0.14.7" @@ -2782,7 +2696,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.5", + "indexmap", "slab", "tokio", "tokio-util", @@ -2801,7 +2715,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.2.5", + "indexmap", "slab", "tokio", "tokio-util", @@ -2818,12 +2732,6 @@ dependencies = [ "crunchy", ] -[[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.3" @@ -2839,7 +2747,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -3035,9 +2943,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human-panic" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179" +checksum = "1c5a08ed290eac04006e21e63d32e90086b6182c7cd0452d10f4264def1fec9a" dependencies = [ "backtrace", "os_info", @@ -3107,20 +3015,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.28", - "rustls 0.21.11", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.2" @@ -3186,7 +3080,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core 0.51.1", ] [[package]] @@ -3288,17 +3182,6 @@ dependencies = [ "nom", ] -[[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", - "serde", -] - [[package]] name = "indexmap" version = "2.2.5" @@ -3306,8 +3189,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", - "hashbrown 0.14.3", - "serde", + "hashbrown", ] [[package]] @@ -3392,15 +3274,15 @@ dependencies = [ [[package]] name = "iroh-base" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31f493beda1c4f8c7be999eff8a80cd1e2428da4c61f5cdd14990af8122342e" +checksum = "24ddb47e8160fb1d563a6f541c813c2f185423a0ad1c9260a6c76891a2300c26" dependencies = [ "aead", "anyhow", "crypto_box", "data-encoding", - "derive_more 1.0.0-beta.6", + "derive_more 1.0.0-beta.7", "ed25519-dalek 2.1.1", "getrandom 0.2.12", "hex", @@ -3433,17 +3315,19 @@ dependencies = [ [[package]] name = "iroh-gossip" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a25bef4066809009d90cb5ff885c0d1adf77690805431f45577e624af0b4c6" +checksum = "c13f9a1da4e901f4d7e78b13139b372b361ed41fa9521a13432783880035a19a" dependencies = [ "anyhow", + "async-channel 2.3.1", "bytes", - "derive_more 1.0.0-beta.6", + "derive_more 1.0.0-beta.7", "ed25519-dalek 2.1.1", + "futures-concurrency", "futures-lite 2.3.0", - "genawaiter", - "indexmap 2.2.5", + "futures-util", + "indexmap", "iroh-base", "iroh-blake3", "iroh-metrics", @@ -3459,9 +3343,9 @@ dependencies = [ [[package]] name = "iroh-metrics" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "472ec21d59b34c8fbebbd8fcecfdc0f4b00a7af2d6453b303a1e9c9499674f67" +checksum = "3ab017d2786c0b77583371cef016d3e76bdbc7d13b66532023cb7e854f65d15a" dependencies = [ "anyhow", "erased_set", @@ -3470,7 +3354,7 @@ dependencies = [ "hyper-util", "once_cell", "prometheus-client", - "reqwest 0.12.5", + "reqwest", "serde", "struct_iterable", "time 0.3.36", @@ -3480,20 +3364,18 @@ dependencies = [ [[package]] name = "iroh-net" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3e2e9b2a555736a82cb53d16037b0ba0233034ac5042efce129b1460b0a50a" +checksum = "372fbf01dc303be5427b6ea33b80411b3cfb6443d6389ce1ffc43231f244a51c" dependencies = [ "anyhow", - "axum", + "async-channel 2.3.1", "backoff", "base64 0.22.1", "bytes", - "clap", "der 0.7.8", - "derive_more 1.0.0-beta.6", + "derive_more 1.0.0-beta.7", "duct", - "flume", "futures-buffered", "futures-concurrency", "futures-lite 2.3.0", @@ -3528,15 +3410,12 @@ dependencies = [ "rand 0.8.5", "rand_core 0.6.4", "rcgen 0.12.1", - "regex", - "reqwest 0.12.5", + "reqwest", "ring 0.17.8", "rtnetlink", "rustls 0.21.11", - "rustls-pemfile 1.0.4", "rustls-webpki 0.101.7", "serde", - "serde_with", "smallvec", "socket2", "strum", @@ -3546,13 +3425,10 @@ dependencies = [ "time 0.3.36", "tokio", "tokio-rustls 0.24.1", - "tokio-rustls-acme", "tokio-tungstenite", "tokio-tungstenite-wasm", "tokio-util", - "toml", "tracing", - "tracing-subscriber", "tungstenite", "url", "watchable", @@ -3735,16 +3611,16 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "openssl-sys", @@ -4061,7 +3937,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -4157,7 +4033,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -4218,7 +4094,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -4248,16 +4124,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "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", + "asn1-rs", ] [[package]] @@ -4284,7 +4151,7 @@ version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -4301,7 +4168,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -4545,7 +4412,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -4561,9 +4428,9 @@ dependencies = [ [[package]] name = "pgp" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeab6e08a63a51a29a65e461d0b6fd0f8d350914712ec43773ca22ed51d5501c" +checksum = "4a6c842436d5fa2b59eac1e9b3d142b50bfff99c1744c816b1f4c2ac55a20754" dependencies = [ "aes", "aes-gcm", @@ -4640,7 +4507,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -4774,7 +4641,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -4991,7 +4858,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -5000,7 +4867,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "lazy_static", "num-traits", "rand 0.8.5", @@ -5058,9 +4925,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.35.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e446ed58cef1bbfe847bc2fda0e2e4ea9f0e57b90c507d4781292590d72a4e" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", ] @@ -5181,9 +5048,9 @@ dependencies = [ [[package]] name = "quoted_printable" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" +checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73" [[package]] name = "radium" @@ -5291,7 +5158,7 @@ version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", ] [[package]] @@ -5369,9 +5236,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -5417,47 +5284,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -[[package]] -name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.28", - "hyper-rustls 0.24.2", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.11", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration 0.5.1", - "tokio", - "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.4", - "winreg 0.50.0", -] - [[package]] name = "reqwest" version = "0.12.5" @@ -5474,7 +5300,7 @@ dependencies = [ "http-body 1.0.0", "http-body-util", "hyper 1.2.0", - "hyper-rustls 0.27.2", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -5638,11 +5464,11 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -5692,7 +5518,7 @@ version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -5796,7 +5622,7 @@ version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "clipboard-win", "fd-lock", @@ -5876,7 +5702,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -5963,9 +5789,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] @@ -5990,13 +5816,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -6007,16 +5833,17 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -6052,36 +5879,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.5", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time 0.3.36", -] - -[[package]] -name = "serde_with_macros" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" -dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", - "syn 2.0.68", -] - [[package]] name = "serdect" version = "0.2.0" @@ -6218,7 +6015,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01607fe2e61894468c6dc0b26103abb073fb08b79a3d9e4b6d76a1a341549958" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", ] [[package]] @@ -6411,7 +6208,7 @@ dependencies = [ "proc-macro2", "quote", "struct_iterable_internal", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -6439,7 +6236,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -6501,9 +6298,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -6534,17 +6331,6 @@ dependencies = [ "unicode-xid", ] -[[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 = "sysinfo" version = "0.26.9" @@ -6576,7 +6362,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys 0.6.0", ] @@ -6652,22 +6438,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -6749,9 +6535,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", @@ -6784,7 +6570,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -6818,34 +6604,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls-acme" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ebc06d846f8367f24c3a8882328707d1a5e507ef4f40943723ddbe2c17b9f24" -dependencies = [ - "async-trait", - "base64 0.21.7", - "chrono", - "futures", - "log", - "num-bigint", - "pem 3.0.4", - "proc-macro2", - "rcgen 0.12.1", - "reqwest 0.11.27", - "ring 0.17.8", - "rustls 0.21.11", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-rustls 0.24.1", - "url", - "webpki-roots 0.25.4", - "x509-parser 0.16.0", -] - [[package]] name = "tokio-serde" version = "0.8.0" @@ -6932,14 +6690,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.16", ] [[package]] @@ -6957,18 +6715,18 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.5", + "indexmap", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ - "indexmap 2.2.5", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -7023,7 +6781,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -7277,9 +7035,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom 0.2.12", "serde", @@ -7373,7 +7131,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -7407,7 +7165,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7570,7 +7328,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -7581,7 +7339,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -7832,13 +7590,13 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ - "asn1-rs 0.5.2", + "asn1-rs", "base64 0.13.1", "data-encoding", - "der-parser 8.2.0", + "der-parser", "lazy_static", "nom", - "oid-registry 0.6.1", + "oid-registry", "rusticata-macros", "thiserror", "time 0.3.36", @@ -7850,29 +7608,12 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" dependencies = [ - "asn1-rs 0.5.2", + "asn1-rs", "data-encoding", - "der-parser 8.2.0", + "der-parser", "lazy_static", "nom", - "oid-registry 0.6.1", - "rusticata-macros", - "thiserror", - "time 0.3.36", -] - -[[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", + "oid-registry", "rusticata-macros", "thiserror", "time 0.3.36", @@ -7952,7 +7693,7 @@ dependencies = [ "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -7978,7 +7719,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -7998,7 +7739,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] diff --git a/pkgs/development/libraries/libdeltachat/no-static-lib.patch b/pkgs/by-name/li/libdeltachat/no-static-lib.patch similarity index 100% rename from pkgs/development/libraries/libdeltachat/no-static-lib.patch rename to pkgs/by-name/li/libdeltachat/no-static-lib.patch diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/by-name/li/libdeltachat/package.nix similarity index 89% rename from pkgs/development/libraries/libdeltachat/default.nix rename to pkgs/by-name/li/libdeltachat/package.nix index 3d389866dd32..be37573e2e73 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -14,9 +14,7 @@ , sqlcipher , sqlite , fixDarwinDylibNames -, CoreFoundation -, Security -, SystemConfiguration +, darwin , libiconv }: @@ -31,13 +29,13 @@ let }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.142.1"; + version = "1.142.7"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-ea0OKQWZareqgE1C8lYem3BKaNmqJgYLItOHdPWqz6M="; + hash = "sha256-Wj7fmhp67a3OtzxPbfqOpZCzM9WokzKiaWNQS9qYyCo="; }; patches = [ @@ -61,9 +59,9 @@ in stdenv.mkDerivation rec { sqlcipher sqlite ] ++ lib.optionals stdenv.isDarwin [ - CoreFoundation - Security - SystemConfiguration + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration libiconv ]; diff --git a/pkgs/by-name/li/libdwarf-lite/package.nix b/pkgs/by-name/li/libdwarf-lite/package.nix index 25ea4593de2f..e8bf9bfee696 100644 --- a/pkgs/by-name/li/libdwarf-lite/package.nix +++ b/pkgs/by-name/li/libdwarf-lite/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libdwarf-lite"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "jeremy-rifkin"; repo = "libdwarf-lite"; rev = "v${finalAttrs.version}"; - hash = "sha256-ouhYapiqBFPJwoUIyiuEtsezF2wR63WZL7VwvnDExoU="; + hash = "sha256-S2KDfWqqdQfK5+eQny2X5k0A5u9npkQ8OFRLBmTulao="; }; outputs = [ diff --git a/pkgs/by-name/li/libeduvpn-common/package.nix b/pkgs/by-name/li/libeduvpn-common/package.nix index b6c2120cd9ea..f9dce02b5d40 100644 --- a/pkgs/by-name/li/libeduvpn-common/package.nix +++ b/pkgs/by-name/li/libeduvpn-common/package.nix @@ -16,13 +16,13 @@ buildGoModule rec { buildPhase = '' runHook preBuild - go build -o ${pname}-${version}.so -buildmode=c-shared -tags=release ./exports + go build -o libeduvpn-common-${version}.so -buildmode=c-shared -tags=release ./exports runHook postBuild ''; installPhase = '' runHook preInstall - install -Dt $out/lib ${pname}-${version}.so + install -Dt $out/lib libeduvpn-common-${version}.so runHook postInstall ''; diff --git a/pkgs/by-name/li/libiec61850/package.nix b/pkgs/by-name/li/libiec61850/package.nix index ccbf571bba29..03c8037d6b33 100644 --- a/pkgs/by-name/li/libiec61850/package.nix +++ b/pkgs/by-name/li/libiec61850/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libiec61850"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mz-automation"; repo = "libiec61850"; rev = "v${finalAttrs.version}"; - hash = "sha256-SwJjjSapNaVOH5g46MiS9BkzI0fKm/P1xYug3OX5XbA="; + hash = "sha256-KFUqeDe90wrqMueD8AYgB1scl6OZkKW2z+oV9wREF3k="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index 8db98ea2b664..435d15c34a5d 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; - rev = "${pname}-${version}"; + rev = "libmamba-${version}"; hash = "sha256-sxZDlMFoMLq2EAzwBVO++xvU1C30JoIoZXEX/sqkXS0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/librime-lua/package.nix b/pkgs/by-name/li/librime-lua/package.nix index 887ec14ff0f4..62bae2c162ca 100644 --- a/pkgs/by-name/li/librime-lua/package.nix +++ b/pkgs/by-name/li/librime-lua/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "librime-lua"; - version = "0-unstable-2024-05-19"; + version = "0-unstable-2024-08-19"; src = fetchFromGitHub { owner = "hchunhui"; repo = "librime-lua"; - rev = "7be6974b6d81c116bba39f6707dc640f6636fa4e"; - hash = "sha256-jsrnAFE99d0U0LdddTL7G1p416qJfSNR935TZFH3Swk="; + rev = "fa6563cf7b40f3bfbf09e856420bff8de6820558"; + hash = "sha256-jv5TZSp36UGbaRiXv9iUNLu3DE/yrWANQhY6TWLPD8c="; }; propagatedBuildInputs = [ lua ]; diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index 82adb07f0dbe..458ca16aad1d 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, runCommand, xcodebuild, protobuf, boringssl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, runCommand, xcodebuild, protobuf, boringssl, darwin }: let # boring-sys expects the static libraries in build/ instead of lib/ boringssl-wrapper = runCommand "boringssl-wrapper" { } '' @@ -21,6 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MFTTrIJ9+1NgaL9KD4t0KYR2feHow+HtyYXQWJgKilM="; }; + buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + nativeBuildInputs = [ protobuf rustPlatform.bindgenHook diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index 2d5f3aba27ee..8c7485ed0a43 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "licensure"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "chasinglogic"; repo = "licensure"; rev = version; - hash = "sha256-y7pay64bM1FTjjtJg4hGC45BDbyXUBXBLFUDe0q2k0U="; + hash = "sha256-bo1bac/K8HMZaeLVYZRqYOS8p+62suGlgSyYz8Atj+0="; }; - cargoHash = "sha256-ukNMlz6FnI6otPGiKLphZDEFXujAHb1P5PAt8dgSJ+U="; + cargoHash = "sha256-Ywfn+6qdKD9CG2/xdHR2XDsj5LF5XPJ2+XR5H1o2iXk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl git gitls ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 2ddcbdccaf1e..4500de64cb68 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.2.8"; + version = "15.2.9"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-N1mPtF23YP1yeVNUPIxCAFK3ozOCMKV3ZTt+axIWFmQ="; + hash = "sha256-qEqjB6GBzKx4zRqumMPSRxFnWQ4j+sBKWTspaeorL6Q="; }; - npmDepsHash = "sha256-ivlbaTCvVbs7k4zpP7fFbMdWuO5rOcT/5451PQh2CKs="; + npmDepsHash = "sha256-VQ8UDdPIrhiLvDfpAWLMvCtBIhW/LtRj/CC1j2yEm5o="; dontNpmBuild = true; diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix deleted file mode 100644 index 0ec85d195db7..000000000000 --- a/pkgs/by-name/li/linux-wallpaperengine/package.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ffmpeg -, libglut -, freeimage -, glew -, glfw -, glm -, libGL -, libpulseaudio -, libX11 -, libXau -, libXdmcp -, libXext -, libXpm -, libXrandr -, libXxf86vm -, lz4 -, mpv -, pkg-config -, SDL2 -, SDL2_mixer -, zlib -}: - -stdenv.mkDerivation { - pname = "linux-wallpaperengine"; - version = "unstable-2023-09-23"; - - src = fetchFromGitHub { - owner = "Almamu"; - repo = "linux-wallpaperengine"; - # upstream lacks versioned releases - rev = "21c38d9fd1d3d89376c870cec5c5e5dc7086bc3c"; - hash = "sha256-bZlMHlNKSydh9eGm5cFSEtv/RV9sA5ABs99uurblBZY="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - ffmpeg - libglut - freeimage - glew - glfw - glm - libGL - libpulseaudio - libX11 - libXau - libXdmcp - libXext - libXrandr - libXpm - libXxf86vm - mpv - lz4 - SDL2 - SDL2_mixer.all - zlib - ]; - - meta = { - description = "Wallpaper Engine backgrounds for Linux"; - homepage = "https://github.com/Almamu/linux-wallpaperengine"; - license = lib.licenses.gpl3Only; - mainProgram = "linux-wallpaperengine"; - maintainers = with lib.maintainers; [ eclairevoyant ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index 745d53d9dae2..586fd60ec7b0 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "litmusctl"; - version = "1.8.0"; + version = "1.9.0"; nativeBuildInputs = [ installShellFiles @@ -21,7 +21,7 @@ buildGoModule rec { owner = "litmuschaos"; repo = "litmusctl"; rev = "${version}"; - hash = "sha256-gLXRIfdNDauAn+cRsRDTZB0Doq8U0SCC2xz7bf6nOUk="; + hash = "sha256-6H0trk/ZpUTeHElX8PaYtpYCPiQhQDw2mhuqxDx7pwY="; }; vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; diff --git a/pkgs/by-name/li/littlefs-fuse/package.nix b/pkgs/by-name/li/littlefs-fuse/package.nix index c026a8b7ce07..a4150b8786b5 100644 --- a/pkgs/by-name/li/littlefs-fuse/package.nix +++ b/pkgs/by-name/li/littlefs-fuse/package.nix @@ -5,15 +5,15 @@ stdenv.mkDerivation rec { version = "2.7.8"; src = fetchFromGitHub { owner = "littlefs-project"; - repo = pname; + repo = "littlefs-fuse"; rev = "v${version}"; hash = "sha256-dJt2Tcw+qdcOoZ9ejao9NXys/OYQTvbP9+dD6DCzFAw="; }; buildInputs = [ fuse ]; installPhase = '' runHook preInstall - install -D lfs $out/bin/${pname} - ln -s $out/bin/${pname} $out/bin/mount.littlefs + install -D lfs $out/bin/littlefs-fuse + ln -s $out/bin/littlefs-fuse $out/bin/mount.littlefs ln -s $out/bin $out/sbin runHook postInstall ''; diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 4e760f31a292..c629ff54ea6f 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2024.06.26"; + version = "2024.08.01"; src = fetchurl { urls = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-l+n6AV/GVZgIlV7HoMkP5AALho8ExYeU/2J/ilYtLxw="; + hash = "sha256-g5q3Q30B5in4CU6h7Ix6e7UEx97tnt/J4XrDT5oaGT8="; }; patches = [ diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index 0e2b6997f153..31b4f2f65601 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.7.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${version}"; - hash = "sha256-wUMp2U++6LQm8Iyv6CI8NSoc1sL2k/N12m4FVr35RS0="; + hash = "sha256-z3xXvs31SMEq0Wfhm/v+7iznCsz/kNqwhQsMueQmEhw="; }; - vendorHash = "sha256-SN92BqNsbtXHwIcEk6AmVLoKyPr8Pn4MbKEIYS4ZodQ="; + vendorHash = "sha256-aVKCDDlCkFlFa88H1UAR98Hai5junVWVxVZPK5i+nM8="; subPackages = [ "cmd/server" ]; diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index 4dbbd05fde29..618f99f03fc5 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -17,6 +17,10 @@ , buildGoModule , makeWrapper , ncurses +, which + +, enable_upx ? true +, upx # apply feature parameter names according to # https://github.com/NixOS/rfcs/pull/169 @@ -115,8 +119,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "cb5fad4c6c2cbef92e9b8b63449e1cb7664e4846"; - hash = "sha256-cIJuDC+MFLd5hkA1kUxuaw2dZagHqn5fi5Q2XKvDEII="; + rev = "ed9d2854c9de4ae1f448334294e61167b04bec2a"; + hash = "sha256-Xu2h9Zu+Q9utfFFmDWBOEu/EXth4xWRNoTMvPF5Fo/A="; fetchSubmodules = true; }; postPatch = prev.postPatch + '' @@ -269,8 +273,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "b29b3b29240aac8b71ce8e5a4360c1f1562ad66f"; - hash = "sha256-vSd+AP9AexbG4wvdkk6wjxYQBZdKWGK2Ix7c86MUfB8="; + rev = "6739eb83c3ca5cf40d24c6fe8442a761a1eb6248"; + hash = "sha256-1yDdJVjIwYDJKn93zn4xOJXMoDTqaG2TvakjdHIMCxk="; }; nativeBuildInputs = [ cmake pkg-config ] @@ -388,58 +392,67 @@ let stdenv; pname = "local-ai"; - version = "2.18.1"; + version = "2.19.4"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-hRrbGUUawQV4fqxAn3eFBvn4/lZ+NrKhxnGHqpljrec="; + hash = "sha256-aKq6/DI+4+BvIEw6eONqPr3mZXuz7rMFN+FBypVj0Gc="; }; + prepare-sources = + let + cp = "cp -r --no-preserve=mode,ownership"; + in + '' + mkdir sources + ${cp} ${go-llama} sources/go-llama.cpp + ${cp} ${gpt4all} sources/gpt4all + ${cp} ${if with_tts then go-piper else go-piper.src} sources/go-piper + ${cp} ${go-rwkv} sources/go-rwkv.cpp + ${cp} ${whisper-cpp.src} sources/whisper.cpp + cp ${whisper-cpp}/lib/lib*.a sources/whisper.cpp + ${cp} ${go-bert} sources/go-bert.cpp + ${cp} ${if with_stablediffusion then go-stable-diffusion else go-stable-diffusion.src} sources/go-stable-diffusion + ${cp} ${if with_tinydream then go-tiny-dream else go-tiny-dream.src} sources/go-tiny-dream + ''; + self = buildGoModule.override { stdenv = effectiveStdenv; } { inherit pname version src; - vendorHash = "sha256-uvko1PQWW5P+6cgmwVKocKBm5GndszqCsSbxlXANqJs="; + vendorHash = "sha256-HEKE75+ixuNbM+KEuhbQQ/NYYEzVlGYOttPavftWKhk="; env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4"; - postPatch = - let - cp = "cp -r --no-preserve=mode,ownership"; - in - '' - sed -i Makefile \ - -e 's;git clone.*go-llama\.cpp$;${cp} ${go-llama} sources/go-llama\.cpp;' \ - -e 's;git clone.*gpt4all$;${cp} ${gpt4all} sources/gpt4all;' \ - -e 's;git clone.*go-piper$;${cp} ${if with_tts then go-piper else go-piper.src} sources/go-piper;' \ - -e 's;git clone.*go-rwkv\.cpp$;${cp} ${go-rwkv} sources/go-rwkv\.cpp;' \ - -e 's;git clone.*whisper\.cpp$;${cp} ${whisper-cpp.src} sources/whisper\.cpp;' \ - -e 's;git clone.*go-bert\.cpp$;${cp} ${go-bert} sources/go-bert\.cpp;' \ - -e 's;git clone.*diffusion$;${cp} ${if with_stablediffusion then go-stable-diffusion else go-stable-diffusion.src} sources/go-stable-diffusion;' \ - -e 's;git clone.*go-tiny-dream$;${cp} ${if with_tinydream then go-tiny-dream else go-tiny-dream.src} sources/go-tiny-dream;' \ - -e 's, && git checkout.*,,g' \ - -e '/mod download/ d' \ - -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-fallback/ d' \ - -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-avx/ d' \ - -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-cuda/ d' \ + postPatch = '' + sed -i Makefile \ + -e '/mod download/ d' \ + -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-fallback/ d' \ + -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-avx/ d' \ + -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-cuda/ d' \ - '' + lib.optionalString with_cublas '' - sed -i Makefile \ - -e '/^CGO_LDFLAGS_WHISPER?=/ s;$;-L${libcufft}/lib -L${cuda_cudart}/lib;' - ''; + '' + lib.optionalString with_cublas '' + sed -i Makefile \ + -e '/^CGO_LDFLAGS_WHISPER?=/ s;$;-L${libcufft}/lib -L${cuda_cudart}/lib;' + ''; - postConfigure = '' + postConfigure = prepare-sources + '' shopt -s extglob mkdir -p backend-assets/grpc cp ${llama-cpp-grpc}/bin/grpc-server backend-assets/grpc/llama-cpp-avx2 cp ${llama-cpp-rpc}/bin/grpc-server backend-assets/grpc/llama-cpp-grpc + mkdir -p backend/cpp/llama/llama.cpp + mkdir -p backend-assets/util cp ${llama-cpp-rpc}/bin/llama-rpc-server backend-assets/util/llama-cpp-rpc-server + + # avoid rebuild of prebuilt make targets + touch backend-assets/grpc/* backend-assets/util/* sources/**/lib*.a ''; buildInputs = [ ] - ++ lib.optionals with_cublas [ libcublas ] + ++ lib.optionals with_cublas [ cuda_cudart libcublas libcufft ] ++ lib.optionals with_clblas [ clblast ocl-icd opencl-headers ] ++ lib.optionals with_openblas [ openblas.dev ] ++ lib.optionals with_stablediffusion go-stable-diffusion.buildInputs @@ -451,14 +464,15 @@ let protoc-gen-go-grpc makeWrapper ncurses # tput + which ] + ++ lib.optional enable_upx upx ++ lib.optionals with_cublas [ cuda_nvcc ]; enableParallelBuilding = false; - modBuildPhase = '' - mkdir sources - make prepare-sources protogen-go + modBuildPhase = prepare-sources + '' + make protogen-go go mod tidy -v ''; @@ -478,12 +492,6 @@ let buildPhase = '' runHook preBuild - mkdir sources - make prepare-sources - # avoid rebuild of prebuilt libraries - touch sources/**/lib*.a - cp ${whisper-cpp}/lib/static/lib*.a sources/whisper.cpp - local flagsArray=( ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES}} SHELL=$SHELL @@ -518,7 +526,8 @@ let ] ++ lib.optionals with_clblas [ clblast ocl-icd ] ++ lib.optionals with_openblas [ openblas ] - ++ lib.optionals with_tts [ piper-phonemize ]; + ++ lib.optionals with_tts [ piper-phonemize ] + ++ lib.optionals (with_tts && enable_upx) [ fmt spdlog ]; in '' wrapProgram $out/bin/${pname} \ diff --git a/pkgs/by-name/lo/local-ai/tests.nix b/pkgs/by-name/lo/local-ai/tests.nix index 5740362f24ef..17119d2b250e 100644 --- a/pkgs/by-name/lo/local-ai/tests.nix +++ b/pkgs/by-name/lo/local-ai/tests.nix @@ -101,17 +101,16 @@ in # https://localai.io/advanced/#full-config-model-file-reference model-configs.${model} = rec { - context_size = 8192; + context_size = 16 * 1024; # 128kb is possible, but needs 16GB RAM backend = "llama-cpp"; parameters = { - # https://huggingface.co/lmstudio-community/Meta-Llama-3-8B-Instruct-GGUF - # https://ai.meta.com/blog/meta-llama-3/ + # https://ai.meta.com/blog/meta-llama-3-1/ model = fetchurl { - url = "https://huggingface.co/lmstudio-community/Meta-Llama-3-8B-Instruct-GGUF/resolve/main/Meta-Llama-3-8B-Instruct-Q4_K_M.gguf"; - sha256 = "ab9e4eec7e80892fd78f74d9a15d0299f1e22121cea44efd68a7a02a3fe9a1da"; + url = "https://huggingface.co/lmstudio-community/Meta-Llama-3.1-8B-Instruct-GGUF/resolve/main/Meta-Llama-3.1-8B-Instruct-Q4_K_M.gguf"; + sha256 = "f2be3e1a239c12c9f3f01a962b11fb2807f8032fdb63b0a5502ea42ddef55e44"; }; # defaults from: - # https://deepinfra.com/meta-llama/Meta-Llama-3-8B-Instruct + # https://deepinfra.com/meta-llama/Meta-Llama-3.1-8B-Instruct temperature = 0.7; top_p = 0.9; top_k = 0; @@ -135,7 +134,9 @@ in {{.Content}}${builtins.head stopwords}''; - chat = "<|begin_of_text|>{{.Input}}<|start_header_id|>assistant<|end_header_id|>"; + chat = "{{.Input}}<|start_header_id|>assistant<|end_header_id|>"; + + completion = "{{.Input}}"; }; }; @@ -185,7 +186,7 @@ in machine.succeed("curl -f http://localhost:${port}/v1/chat/completions --json @${writers.writeJSON "request-chat-completions.json" requests.chat-completions} --output chat-completions.json") machine.copy_from_vm("chat-completions.json") machine.succeed("${jq}/bin/jq --exit-status 'debug | .object == \"chat.completion\"' chat-completions.json") - machine.succeed("${jq}/bin/jq --exit-status 'debug | .choices | first.message.content | tonumber == 3' chat-completions.json") + machine.succeed("${jq}/bin/jq --exit-status 'debug | .choices | first.message.content | split(\" \") | last | tonumber == 3' chat-completions.json") machine.succeed("curl -f http://localhost:${port}/v1/edits --json @${writers.writeJSON "request-edit-completions.json" requests.edit-completions} --output edit-completions.json") machine.copy_from_vm("edit-completions.json") diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix index 8fbfc3acbf0d..504500cad7aa 100644 --- a/pkgs/by-name/lo/localsend/package.nix +++ b/pkgs/by-name/lo/localsend/package.nix @@ -14,7 +14,7 @@ let pname = "localsend"; - version = "1.15.0"; + version = "1.15.4"; linux = flutter313.buildFlutterApplication rec { inherit pname version; @@ -23,7 +23,7 @@ let owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-u/vPVuY2YX+LQGzqiohtaYcUu7lEmGkcsWDMBIaXKok="; + hash = "sha256-kfqLYe15NIRH12+AastWkLBk4L0MKEV5XZ/klE+pK7g="; }; sourceRoot = "${src.name}/app"; @@ -75,7 +75,7 @@ let src = fetchurl { url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg"; - hash = "sha256-45IV2rDaL5tAOLLqPrMHHHFJaiFqmDyTyro6RilI0Zo="; + hash = "sha256-ZU2aXZNKo01TnXNH0e+r0l4J5HIILmGam3T4+6GaeA4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lo/localsend/pubspec.lock.json b/pkgs/by-name/lo/localsend/pubspec.lock.json index 6969397b6009..55af791cddd5 100644 --- a/pkgs/by-name/lo/localsend/pubspec.lock.json +++ b/pkgs/by-name/lo/localsend/pubspec.lock.json @@ -473,11 +473,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "d1d0ac3966b36dc3e66eeefb40280c17feb87fa2099c6e22e6a1fc959327bd03", + "sha256": "45c70b43df893027e441a6fa0aacc8f484fb9f9c60c746dc8f1dc4f774cf55cd", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.0+1" + "version": "8.0.2" }, "file_selector": { "dependency": "direct main", @@ -743,16 +743,6 @@ "source": "hosted", "version": "3.0.0" }, - "http_methods": { - "dependency": "transitive", - "description": { - "name": "http_methods", - "sha256": "6bccce8f1ec7b5d701e7921dca35e202d425b57e317ba1a37f2638590e29e566", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, "http_multi_server": { "dependency": "transitive", "description": { @@ -1595,7 +1585,7 @@ "version": "0.8.1" }, "shelf": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "shelf", "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", @@ -1614,16 +1604,6 @@ "source": "hosted", "version": "3.0.2" }, - "shelf_router": { - "dependency": "direct main", - "description": { - "name": "shelf_router", - "sha256": "f5e5d492440a7fb165fe1e2e1a623f31f734d3370900070b2b1e0d0428d59864", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.4" - }, "shelf_static": { "dependency": "transitive", "description": { @@ -2101,14 +2081,14 @@ "version": "1.1.0" }, "web": { - "dependency": "transitive", + "dependency": "direct overridden", "description": { "name": "web", - "sha256": "dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.4-beta" + "version": "0.5.1" }, "web_socket_channel": { "dependency": "transitive", diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index 2ede057a2fc7..72bedaf64f36 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -33,7 +33,7 @@ in { src = fetchurl { inherit hash; url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-${suffix}"; - name = lib.optionalString stdenv.isLinux "${pname}-${version}.AppImage"; + name = lib.optionalString stdenv.isLinux "logseq-${version}.AppImage"; }; nativeBuildInputs = [ makeWrapper ] @@ -52,35 +52,35 @@ in { appimageContents = appimageTools.extract { inherit pname src version; }; in '' - mkdir -p $out/bin $out/share/${pname} $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop + mkdir -p $out/bin $out/share/logseq $out/share/applications + cp -a ${appimageContents}/{locales,resources} $out/share/logseq + cp -a ${appimageContents}/Logseq.desktop $out/share/applications/logseq.desktop # remove the `git` in `dugite` because we want the `git` in `nixpkgs` - chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git - chmod +w $out/share/${pname}/resources/app/node_modules/dugite - rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git - chmod -w $out/share/${pname}/resources/app/node_modules/dugite + chmod +w -R $out/share/logseq/resources/app/node_modules/dugite/git + chmod +w $out/share/logseq/resources/app/node_modules/dugite + rm -rf $out/share/logseq/resources/app/node_modules/dugite/git + chmod -w $out/share/logseq/resources/app/node_modules/dugite mkdir -p $out/share/pixmaps - ln -s $out/share/${pname}/resources/app/icons/logseq.png $out/share/pixmaps/${pname}.png + ln -s $out/share/logseq/resources/app/icons/logseq.png $out/share/pixmaps/logseq.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace Exec=Logseq Exec=${pname} \ - --replace Icon=Logseq Icon=${pname} + substituteInPlace $out/share/applications/logseq.desktop \ + --replace Exec=Logseq Exec=logseq \ + --replace Icon=Logseq Icon=logseq '') + lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications/Logseq.app,bin} cp -R . $out/Applications/Logseq.app - makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/${pname} + makeWrapper $out/Applications/Logseq.app/Contents/MacOS/Logseq $out/bin/logseq '' + '' runHook postInstall ''; postFixup = lib.optionalString stdenv.isLinux '' # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron}/bin/electron $out/bin/logseq \ --set "LOCAL_GIT_DIRECTORY" ${git} \ - --add-flags $out/share/${pname}/resources/app \ + --add-flags $out/share/logseq/resources/app \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ''; diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 77a7e83760a3..39e137046703 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -37,7 +37,7 @@ buildDotnetModule rec { homepage = "https://lubelogger.com"; changelog = "https://github.com/hargata/lubelog/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ samasaur ]; + maintainers = with maintainers; [ lyndeno ]; mainProgram = "CarCareTracker"; platforms = platforms.all; }; diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix new file mode 100644 index 000000000000..7f6324d8162e --- /dev/null +++ b/pkgs/by-name/lu/lug-helper/package.nix @@ -0,0 +1,70 @@ +{ + stdenvNoCC, + lib, + makeDesktopItem, + makeWrapper, + copyDesktopItems, + coreutils, + findutils, + zenity, + fetchFromGitHub, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + name = "lug-helper"; + version = "2.18"; + src = fetchFromGitHub { + owner = "starcitizen-lug"; + repo = "lug-helper"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-x6o9hNXadlZrww5+a9xZtNfRwxKuTO/O9M9iYvhMIYc="; + }; + + buildInputs = [ + coreutils + findutils + zenity + ]; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + desktopItems = [ + (makeDesktopItem { + name = "lug-helper"; + exec = "lug-helper"; + icon = "lug-logo"; + comment = "Star Citizen LUG Helper"; + desktopName = "LUG Helper"; + categories = [ "Utility" ]; + mimeTypes = [ "application/x-lug-helper" ]; + }) + ]; + + postInstall = '' + install -Dm755 lug-helper.sh $out/bin/lug-helper + install -Dm644 lug-logo.png $out/share/pixmaps/lug-logo.png + install -Dm644 lib/* -t $out/share/lug-helper + + wrapProgram $out/bin/lug-helper \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + findutils + zenity + ] + } + + ''; + passthru.updateScript = nix-update-script { }; + meta = { + description = "Script to manage and optimize Star Citizen on Linux"; + homepage = "https://github.com/starcitizen-lug/lug-helper"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fuzen ]; + platforms = lib.platforms.linux; + mainProgram = "lug-helper"; + }; +}) diff --git a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix index d4b2d8969597..fc8bb799930f 100644 --- a/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix +++ b/pkgs/by-name/lx/lxgw-wenkai-tc/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai-tc"; version = "1.330"; src = fetchurl { - url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/${pname}-v${version}.tar.gz"; + url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/lxgw-wenkai-tc-v${version}.tar.gz"; hash = "sha256-qpX5shH1HbGMa287u/R1rMFgQeAUC0wwKFVD+QSTyho="; }; diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index d51abe1b6a72..f080d11488b3 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "maa-cli"; - version = "0.4.10"; + version = "0.4.11"; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "maa-cli"; rev = "v${version}"; - hash = "sha256-qCIA+VN7mSfeLwN+O2wm0CYDQMCUQzZrj5RxpDEEKQk="; + hash = "sha256-ycX2enTMcBwXXz5khLJEIFcX6pPzsoq5rKpOQIUg1rg="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; buildFeatures = [ "git2" ]; - cargoHash = "sha256-exLXowD2QTW4IZHIO3PDv6cf0O0deNPuqrCIcTnnJQA="; + cargoHash = "sha256-Eftr/IxOGD4HCFgePguoZTg99yx1itBH28MHXrHKv8Y="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 diff --git a/pkgs/by-name/ma/mailsy/package.nix b/pkgs/by-name/ma/mailsy/package.nix new file mode 100644 index 000000000000..7bda524ab227 --- /dev/null +++ b/pkgs/by-name/ma/mailsy/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: +buildNpmPackage rec { + pname = "mailsy"; + version = "5.0.0"; + + src = fetchFromGitHub { + owner = "BalliAsghar"; + repo = "Mailsy"; + rev = version; + hash = "sha256-RnOWvu023SOcN83xEEkYFwgDasOmkMwSzJ/QYjvTBDo="; + }; + + npmDepsHash = "sha256-ljmqNmLvRHPdsKyOdDfECBXHTIExM6nPZF45lqV+pDM="; + + npmFlags = [ "--legacy-peer-deps" ]; + + dontNpmBuild = true; + + postPatch = '' + substituteInPlace utils/index.js \ + --replace-fail 'dirname, "../data/account.json"' 'process.cwd(), "account.json"' \ + --replace-fail 'dirname, "../data/email.html"' 'process.cwd(), "email.html"' + ''; + + meta = { + description = "Quickly generate a disposable email straight from terminal"; + mainProgram = "mailsy"; + homepage = "https://fig.io/manual/mailsy"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers._404wolf ]; + }; +} diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix new file mode 100644 index 000000000000..822feef1debf --- /dev/null +++ b/pkgs/by-name/ma/manifold/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + clipper2, + gtest, + glm, + tbb_2021_11, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "manifold"; + version = "2.5.1-unstable-2024-08-18"; + + src = fetchFromGitHub { + owner = "elalish"; + repo = "manifold"; + rev = "74e15b1574ebe6ae01d1fd2cffbe75aeeb7b8fab"; + hash = "sha256-T/uaiHNJvk16XobjJlVbawKJ2ktFaCtI63kTFc6Z5Fc="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + gtest + glm + tbb_2021_11 + clipper2 + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_SHARED_LIBS=ON" + "-DMANIFOLD_TEST=ON" + "-DMANIFOLD_PAR=TBB" + ]; + + doCheck = true; + checkPhase = '' + test/manifold_test + ''; + + meta = { + description = "Geometry library for topological robustness"; + homepage = "https://github.com/elalish/manifold"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + hzeller + pca006132 + ]; + }; +}) diff --git a/pkgs/by-name/ma/materialgram/package.nix b/pkgs/by-name/ma/materialgram/package.nix new file mode 100644 index 000000000000..8ecbc725601f --- /dev/null +++ b/pkgs/by-name/ma/materialgram/package.nix @@ -0,0 +1,34 @@ +{ + telegram-desktop, + lib, + fetchFromGitHub, +}: +telegram-desktop.overrideAttrs ( + finalAttrs: previousAttrs: { + pname = "materialgram"; + version = "5.4.1.1"; + + src = fetchFromGitHub { + owner = "kukuruzka165"; + repo = "materialgram"; + rev = "refs/tags/v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-enA/8mIXcRTPGyZFgZ5Wg4fWq4fD4rtjH7bm/32FZaE"; + }; + + meta = previousAttrs.meta // { + description = "Telegram Desktop fork with material icons and some improvements"; + longDescription = '' + Telegram Desktop fork with Material Design and other improvements, + which is based on the Telegram API and the MTProto secure protocol. + ''; + homepage = "https://kukuruzka165.github.io/materialgram/"; + changelog = "https://github.com/kukuruzka165/materialgram/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ + oluceps + aleksana + ]; + mainProgram = "materialgram"; + }; + } +) diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index c36a099b79c9..8b30e7fea45c 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-d2"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "danieleades"; repo = "mdbook-d2"; rev = "v${version}"; - hash = "sha256-IkMydlmUQrZbOZYzQFxzROhdwlcO0H6MzQo42fBEYQE="; + hash = "sha256-5/vChjSYMlCcieA10jncoXZw9Gpeol+Am7mUo78Zqho="; }; - cargoHash = "sha256-xc00/FOQtAg2u8bZxaTbk8+gX7r+q9O8DKgWchPnOJc="; + cargoHash = "sha256-lZ92vvRYXEBMx6ka8RP1wXctf73QNp5rNE8n7O96AEc="; doCheck = false; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 7cce5d54a650..5e49a9031a2d 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -112,6 +112,9 @@ pythonpkgs.buildPythonApplication rec { substituteInPlace mealie/db/init_db.py \ --replace-fail 'PROJECT_DIR = ' "PROJECT_DIR = Path('$out') #" + + substituteInPlace mealie/services/backups_v2/alchemy_exporter.py \ + --replace-fail '"script_location", path.join(PROJECT_DIR, "alembic")' '"script_location", "${src}/alembic"' ''; postInstall = let diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 925b6c70e4a0..9c4130f06015 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-08-11"; + version = "0.9.5-unstable-2024-08-19"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "e290c42360f5f2ae7182c5430234545f3b066876"; - hash = "sha256-idsUxEsR9MPAY3arH4UNEsB6Cds4yZUaZOilqUQCnDE"; + rev = "824eb370e4bbf8f4b90279b0488b65bff2bda683"; + hash = "sha256-caVkdth4/7+WyjNcayZ1ww5kvvMmEycZP5nEZ9p3rO4="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/by-name/me/mesos-dns/package.nix similarity index 79% rename from pkgs/servers/mesos-dns/default.nix rename to pkgs/by-name/me/mesos-dns/package.nix index 1760a41777df..52f6ba74fd89 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/by-name/me/mesos-dns/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mesos-dns"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "m3scluster"; repo = "mesos-dns"; rev = "v${version}"; - hash = "sha256-lURD0WAHC4klRdV6/YhKNtXh03zcVuDzTj/LvKYomLk="; + hash = "sha256-6uuaSCPBY+mKfU2Xku9M1oF5jwxogR2Rki4AIdsjLr0="; }; - vendorHash = "sha256-OILARWv9CDQEzzn7He/P8Z2Ug7m05AqOndoeM1sUpII="; + vendorHash = "sha256-k47kxdkwhf9b8DdvWzwhj12ebvPYezxyIJ8w1Zn+Xew="; subPackages = [ "." ]; diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix index 19ca8a9dd33e..0911b800ee2a 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.143.0"; + version = "1.146.1"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "metacubexd"; rev = "v${finalAttrs.version}"; - hash = "sha256-GHyA7VO1kfmFk0tTysrEk11bToSfbuTDvf9krO9zEqQ="; + hash = "sha256-Vm2DPdfHx0WtB8RFq0wfCvBVdGVaX6PXrN/nAtNKv1E="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-PZnsmpVWZpd5albzMiEvsvQb2tWlt4HB40Mwz+ZCKVU="; + hash = "sha256-G95Iu268vnYwFsbD/kTy8n/Fu5Da9qXdy3LadbrsUHc="; }; buildPhase = '' diff --git a/pkgs/by-name/me/meteor-git/package.nix b/pkgs/by-name/me/meteor-git/package.nix new file mode 100644 index 000000000000..ed2580dd6b3e --- /dev/null +++ b/pkgs/by-name/me/meteor-git/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: + +buildGoModule rec { + pname = "meteor-git"; + version = "0.22.0"; + + src = fetchFromGitHub { + owner = "stefanlogue"; + repo = "meteor"; + rev = "v${version}"; + hash = "sha256-aY/gOKvcKtOnL4FI2SM339LU4HoWYCq0W9mK2GyMqso="; + }; + + vendorHash = "sha256-jKd/eJwp5SZvTrP3RN7xT7ibAB0PQondGR3RT+HQXIo="; + + meta = { + description = "CLI tool for writing conventional commits"; + mainProgram = "meteor"; + homepage = "https://github.com/stefanlogue/meteor"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nebunebu ]; + }; +} diff --git a/pkgs/by-name/mi/microsoft-identity-broker/package.nix b/pkgs/by-name/mi/microsoft-identity-broker/package.nix index 1ab977d04e82..2866d38da4cd 100644 --- a/pkgs/by-name/mi/microsoft-identity-broker/package.nix +++ b/pkgs/by-name/mi/microsoft-identity-broker/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "2.0.1"; src = fetchurl { - url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/${pname}/${pname}_${version}_amd64.deb"; + url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/microsoft-identity-broker/microsoft-identity-broker_${version}_amd64.deb"; hash = "sha256-O9zbImSWMrRsaOozj5PsCRvQ3UsaJzLfoTohmLZvLkM="; }; diff --git a/pkgs/by-name/mi/minetest-mapserver/package.nix b/pkgs/by-name/mi/minetest-mapserver/package.nix index bc35c9598847..525918caab20 100644 --- a/pkgs/by-name/mi/minetest-mapserver/package.nix +++ b/pkgs/by-name/mi/minetest-mapserver/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { version = "4.9.1"; src = fetchFromGitHub { - owner = pname; + owner = "minetest-mapserver"; repo = "mapserver"; rev = "v${version}"; hash = "sha256-3bL23hwJgYMPV2nSSfq9plttcx7UYvhUa6OCbKfBACY="; @@ -19,8 +19,8 @@ buildGoModule rec { meta = with lib; { description = "Realtime mapserver for minetest"; mainProgram = "mapserver"; - homepage = "https://github.com/${pname}/mapserver/blob/master/readme.md"; - changelog = "https://github.com/${pname}/mapserver/releases/tag/v${version}"; + homepage = "https://github.com/minetest-mapserver/mapserver/blob/master/readme.md"; + changelog = "https://github.com/minetest-mapserver/mapserver/releases/tag/v${version}"; license = with licenses; [ mit cc-by-sa-30 ]; platforms = platforms.all; maintainers = with maintainers; [ gm6k ]; diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index e29deb34f943..c93995188502 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, gitUpdater, nixosTests, boost, @@ -19,20 +20,30 @@ nlohmann_json, pcre2, pkg-config, + wayland, yaml-cpp, }: stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mattkae"; repo = "miracle-wm"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ss93yI33e+XFjbKedbBjmYHkjPeWUWxEStwNTgTszA4="; + hash = "sha256-T5KDnUy/+wRL74v48i3D1OQrHuIoI1WUeybx9D7y+8Y="; }; + patches = [ + # Remove when https://github.com/mattkae/miracle-wm/pull/211 merged & in release + (fetchpatch { + name = "0001-miracle-wm-Dont-ignore-PKG_CONFIG_PATH.patch"; + url = "https://github.com/mattkae/miracle-wm/commit/a9fe6ed1e7dc605f72e18cdc2d19afb3c187be3a.patch"; + hash = "sha256-zzOwqUjyZGYIy/3BvOiedfCubrqaeglvsAzTXyq3wYU="; + }) + ]; + postPatch = '' substituteInPlace session/usr/local/share/wayland-sessions/miracle-wm.desktop.in \ @@ -66,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { mir nlohmann_json pcre2 + wayland yaml-cpp ]; diff --git a/pkgs/by-name/mi/miru/darwin.nix b/pkgs/by-name/mi/miru/darwin.nix index ca633cf73573..11a3b2e6b63e 100644 --- a/pkgs/by-name/mi/miru/darwin.nix +++ b/pkgs/by-name/mi/miru/darwin.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/mac-Miru-${version}-mac.zip"; - hash = "sha256-1Qfd5lYcT6tUSQD46yOIus/esOrvAVfn7VeHm9t0OLg="; + hash = "sha256-4PUi/q9Dtyp6c++hmwfoW5cluzolZYANnKXtiMqlMGo="; }; sourceRoot = "."; diff --git a/pkgs/by-name/mi/miru/linux.nix b/pkgs/by-name/mi/miru/linux.nix index 54ba6371846e..72f0f5fd73fa 100644 --- a/pkgs/by-name/mi/miru/linux.nix +++ b/pkgs/by-name/mi/miru/linux.nix @@ -19,7 +19,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha256-c0Rf+mny6yURfONUw4TmSzgE6i0y7kd+F4T7V+BfJsY="; + hash = "sha256-NjsuI9GFMVJ6+E03UDPq6xrzlO0Vs1nfYsOE6TDVwY0="; }; extraInstallCommands = diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix index f367d0694273..477196184bba 100644 --- a/pkgs/by-name/mi/miru/package.nix +++ b/pkgs/by-name/mi/miru/package.nix @@ -5,7 +5,7 @@ }: let pname = "miru"; - version = "5.2.14"; + version = "5.3.1"; meta = with lib; { description = "Stream anime torrents, real-time with no waiting for downloads"; homepage = "https://miru.watch"; diff --git a/pkgs/by-name/mo/mollysocket/package.nix b/pkgs/by-name/mo/mollysocket/package.nix index d2fd8ccbff0e..c5772f2edc4b 100644 --- a/pkgs/by-name/mo/mollysocket/package.nix +++ b/pkgs/by-name/mo/mollysocket/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "mollysocket"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "mollyim"; repo = "mollysocket"; rev = version; - hash = "sha256-wZIP4mmIrg8D70C8jLjPC/+TlOT+gP7YOkM1Ey44Tvk="; + hash = "sha256-vE5J4BKYmVqtowfxDDTOwFKws7phYRm9xKFPiDNuNn4="; }; - cargoHash = "sha256-3yTbwbgOIm69Nf8stPMMhgR6g0sfenycx07by8AM01M="; + cargoHash = "sha256-s/EhX5o6XuUqcrqhXY274MyWhRukgetfIZKQ4XNlq6Y="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index b05a66724479..9debda7181af 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation (finalAttrs: { or (throw "unsupported system: ${stdenv.hostPlatform.system}") ); - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + dontStrip = true; buildInputs = [ # This is to avoid the following error: diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index a34867e99848..7e85d98a3b38 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.5"; + version = "1.43.6"; 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-91qTy/y+p1yPt5tEfKmGT7lGKndsel902bcHTh7UB20="; + hash = "sha256-pAjOFwQdzxvDs1rx6xuvr2W59/jPwZakoShG9h6qfJE="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix index ebc0f8938c4f..e840f9e56da9 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 = "4.4.7"; + version = "4.4.8"; in python3.pkgs.buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonPackage { owner = "mov-cli"; repo = "mov-cli"; rev = "refs/tags/${version}"; - hash = "sha256-wbzgTtRMDx9WpILzOGNvTrxj+wN6QzRCUNsc7PfwzJk="; + hash = "sha256-MpSwSYsHsrG7ceXXJnFMg1bgadOhe23eNVCNMxlY0pQ="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index bd3a4dee4213..665b0d5cd889 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -38,13 +38,13 @@ let in php.buildComposerProject (finalAttrs: { pname = "movim"; - version = "0.26"; + version = "0.27.1"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-ffAA4aDcjJSuqBIqI6b36daAp7UWj+FpWxYiY+c+f5Q="; + hash = "sha256-7/8d+GU/hLaiFqo4Rl0ardhOwEpSeJ3GfJMNpGbNlnU="; }; php = php.buildEnv ({ @@ -67,7 +67,7 @@ php.buildComposerProject (finalAttrs: { # pinned commonmark composerStrictValidation = false; - vendorHash = "sha256-4KNGWI4hvlDnIxo9nh/hytxkk+KVxjB8uF/HB88XPwQ="; + vendorHash = "sha256-wDnOh1CdJOovqmr4k45ksycuylYwL0Dm/UTl4EETf1k="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; diff --git a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix index 2fcccf8c6c9e..b06f097c76d8 100644 --- a/pkgs/by-name/ms/msalsdk-dbusclient/package.nix +++ b/pkgs/by-name/ms/msalsdk-dbusclient/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.0.1"; src = fetchurl { - url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/${pname}/${pname}_${version}_amd64.deb"; + url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/msalsdk-dbusclient/msalsdk-dbusclient_${version}_amd64.deb"; hash = "sha256-AVPrNxCjXGza2gGETP0YrlXeEgI6AjlrSVTtqKb2UBI="; }; diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index b889fe359618..cd7c6793b5f2 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "music-assistant-frontend"; - version = "2.7.0"; + version = "2.8.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KrloxxdqIwQ5NsxAGm28D5StHnw9LTqDDtcchD5X5Qk="; + hash = "sha256-L7ASmYtJja+Hy4MnGrNWIwSjvhfq2iXfWm4gGKAnEec="; }; postPatch = '' diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index c40ccf1a6716..73845eec3bc4 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -11,19 +11,6 @@ let python = python3.override { self = python; packageOverrides = self: super: { - aiojellyfin = super.aiojellyfin.overridePythonAttrs rec { - version = "0.9.2"; - - src = fetchFromGitHub { - owner = "jc2k"; - repo = "aiojellyfin"; - rev = "refs/tags/v${version}"; - hash = "sha256-q+b1tKr46qq3PULPkCaQk2VoC1aaNxPK/E1Kj4PABfI="; - }; - - doCheck = false; - }; - music-assistant-frontend = self.callPackage ./frontend.nix { }; }; }; @@ -37,14 +24,14 @@ in python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.1.1"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; rev = "refs/tags/${version}"; - hash = "sha256-ALsl2xfAFYejDEhR5/ZpeIxoHFgvz471tb4OP5xQAUE="; + hash = "sha256-GQvbkdyybJ3X09fCKwu+iZvq7UdHIMzCpYjenGg/zQA="; }; patches = [ diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index 702dadf127dd..4e50e3fcf045 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.1.1"; + version = "2.2.0"; providers = { airplay = [ ]; @@ -61,7 +61,10 @@ ]; soundcloud = [ ]; # missing soundcloudpy - spotify = [ + spotify = ps: with ps; [ + pkce + ]; + template_player_provider = [ ]; test = [ ]; diff --git a/pkgs/by-name/my/mycelium/Cargo.lock b/pkgs/by-name/my/mycelium/Cargo.lock index d60fb37a9c0c..6aac9ba0f592 100644 --- a/pkgs/by-name/my/mycelium/Cargo.lock +++ b/pkgs/by-name/my/mycelium/Cargo.lock @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" @@ -127,6 +127,12 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +[[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" @@ -230,6 +236,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" @@ -247,6 +259,9 @@ name = "bitflags" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] [[package]] name = "bitvec" @@ -262,9 +277,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", "arrayvec", @@ -273,6 +288,15 @@ dependencies = [ "constant_time_eq", ] +[[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 = "borsh" version = "1.5.1" @@ -280,7 +304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" dependencies = [ "borsh-derive", - "cfg_aliases 0.2.1", + "cfg_aliases", ] [[package]] @@ -344,9 +368,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "c2rust-bitfields" @@ -370,9 +394,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -380,12 +407,6 @@ 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" @@ -404,9 +425,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -414,9 +435,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -426,9 +447,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck", "proc-macro2", @@ -448,12 +469,61 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +[[package]] +name = "config" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" +dependencies = [ + "async-trait", + "convert_case", + "json5", + "lazy_static", + "nom", + "pathdiff", + "ron", + "rust-ini", + "serde", + "serde_json", + "toml", + "yaml-rust", +] + +[[package]] +name = "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 = "constant_time_eq" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -479,6 +549,12 @@ dependencies = [ "libc", ] +[[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" @@ -522,15 +598,14 @@ 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", "fiat-crypto", - "platforms", "rustc_version", "subtle", "zeroize", @@ -556,6 +631,25 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -566,6 +660,18 @@ dependencies = [ "dirs-sys-next", ] +[[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 = "dirs-sys-next" version = "0.1.2" @@ -588,6 +694,15 @@ dependencies = [ "winapi", ] +[[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 = "encode_unicode" version = "1.0.0" @@ -822,6 +937,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + [[package]] name = "hashbrown" version = "0.14.5" @@ -1012,6 +1133,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json5" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" +dependencies = [ + "pest", + "pest_derive", + "serde", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -1030,9 +1162,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" @@ -1041,7 +1173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1054,6 +1186,12 @@ dependencies = [ "libc", ] +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -1131,6 +1269,12 @@ 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.3" @@ -1142,20 +1286,22 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "mycelium" -version = "0.5.3" +version = "0.5.4" dependencies = [ "aes-gcm", + "arc-swap", "blake3", "bytes", "etherparse", @@ -1178,18 +1324,19 @@ dependencies = [ "tokio-tun", "tokio-util", "tracing", + "tracing-logfmt", "tracing-subscriber", "tun", - "wintun 0.4.0", + "wintun 0.5.0", "x25519-dalek", ] [[package]] name = "mycelium-api" -version = "0.5.3" +version = "0.5.4" dependencies = [ "axum", - "base64", + "base64 0.22.1", "mycelium", "mycelium-metrics", "serde", @@ -1199,9 +1346,9 @@ dependencies = [ [[package]] name = "mycelium-cli" -version = "0.5.3" +version = "0.5.4" dependencies = [ - "base64", + "base64 0.22.1", "byte-unit", "mycelium", "mycelium-api", @@ -1216,7 +1363,7 @@ dependencies = [ [[package]] name = "mycelium-metrics" -version = "0.5.3" +version = "0.5.4" dependencies = [ "axum", "mycelium", @@ -1227,11 +1374,13 @@ dependencies = [ [[package]] name = "myceliumd" -version = "0.5.3" +version = "0.5.4" dependencies = [ - "base64", + "base64 0.22.1", "byte-unit", "clap", + "config", + "dirs", "mycelium", "mycelium-api", "mycelium-cli", @@ -1242,15 +1391,16 @@ dependencies = [ "serde_json", "tokio", "tracing", + "tracing-logfmt", "tracing-subscriber", "urlencoding", ] [[package]] name = "netdev" -version = "0.27.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12d9f49b8d4b9d7f97525ce65f6527079e549e8b2f010f15b921764e73d4baa" +checksum = "7516ad2c46cc25da098ed7d6b9a0cbe9e1fbffbd04b1596148b95f2841179c83" dependencies = [ "dlopen2", "libc", @@ -1260,7 +1410,7 @@ dependencies = [ "netlink-sys", "once_cell", "system-configuration", - "windows 0.54.0", + "windows-sys 0.52.0", ] [[package]] @@ -1353,18 +1503,6 @@ dependencies = [ "libc", ] -[[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", -] - [[package]] name = "nix" version = "0.29.0" @@ -1373,11 +1511,21 @@ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.5.0", "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", "memoffset", ] +[[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" @@ -1388,6 +1536,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "nu-ansi-term" +version = "0.50.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -1403,16 +1560,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" version = "0.32.2" @@ -1434,6 +1581,22 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-multimap" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +dependencies = [ + "dlv-list", + "hashbrown 0.13.2", +] + [[package]] name = "overload" version = "0.1.1" @@ -1460,7 +1623,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1469,13 +1632,19 @@ 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" version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64", + "base64 0.22.1", "serde", ] @@ -1485,6 +1654,51 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pest" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "pest_meta" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + [[package]] name = "pin-project" version = "1.1.5" @@ -1517,12 +1731,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - [[package]] name = "polyval" version = "0.6.2" @@ -1567,7 +1775,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit", + "toml_edit 0.21.1", ] [[package]] @@ -1663,16 +1871,17 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904e3d3ba178131798c6d9375db2b13b34337d489b089fc5ba0825a2ff1bee73" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", + "rustc-hash 2.0.0", "rustls", + "socket2", "thiserror", "tokio", "tracing", @@ -1687,7 +1896,7 @@ dependencies = [ "bytes", "rand", "ring", - "rustc-hash", + "rustc-hash 1.2.0", "rustls", "slab", "thiserror", @@ -1697,9 +1906,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f0def2590301f4f667db5a77f9694fb004f82796dc1a8b1508fafa3d0e8b72" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ "libc", "once_cell", @@ -1841,11 +2050,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64", + "base64 0.22.1", "bytes", "futures-core", "futures-util", @@ -1864,14 +2073,14 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tokio", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "windows-registry", ] [[package]] @@ -1918,6 +2127,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.7", + "bitflags 2.5.0", + "serde", + "serde_derive", +] + [[package]] name = "rtnetlink" version = "0.14.1" @@ -1936,6 +2157,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "rust-ini" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + [[package]] name = "rust_decimal" version = "1.35.0" @@ -1964,6 +2195,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3450ed37fe9609abb6bc3b8891b6e078404e4c53c7332350e2e15126a95229bf" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -1988,9 +2225,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.9" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a218f0f6d05669de4eabfb24f31ce802035c952429d037507b4a4a39f0e60c5b" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", "ring", @@ -2008,9 +2245,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -2055,18 +2292,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", @@ -2075,11 +2312,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2094,6 +2332,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -2106,6 +2353,17 @@ dependencies = [ "serde", ] +[[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" @@ -2115,6 +2373,12 @@ 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" @@ -2218,6 +2482,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "system-configuration" @@ -2294,10 +2561,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", + "itoa", "num-conv", "powerfmt", "serde", "time-core", + "time-macros", ] [[package]] @@ -2306,6 +2575,25 @@ 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 = "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" @@ -2323,27 +2611,26 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -2364,12 +2651,12 @@ dependencies = [ [[package]] name = "tokio-tun" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d79912ba514490b1f5a574b585e19082bd2a6b238970c87c57a66bd77206b5" +checksum = "68f5381752d5832fc811f89d54fc334951aa435022f494190ba7151661f206df" dependencies = [ "libc", - "nix 0.28.0", + "nix 0.29.0", "thiserror", "tokio", ] @@ -2387,11 +2674,26 @@ dependencies = [ "tokio", ] +[[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" @@ -2401,7 +2703,20 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "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]] @@ -2474,6 +2789,19 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-logfmt" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b1f47d22deb79c3f59fcf2a1f00f60cbdc05462bf17d1cd356c1fefa3f444bd" +dependencies = [ + "nu-ansi-term 0.50.1", + "time", + "tracing", + "tracing-core", + "tracing-subscriber", +] + [[package]] name = "tracing-subscriber" version = "0.3.18" @@ -2481,7 +2809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", - "nu-ansi-term", + "nu-ansi-term 0.46.0", "once_cell", "regex", "sharded-slab", @@ -2521,6 +2849,12 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + [[package]] name = "unicode-bidi" version = "0.3.15" @@ -2542,6 +2876,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + [[package]] name = "unicode-width" version = "0.1.13" @@ -2739,30 +3079,10 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core 0.51.1", + "windows-core", "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 0.52.0", - "windows-targets 0.52.5", -] - -[[package]] -name = "windows" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" -dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.5", -] - [[package]] name = "windows-core" version = "0.51.1" @@ -2773,31 +3093,33 @@ dependencies = [ ] [[package]] -name = "windows-core" -version = "0.52.0" +name = "windows-registry" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-core" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ "windows-result", - "windows-targets 0.52.5", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] name = "windows-result" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -2815,7 +3137,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]] @@ -2835,18 +3157,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]] @@ -2857,9 +3179,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" @@ -2869,9 +3191,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" @@ -2881,15 +3203,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" @@ -2899,9 +3221,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" @@ -2911,9 +3233,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" @@ -2923,9 +3245,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" @@ -2935,9 +3257,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" @@ -2949,13 +3271,12 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.52.0" +name = "winnow" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "memchr", ] [[package]] @@ -2973,15 +3294,15 @@ dependencies = [ [[package]] name = "wintun" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3c8c8876c686f8a2d6376999ac1c9a24c74d2968551c9394f7e89127783685" +checksum = "b196f9328341b035820c54beebca487823e2e20a5977f284f2af2a0ee8f04400" dependencies = [ "c2rust-bitfields", "libloading", "log", "thiserror", - "windows 0.52.0", + "windows-sys 0.52.0", ] [[package]] @@ -3005,6 +3326,15 @@ dependencies = [ "zeroize", ] +[[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 = "yasna" version = "0.5.2" diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index 04a1714826bf..266448a438eb 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -1,15 +1,18 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, openssl -, darwin -, nixosTests +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + openssl, + darwin, + nixosTests, + nix-update-script, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "mycelium"; - version = "0.5.3"; + version = "0.5.4"; sourceRoot = "${src.name}/myceliumd"; @@ -17,7 +20,7 @@ rustPlatform.buildRustPackage rec { owner = "threefoldtech"; repo = "mycelium"; rev = "v${version}"; - hash = "sha256-nyHHuwOHaIh8WCxaQb7QoTReV09ydhHLYwEVHQg2Hek="; + hash = "sha256-sWpy6Q7Lh0AOzWKMsb/NQ6oFcxOKXB/To9+PFmcjSks="; }; cargoLock = { @@ -27,25 +30,37 @@ rustPlatform.buildRustPackage rec { }; }; + nativeBuildInputs = [ versionCheckHook ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; + doInstallCheck = true; + env = { OPENSSL_NO_VENDOR = 1; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; OPENSSL_DIR = "${lib.getDev openssl}"; }; - passthru.tests = { inherit (nixosTests) mycelium; }; + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) mycelium; + }; + }; meta = with lib; { description = "End-2-end encrypted IPv6 overlay network"; homepage = "https://github.com/threefoldtech/mycelium"; changelog = "https://github.com/threefoldtech/mycelium/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ flokli matthewcroughan ]; + maintainers = with maintainers; [ + flokli + matthewcroughan + rvdp + ]; mainProgram = "mycelium"; }; } diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix index a11c15d20453..8701ae75de43 100644 --- a/pkgs/by-name/n9/n98-magerun2/package.nix +++ b/pkgs/by-name/n9/n98-magerun2/package.nix @@ -4,7 +4,7 @@ php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "n98-magerun2"; version = "7.4.0"; @@ -15,7 +15,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-OPvyZ0r7Zt4PC+rmRtBm9EkbaE4PeovnUHrhzXUqT8E="; }; - vendorHash = "sha256-HSkcYbDQPK1ByG8Euq9YqzK0jqjKrWO+0R4ungFDOIY="; + vendorHash = "sha256-E2V5ARNCmGOmGGctfcjpW49cxFBcWyJEodBNjHhKQ+w="; meta = { changelog = "https://magerun.net/category/magerun/"; diff --git a/pkgs/by-name/na/nawk/package.nix b/pkgs/by-name/na/nawk/package.nix index f05cd3cd3de0..cb8766c8c6b0 100644 --- a/pkgs/by-name/na/nawk/package.nix +++ b/pkgs/by-name/na/nawk/package.nix @@ -1,30 +1,31 @@ -{ lib -, stdenv -, fetchFromGitHub -, bison -, buildPackages -, installShellFiles +{ + lib, + stdenv, + fetchFromGitHub, + bison, + buildPackages, + installShellFiles, }: stdenv.mkDerivation (finalAttrs: { pname = "nawk"; - version = "20240422"; + version = "20240728"; src = fetchFromGitHub { owner = "onetrueawk"; repo = "awk"; rev = finalAttrs.version; - hash = "sha256-wsRkSXCLtK2jk4gW/Lpg/14NiOUANfmCrYqeKZW6CLY="; + hash = "sha256-LA7fdbMP3aKJ1QljoKWizqVg3ys3hd8tGaRsQnIO+Hc="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ - bison - installShellFiles - ]; + nativeBuildInputs = [ bison installShellFiles ]; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" @@ -50,7 +51,10 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/onetrueawk/awk/blob/${finalAttrs.src.rev}/ChangeLog"; license = lib.licenses.mit; mainProgram = "nawk"; - maintainers = with lib.maintainers; [ AndersonTorres konimex ]; + maintainers = with lib.maintainers; [ + AndersonTorres + konimex + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/nb/nbfc-linux/package.nix b/pkgs/by-name/nb/nbfc-linux/package.nix new file mode 100644 index 000000000000..4e4e5bd4b374 --- /dev/null +++ b/pkgs/by-name/nb/nbfc-linux/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "nbfc-linux"; + version = "0.1.15"; + + src = fetchFromGitHub { + owner = "nbfc-linux"; + repo = "nbfc-linux"; + rev = "${finalAttrs.version}"; + hash = "sha256-+xYr2uIxfMaMAaHGvvA+0WPZjwj3wVAc34e1DWsJLqE="; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + configureFlags = [ + "--prefix=${placeholder "out"}" + "--sysconfdir=${placeholder "out"}/etc" + "--bindir=${placeholder "out"}/bin" + ]; + + meta = { + description = "C port of Stefan Hirschmann's NoteBook FanControl"; + longDescription = '' + nbfc-linux provides fan control service for notebooks + ''; + homepage = "https://github.com/nbfc-linux/nbfc-linux"; + license = lib.licenses.gpl3; + maintainers = [lib.maintainers.Celibistrial]; + mainProgram = "nbfc"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock b/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock index 2e116556b774..f107fcb94990 100644 --- a/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock +++ b/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock @@ -8,6 +8,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aho-corasick" version = "1.1.3" @@ -34,9 +40,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -49,33 +55,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -89,12 +95,12 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ "event-listener 5.3.1", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -117,16 +123,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.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -148,9 +154,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", "cfg-if", @@ -158,29 +164,29 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", + "polling 3.7.3", "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[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", ] [[package]] name = "async-process" -version = "2.2.2" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ "async-channel 2.3.1", "async-io", @@ -193,7 +199,7 @@ dependencies = [ "futures-lite 2.3.0", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -209,9 +215,9 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ "async-io", "async-lock", @@ -222,7 +228,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -233,9 +239,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", @@ -274,9 +280,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" [[package]] name = "block" @@ -314,9 +320,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" [[package]] name = "byteorder" @@ -326,9 +332,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cairo-rs" @@ -336,7 +342,7 @@ version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", @@ -362,9 +368,12 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.98" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +dependencies = [ + "shlex", +] [[package]] name = "cfg-expr" @@ -384,9 +393,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 = "chrono" @@ -399,7 +408,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -410,9 +419,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "concurrent-queue" @@ -453,15 +462,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -508,9 +517,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.72+curl-8.6.0" +version = "0.4.74+curl-8.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea" +checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" dependencies = [ "cc", "libc", @@ -543,9 +552,9 @@ dependencies = [ [[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 = "encoding_rs" @@ -564,9 +573,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", @@ -574,9 +583,9 @@ 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", @@ -585,9 +594,9 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -595,9 +604,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -628,17 +637,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[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.3.1" @@ -650,16 +648,6 @@ dependencies = [ "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" @@ -706,12 +694,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -846,9 +834,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", @@ -858,9 +846,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", @@ -944,9 +932,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", @@ -962,9 +950,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", @@ -975,11 +963,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.7" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490" +checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -997,9 +985,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.7" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e" +checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" dependencies = [ "heck", "proc-macro-crate", @@ -1010,9 +998,9 @@ dependencies = [ [[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", @@ -1020,9 +1008,9 @@ dependencies = [ [[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", @@ -1031,9 +1019,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", @@ -1042,9 +1030,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", @@ -1085,9 +1073,9 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.22.5" +version = "0.22.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b59fdce2dfacda226d4b1b71ce4700b2f04228909b52252c197d8e30bd54a6" +checksum = "5ca0b90646bb67fccf80d228f5333f2a0745526818ccefbf5a97326c76d30e4d" dependencies = [ "cfg-if", "futures-channel", @@ -1110,9 +1098,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.22.0" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514c71195b53c7eced4842b66ca9149833e41cf6a1d949e45e2ca4a4fa929850" +checksum = "39d55668b23fc69f1843daa42b43d289c00fe38e9586c5453b134783d2dd75a3" dependencies = [ "atomic_refcell", "cfg-if", @@ -1124,9 +1112,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8d11de9d94072657f2e9ca294b72326874a1e53de9f45613a9bf00773a5938" +checksum = "5448abb00c197e3ad306710293bf757303cbeab4036b5ccad21c7642b8bf00c9" dependencies = [ "glib-sys", "gobject-sys", @@ -1137,9 +1125,9 @@ dependencies = [ [[package]] name = "gstreamer-play" -version = "0.22.0" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cd4315d97f8f38a6a6fdaad27d51cc67fd132785816091ad9985e197d2c052" +checksum = "495d23636d87581ba42810f72f90a710dd03bd14199e74132e828425b13f0722" dependencies = [ "glib", "gstreamer", @@ -1150,9 +1138,9 @@ dependencies = [ [[package]] name = "gstreamer-play-sys" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bdd875021fecd478d0ee3b787dc3fd41be86f83692c59344af2db6251028b3c" +checksum = "80b4bb761b930472fe0e16ca3d0d92244e94c4a41e2182861c895b082e090400" dependencies = [ "glib-sys", "gobject-sys", @@ -1164,9 +1152,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4975a75279a9cf658bac1798dcf57100c6ec89fca7886572c8250ea4d94b76bd" +checksum = "71f147e7c6bc9313d5569eb15da61f6f64026ec69791922749de230583a07286" dependencies = [ "glib-sys", "gobject-sys", @@ -1176,9 +1164,9 @@ dependencies = [ [[package]] name = "gstreamer-video" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7900a4c4d7a48bd73405fb23289d2604c5efe483eb224cbe252d6a7517a6d5" +checksum = "25acba301f86b02584a642de0f224317be2bd0ceec3acda49a0ef111cbced98c" dependencies = [ "cfg-if", "futures-channel", @@ -1193,9 +1181,9 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cbe811de2cc60da42eb6d374a106bb5446e8fcd2134a97319dd2b8cc11450c7" +checksum = "f2ec210495f94cabaa45d08003081b550095c2d4ab12d5320f64856a91f3f01c" dependencies = [ "glib-sys", "gobject-sys", @@ -1271,9 +1259,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.9" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -1371,9 +1359,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown", @@ -1390,9 +1378,9 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "isahc" @@ -1439,18 +1427,18 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[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 = "libadwaita" @@ -1486,9 +1474,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libnghttp2-sys" @@ -1502,9 +1490,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" dependencies = [ "cc", "libc", @@ -1533,9 +1521,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 = "malloc_buf" @@ -1548,9 +1536,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 = "memoffset" @@ -1569,19 +1557,28 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] [[package]] -name = "mpris-server" +name = "miniz_oxide" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8408a42f7325f9217576c25dd3066d2741ed6a5b962e189493d83c440ca475" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mpris-server" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058bc2227727af394f34aa51da3e36aeecf2c808f39315d35f754872660750ae" dependencies = [ "async-channel 2.3.1", "futures-channel", @@ -1598,8 +1595,8 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "netease-cloud-music-api" -version = "1.3.2" -source = "git+https://gitee.com/gmg137/netease-cloud-music-api.git?tag=1.3.2#4ea470a0e3b4f2a310a70ca485f60d3f6a643c03" +version = "1.4.0" +source = "git+https://gitee.com/gmg137/netease-cloud-music-api.git?tag=1.4.0#137a77d2ffb84fd9710f4599bfdc6e65875865f4" dependencies = [ "anyhow", "base64", @@ -1616,7 +1613,7 @@ dependencies = [ [[package]] name = "netease-cloud-music-gtk4" -version = "2.4.0" +version = "2.4.1" dependencies = [ "anyhow", "async-channel 2.3.1", @@ -1639,11 +1636,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -1721,11 +1718,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1753,9 +1750,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1784,9 +1781,9 @@ dependencies = [ [[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", @@ -1796,9 +1793,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", @@ -1858,9 +1855,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -1883,7 +1880,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -1904,9 +1901,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", @@ -1914,7 +1911,7 @@ dependencies = [ "pin-project-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1925,9 +1922,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro-crate" @@ -1940,9 +1940,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2021,9 +2021,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2033,9 +2033,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", @@ -2044,9 +2044,9 @@ dependencies = [ [[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_version" @@ -2063,7 +2063,7 @@ 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", @@ -2093,18 +2093,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", @@ -2113,11 +2113,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2135,9 +2136,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2153,6 +2154,12 @@ dependencies = [ "digest", ] +[[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" @@ -2212,9 +2219,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.66" +version = "2.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" dependencies = [ "proc-macro2", "quote", @@ -2236,9 +2243,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-dir" @@ -2248,30 +2255,31 @@ checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand 2.1.0", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -2311,9 +2319,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2326,21 +2334,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.13" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -2358,15 +2366,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.9", + "winnow 0.6.18", ] [[package]] @@ -2462,9 +2470,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 0.5.0", @@ -2485,9 +2493,9 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[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 = "vcpkg" @@ -2503,9 +2511,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "waker-fn" @@ -2521,19 +2529,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -2546,9 +2555,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2556,9 +2565,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -2569,9 +2578,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "winapi" @@ -2601,7 +2610,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]] @@ -2619,7 +2628,16 @@ 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]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -2639,18 +2657,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]] @@ -2661,9 +2679,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" @@ -2673,9 +2691,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" @@ -2685,15 +2703,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" @@ -2703,9 +2721,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" @@ -2715,9 +2733,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" @@ -2727,9 +2745,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" @@ -2739,9 +2757,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" @@ -2754,28 +2772,28 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.9" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] name = "zbus" -version = "4.2.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", @@ -2811,9 +2829,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.2.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2834,10 +2852,31 @@ dependencies = [ ] [[package]] -name = "zvariant" -version = "4.1.1" +name = "zerocopy" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "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", +] + +[[package]] +name = "zvariant" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", @@ -2848,9 +2887,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2861,9 +2900,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix index 276756f5789a..11910a380f40 100644 --- a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix +++ b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix @@ -18,19 +18,19 @@ stdenv.mkDerivation rec { pname = "netease-cloud-music-gtk"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "gmg137"; repo = "netease-cloud-music-gtk"; rev = version; - hash = "sha256-uoC9J09U2aI1dhaKc3TxIyFwRrPRxDrzaV+RyoZ6mKo="; + hash = "sha256-5pIt6VBeNiQbKbffTPa0VJzO8pYGnfonpNpdtkaCwGI="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "netease-cloud-music-api-1.3.2" = "sha256-QRz9Sdu+0I7SwujoTBKWPQMjPDdX8ZyVlFwMw9pM7UY="; + "netease-cloud-music-api-1.4.0" = "sha256-M/7jvrCndgl9lhmzTrNhQor9CBkWTFjfkVxQPW3ed7Q="; }; }; @@ -62,12 +62,12 @@ stdenv.mkDerivation rec { gst-plugins-ugly ]); - meta = with lib; { + meta = { description = "Rust + GTK based netease cloud music player"; homepage = "https://github.com/gmg137/netease-cloud-music-gtk"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ diffumist aleksana ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ diffumist aleksana ]; mainProgram = "netease-cloud-music-gtk4"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix index 4b7076a8e03e..9b51e9715906 100644 --- a/pkgs/by-name/ne/neverest/package.nix +++ b/pkgs/by-name/ne/neverest/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromSourcehut { owner = "~soywod"; - repo = "${pname}-cli"; + repo = "neverest-cli"; rev = "v${version}"; hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE="; }; diff --git a/pkgs/by-name/nf/nf-test/package.nix b/pkgs/by-name/nf/nf-test/package.nix index b11fe8ee740e..81a5d52ee72b 100644 --- a/pkgs/by-name/nf/nf-test/package.nix +++ b/pkgs/by-name/nf/nf-test/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "0.9.0"; src = fetchurl { - url = "https://github.com/askimed/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/askimed/nf-test/releases/download/v${version}/nf-test-${version}.tar.gz"; hash = "sha256-PhI866NrbokMsSrU6YeSv03S1+VcNqVJsocI3xPfDcc="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt index b489d080c1cd..13c4c3859027 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt +++ b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt @@ -1 +1 @@ -2024-08-08 +2024-08-16 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 9e73ac8e2e75..7a87d26cbf6d 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix +++ b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix @@ -9,8 +9,8 @@ mkDerivation { pname = "nixfmt"; version = "0.6.0"; src = fetchzip { - url = "https://github.com/nixos/nixfmt/archive/a707c70ab6fed71032ac55bb1029306a50a80d34.tar.gz"; - sha256 = "1v5hch8j1w1bvn2r4xz4ym60ykgsc074y28vpin9qraagv06x8sm"; + url = "https://github.com/nixos/nixfmt/archive/14be7e665024f1a8c31d748b22f5e215856d3479.tar.gz"; + sha256 = "017a1069sy4bhc2wchgd5hl6c106spf0zq5dcg65mf4flba1xs0j"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/by-name/ns/nstool/package.nix b/pkgs/by-name/ns/nstool/package.nix index d8da97e3c2de..77c8dbe25e14 100644 --- a/pkgs/by-name/ns/nstool/package.nix +++ b/pkgs/by-name/ns/nstool/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nstool"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "jakcron"; repo = "nstool"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-NGuosc4Vwc4WA+b7mtn2WyJFPI4xfx/vJsd8S58js+U="; + hash = "sha256-FF+USFL5Y6MkAKvfR05D/+L/XJSmkiSp9WLbF7Gg2V8="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index f9dcdb5031bd..829b1bf8a4a4 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/${pname}/modules"; + env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules"; postInstall = '' - mkdir -p $out/share/${pname} - cp -r $src/${pname}/modules $out/share/${pname}/ + mkdir -p $out/share/numbat + cp -r $src/numbat/modules $out/share/numbat/ ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix index bffa785c7c20..4fa5177d2542 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix @@ -3,10 +3,7 @@ , fetchFromGitLab , makeWrapper , buildGoModule -, linkFarm -, writeShellScript , formats -, containerRuntimePath ? null , configTemplate ? null , configTemplatePath ? null , libnvidia-container @@ -17,20 +14,6 @@ assert configTemplate != null -> (lib.isAttrs configTemplate && configTemplatePa assert configTemplatePath != null -> (lib.isStringLike configTemplatePath && configTemplate == null); let - isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [ - { - name = "runc"; - path = containerRuntimePath; - } - ]; - warnIfXdgConfigHomeIsSet = writeShellScript "warn_if_xdg_config_home_is_set" '' - set -eo pipefail - - if [ -n "$XDG_CONFIG_HOME" ]; then - echo >&2 "$(tput setaf 3)warning: \$XDG_CONFIG_HOME=$XDG_CONFIG_HOME$(tput sgr 0)" - fi - ''; - configToml = if configTemplatePath != null then configTemplatePath else (formats.toml { }).generate "config.toml" configTemplate; # From https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L54 @@ -48,6 +31,8 @@ buildGoModule rec { }; + outputs = [ "out" "tools" ]; + vendorHash = null; patches = [ @@ -91,14 +76,6 @@ buildGoModule rec { makeWrapper ]; - preConfigure = lib.optionalString (containerRuntimePath != null) '' - # Ensure the runc symlink isn't broken: - if ! readlink --quiet --canonicalize-existing "${isolatedContainerRuntimePath}/runc" ; then - echo "${isolatedContainerRuntimePath}/runc: broken symlink" >&2 - exit 1 - fi - ''; - checkFlags = let skippedTests = [ @@ -109,33 +86,19 @@ buildGoModule rec { in [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ]; - postInstall = lib.optionalString (containerRuntimePath != null) '' - mkdir -p $out/etc/nvidia-container-runtime + postInstall = '' + wrapProgram $out/bin/nvidia-container-runtime-hook \ + --prefix PATH : ${libnvidia-container}/bin - # nvidia-container-runtime invokes docker-runc or runc if that isn't - # available on PATH. - # - # Also set XDG_CONFIG_HOME if it isn't already to allow overriding - # configuration. This in turn allows users to have the nvidia container - # runtime enabled for any number of higher level runtimes like docker and - # podman, i.e., there's no need to have mutually exclusivity on what high - # level runtime can enable the nvidia runtime because each high level - # runtime has its own config.toml file. - wrapProgram $out/bin/nvidia-container-runtime \ - --run "${warnIfXdgConfigHomeIsSet}" \ - --prefix PATH : ${isolatedContainerRuntimePath}:${libnvidia-container}/bin \ - --set-default XDG_CONFIG_HOME $out/etc + mkdir -p $tools/bin + mv $out/bin/{containerd,crio,docker,nvidia-toolkit,toolkit} $tools/bin + '' + lib.optionalString (configTemplate != null || configTemplatePath != null) '' + mkdir -p $out/etc/nvidia-container-runtime cp ${configToml} $out/etc/nvidia-container-runtime/config.toml substituteInPlace $out/etc/nvidia-container-runtime/config.toml \ --subst-var-by glibcbin ${lib.getBin glibc} - - # See: https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/packaging/debian/nvidia-container-toolkit.postinst#L12 - ln -s $out/bin/nvidia-container-runtime-hook $out/bin/nvidia-container-toolkit - - wrapProgram $out/bin/nvidia-container-toolkit \ - --add-flags "-config ${placeholder "out"}/etc/nvidia-container-runtime/config.toml" ''; meta = with lib; { diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/packages.nix b/pkgs/by-name/nv/nvidia-container-toolkit/packages.nix index c78b6b1c2834..83b62a68f241 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/packages.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/packages.nix @@ -1,9 +1,6 @@ { lib, newScope, - docker, - libnvidia-container, - runc, symlinkJoin, }: @@ -30,36 +27,12 @@ lib.makeScope newScope ( }; }; nvidia-container-toolkit-docker = self.callPackage ./package.nix { - containerRuntimePath = "${docker}/libexec/docker/docker"; configTemplate = self.dockerConfig; }; - podmanConfig = { - disable-require = true; - #swarm-resource = "DOCKER_RESOURCE_GPU"; - - nvidia-container-cli = { - #root = "/run/nvidia/driver"; - #path = "/usr/bin/nvidia-container-cli"; - environment = [ ]; - #debug = "/var/log/nvidia-container-runtime-hook.log"; - ldcache = "/tmp/ld.so.cache"; - load-kmods = true; - no-cgroups = true; - #user = "root:video"; - ldconfig = "@@glibcbin@/bin/ldconfig"; - }; - }; - nvidia-container-toolkit-podman = self.nvidia-container-toolkit-docker.override { - containerRuntimePath = lib.getExe runc; - - configTemplate = self.podmanConfig; - }; - nvidia-docker = symlinkJoin { name = "nvidia-docker"; paths = [ - libnvidia-container self.nvidia-docker-unwrapped self.nvidia-container-toolkit-docker ]; @@ -67,14 +40,5 @@ lib.makeScope newScope ( }; nvidia-docker-unwrapped = self.callPackage ./nvidia-docker.nix { }; - - nvidia-podman = symlinkJoin { - name = "nvidia-podman"; - paths = [ - libnvidia-container - self.nvidia-container-toolkit-podman - ]; - inherit (self.nvidia-container-toolkit-podman) meta; - }; } ) diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/by-name/nz/nzbget/package.nix similarity index 55% rename from pkgs/tools/networking/nzbget/default.nix rename to pkgs/by-name/nz/nzbget/package.nix index 19323e18fc5d..165ee6dfc827 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/by-name/nz/nzbget/package.nix @@ -1,7 +1,8 @@ { lib , stdenv , fetchFromGitHub -, autoreconfHook +, fetchpatch2 +, cmake , boost , pkg-config , gnutls @@ -13,21 +14,30 @@ , ncurses , openssl , zlib +, deterministic-uname , nixosTests }: stdenv.mkDerivation (finalAttrs: { pname = "nzbget"; - version = "24.1"; + version = "24.2"; src = fetchFromGitHub { owner = "nzbgetcom"; repo = "nzbget"; rev = "v${finalAttrs.version}"; - hash = "sha256-HovfnTsgu07/lp/spI+iA8H7lOj0Qyrri2MOJKyMKHQ="; + hash = "sha256-+iJ5n/meBrMxKHSLxL5QJ7+TI0RMfAM5n/8dwYupGoU="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + patches = [ + (fetchpatch2 { + # status page buffer overflow fix: https://github.com/nzbgetcom/nzbget/pull/346 -- remove when version > 24.2 + url = "https://github.com/nzbgetcom/nzbget/commit/f89978f7479cbb0ff2f96c8632d9d2f31834e6c8.patch"; + hash = "sha256-9K7PGzmoZ8cvEKBm5htfw5fr1GBSddNkDC/Vi4ngRto="; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost @@ -42,8 +52,13 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; - prePatch = '' - sed -i 's/AC_INIT.*/AC_INIT( nzbget, m4_esyscmd_s( echo ${finalAttrs.version} ) )/' configure.ac + postPatch = '' + substituteInPlace daemon/util/Util.cpp \ + --replace-fail "std::string(\"uname \")" "std::string(\"${lib.getExe deterministic-uname} \")" + ''; + + postInstall = '' + install -Dm444 nzbget.conf $out/share/nzbget/nzbget.conf ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index d02bd629f952..eef59f5bd650 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "7.5.0"; src = fetchzip { - url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-generic.zip"; + url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip"; hash = "sha256-jnClKsWSdRWCxNFO9RSnjdoDjOmtv9CrOL9KyaZ8PTc="; stripRoot = false; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -d -m 755 "$out/lib/${pname}" + install -d -m 755 "$out/lib/nzbhydra2" cp -dpr --no-preserve=ownership "lib" "readme.md" "$out/lib/nzbhydra2" install -D -m 755 "nzbhydra2wrapperPy3.py" "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py" diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 813468f367ef..ab25f18fff90 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.13"; + version = "0.3.15"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "v${version}"; - hash = "sha256-7OGUlyBvxX/wra4GYnhmSni/7xloCXUKEu0xa2bbn2A="; + hash = "sha256-e326Dxuu9cdpPV/T4arDSBqT1agnXdV5ysrIRyhF8ws="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-hQOpkbw8RDATnORh8Z1ziUhBcXb5xVplVOvueC/3RwA="; + npmDepsHash = "sha256-exkFrKBwTtN18pPNcFG1fYBoWASHsnCHYYVWkCFd0z0="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index 191b002af864..a1f4d8cf2e92 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.8"; + version = "1.5.9"; in buildGoModule { @@ -17,7 +17,7 @@ buildGoModule { owner = "openfga"; repo = "openfga"; rev = "v${version}"; - hash = "sha256-cogfwd2rFYl/UKjw1pnsL9D77IHn+5ulvMU+7WU2670="; + hash = "sha256-btk7I1jHWJfV1KgWpPXbKbn1f/2MnLrqA0HuHD3fSQc="; }; vendorHash = "sha256-rU45E9yEh7a1MrbnzFFuNeMpfbODO2O7tqEaiv7CA9Y="; diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index b0881fe10e05..4e3237a68292 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -82,12 +82,12 @@ in # clang consume much less RAM than GCC clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - version = "2024-07-24"; + version = "2024-08-17"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "48f4430b12c29a95ab89ffdd8307205d7189421c"; - hash = "sha256-A75JHmWVNlgURb5one5JFkztCrVff2RbyaDaObUp4ZY="; + rev = "a16ca2a670840cfecb76254967380385d4d573cb"; + hash = "sha256-YadbrYaxxdVNejasFW0MbcYwjwTHHQbVjqen9PKEsYQ="; fetchSubmodules = true; }; patches = [ ./test.diff ]; diff --git a/pkgs/by-name/op/opensnitch/go.mod b/pkgs/by-name/op/opensnitch/go.mod deleted file mode 100644 index 14242cd3cbb8..000000000000 --- a/pkgs/by-name/op/opensnitch/go.mod +++ /dev/null @@ -1,32 +0,0 @@ -module github.com/evilsocket/opensnitch/daemon - -go 1.17 - -require ( - github.com/fsnotify/fsnotify v1.4.7 - github.com/golang/protobuf v1.5.0 - github.com/google/gopacket v1.1.19 - github.com/google/nftables v0.1.0 - github.com/google/uuid v1.3.0 - github.com/iovisor/gobpf v0.2.0 - github.com/varlink/go v0.4.0 - github.com/vishvananda/netlink v1.1.1-0.20220115184804-dd687eb2f2d4 - github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae - golang.org/x/net v0.17.0 - golang.org/x/sys v0.13.0 - google.golang.org/grpc v1.32.0 - google.golang.org/protobuf v1.26.0 -) - -require ( - github.com/BurntSushi/toml v0.4.1 // indirect - github.com/google/go-cmp v0.5.6 // indirect - github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect - github.com/mdlayher/netlink v1.4.2 // indirect - github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb // indirect - golang.org/x/mod v0.8.0 // indirect - golang.org/x/text v0.13.0 // indirect - golang.org/x/tools v0.6.0 // indirect - google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect - honnef.co/go/tools v0.2.2 // indirect -) diff --git a/pkgs/by-name/op/opensnitch/go.sum b/pkgs/by-name/op/opensnitch/go.sum deleted file mode 100644 index baafbc6dd3df..000000000000 --- a/pkgs/by-name/op/opensnitch/go.sum +++ /dev/null @@ -1,227 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw= -github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cilium/ebpf v0.5.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= -github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= -github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= -github.com/google/nftables v0.1.0 h1:T6lS4qudrMufcNIZ8wSRrL+iuwhsKxpN+zFLxhUWOqk= -github.com/google/nftables v0.1.0/go.mod h1:b97ulCCFipUC+kSin+zygkvUVpx0vyIAwxXFdY3PlNc= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/iovisor/gobpf v0.2.0 h1:34xkQxft+35GagXBk3n23eqhm0v7q0ejeVirb8sqEOQ= -github.com/iovisor/gobpf v0.2.0/go.mod h1:WSY9Jj5RhdgC3ci1QaacvbFdQ8cbrEjrpiZbLHLt2s4= -github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 h1:uhL5Gw7BINiiPAo24A2sxkcDI0Jt/sqp1v5xQCniEFA= -github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= -github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= -github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ= -github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok= -github.com/jsimonetti/rtnetlink v0.0.0-20201216134343-bde56ed16391/go.mod h1:cR77jAZG3Y3bsb8hF6fHJbFoyFukLFOkQ98S0pQz3xw= -github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c53zj6Eex712ROyh8WI0ihysb5j2ROyV42iNogmAs= -github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA= -github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U= -github.com/jsimonetti/rtnetlink v0.0.0-20210525051524-4cc836578190/go.mod h1:NmKSdU4VGSiv1bMsdqNALI4RSvvjtz65tTMCnD05qLo= -github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786 h1:N527AHMa793TP5z5GNAn/VLPzlc0ewzWdeP/25gDfgQ= -github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786/go.mod h1:v4hqbTdfQngbVSZJVWUhGE/lbTFf9jb+ygmNUDQMuOs= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo= -github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60 h1:tHdB+hQRHU10CfcK0furo6rSNgZ38JT8uPh70c/pFD8= -github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60/go.mod h1:aYbhishWc4Ai3I2U4Gaa2n3kHWSwzme6EsG/46HRQbE= -github.com/mdlayher/genetlink v1.0.0 h1:OoHN1OdyEIkScEmRgxLEe2M9U8ClMytqA5niynLtfj0= -github.com/mdlayher/genetlink v1.0.0/go.mod h1:0rJ0h4itni50A86M2kHcgS85ttZazNt7a8H2a2cw0Gc= -github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= -github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= -github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= -github.com/mdlayher/netlink v1.1.1/go.mod h1:WTYpFb/WTvlRJAyKhZL5/uy69TDDpHHu2VZmb2XgV7o= -github.com/mdlayher/netlink v1.2.0/go.mod h1:kwVW1io0AZy9A1E2YYgaD4Cj+C+GPkU6klXCMzIJ9p8= -github.com/mdlayher/netlink v1.2.1/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= -github.com/mdlayher/netlink v1.2.2-0.20210123213345-5cc92139ae3e/go.mod h1:bacnNlfhqHqqLo4WsYeXSqfyXkInQ9JneWI68v1KwSU= -github.com/mdlayher/netlink v1.3.0/go.mod h1:xK/BssKuwcRXHrtN04UBkwQ6dY9VviGGuriDdoPSWys= -github.com/mdlayher/netlink v1.4.0/go.mod h1:dRJi5IABcZpBD2A3D0Mv/AiX8I9uDEu5oGkAVrekmf8= -github.com/mdlayher/netlink v1.4.1/go.mod h1:e4/KuJ+s8UhfUpO9z00/fDZZmhSrs+oxyqAS9cNgn6Q= -github.com/mdlayher/netlink v1.4.2 h1:3sbnJWe/LETovA7yRZIX3f9McVOWV3OySH6iIBxiFfI= -github.com/mdlayher/netlink v1.4.2/go.mod h1:13VaingaArGUTUxFLf/iEovKxXji32JAtF858jZYEug= -github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00/go.mod h1:GAFlyu4/XV68LkQKYzKhIo/WW7j3Zi0YRAz/BOoanUc= -github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g= -github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb h1:2dC7L10LmTqlyMVzFJ00qM25lqESg9Z4u3GuEXN5iHY= -github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb/go.mod h1:nFZ1EtZYK8Gi/k6QNu7z7CgO20i/4ExeQswwWuPmG/g= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/varlink/go v0.4.0 h1:+/BQoUO9eJK/+MTSHwFcJch7TMsb6N6Dqp6g0qaXXRo= -github.com/varlink/go v0.4.0/go.mod h1:DKg9Y2ctoNkesREGAEak58l+jOC6JU2aqZvUYs5DynU= -github.com/vishvananda/netlink v1.1.1-0.20220115184804-dd687eb2f2d4 h1:fB26rIBlWTVJyEB6ONHdoEvUbvwoudH0/cMEXHiD1RU= -github.com/vishvananda/netlink v1.1.1-0.20220115184804-dd687eb2f2d4/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= -github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae h1:4hwBBUfQCFe3Cym0ZtKyq7L16eZUtYKs+BaHDN6mAns= -github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201118182958-a01c418693c7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210110051926-789bb1bd4061/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210123111255-9b0068b26619/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210216163648-f7da38b97c65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0= -google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= -honnef.co/go/tools v0.2.2 h1:MNh1AVMyVX23VUHE2O27jm6lNj3vjO5DexS4A1xvnzk= -honnef.co/go/tools v0.2.2/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index 41172f038cc8..37433fb4a9ca 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -1,17 +1,18 @@ -{ buildGoModule -, fetchFromGitHub -, protobuf -, go-protobuf -, pkg-config -, libnetfilter_queue -, libnfnetlink -, lib -, iptables -, makeWrapper -, protoc-gen-go-grpc -, testers -, opensnitch -, nixosTests +{ + buildGoModule, + fetchFromGitHub, + protobuf, + go-protobuf, + pkg-config, + libnetfilter_queue, + libnfnetlink, + lib, + iptables, + makeWrapper, + protoc-gen-go-grpc, + testers, + opensnitch, + nixosTests, }: buildGoModule rec { @@ -45,14 +46,9 @@ buildGoModule rec { protoc-gen-go-grpc ]; - vendorHash = "sha256-PX41xeUJb/WKv3+z5kbRmJNP1vFu8x35NZvN2Dgp4CQ="; + vendorHash = "sha256-urRujxcp58ZuhUtTAqCK0etSZ16YYG/6JY/aOUodl9g="; preBuild = '' - # Fix inconsistent vendoring build error - # https://github.com/evilsocket/opensnitch/issues/770 - cp ${./go.mod} go.mod - cp ${./go.sum} go.sum - make -C ../proto ../daemon/ui/protocol/ui.pb.go ''; diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index cf8bdac642de..5fa7966cd5c1 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.8.4"; + version = "23.8.5"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-Bxna9ylQ9MZf/YWLIVI61tRjU5H4Ipqkiz+z21qiaGg="; + hash = "sha256-0zVhrnDimmSg5auIT1NQaNRsilASkkXK6tVimoWsXn8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 9b16927a71f4..0e52c45ebdd3 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.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-SJZJN0IDR17hRd0NBER3CCys87vCTHOVz8+PNwFNt1M="; + hash = "sha256-GdcDouGL6wshCdzKZ7TAm/Ty3c8dAsWQSNRlGIUIq2Y="; # 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; @@ -19,7 +19,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-Irpqg+orQsDv9iof+tGC/Out6hIOmlf3sdHGY80zxdE="; + vendorHash = "sha256-Xf/d0Zv+aSzJhE2+XtKFqhNnPZrtaNhM3IKnNb8JOTQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ov/ovn/lts.nix b/pkgs/by-name/ov/ovn/lts.nix index 42ab99ff7cc0..0d2b02dfc64e 100644 --- a/pkgs/by-name/ov/ovn/lts.nix +++ b/pkgs/by-name/ov/ovn/lts.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "24.03.2"; - hash = "sha256-pO37MfmvlSd/bU9cGngFEJLnXtZFTqyz1zcYLvFLrrQ="; + version = "24.03.3"; + hash = "sha256-W25Tq5Z7SYIBkq6doNz9WPiPsdDhnbys03rmF4m02eM="; updateScriptArgs = "--lts=true --regex '24.03.*'"; } diff --git a/pkgs/by-name/pa/parmetis/package.nix b/pkgs/by-name/pa/parmetis/package.nix new file mode 100644 index 000000000000..a2289eea3069 --- /dev/null +++ b/pkgs/by-name/pa/parmetis/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + metis, + mpi, +}: + +stdenv.mkDerivation { + pname = "parmetis"; + version = "4.0.3"; + + src = fetchFromGitHub { + owner = "KarypisLab"; + repo = "ParMETIS"; + rev = "d90a2a6cf08d1d35422e060daa28718376213659"; + hash = "sha256-22YQxwC0phdMLX660wokRgmAif/9tRbUmQWwNMZ//7M="; + }; + + nativeBuildInputs = [ cmake ]; + enableParallelBuilding = true; + buildInputs = [ mpi ]; + + configurePhase = '' + tar xf ${metis.src} + mv metis-* metis + make config metis_path=metis gklib_path=metis/GKlib prefix=$out + ''; + + meta = with lib; { + description = "Parallel Graph Partitioning and Fill-reducing Matrix Ordering"; + longDescription = '' + MPI-based parallel library that implements a variety of algorithms for + partitioning unstructured graphs, meshes, and for computing fill-reducing + orderings of sparse matrices. + The algorithms implemented in ParMETIS are based on the multilevel + recursive-bisection, multilevel k-way, and multi-constraint partitioning + schemes + ''; + homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"; + platforms = platforms.all; + license = licenses.unfree; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/by-name/pc/pcsx2/sources.nix b/pkgs/by-name/pc/pcsx2/sources.nix index efc0264f7c09..77441f29adc5 100644 --- a/pkgs/by-name/pc/pcsx2/sources.nix +++ b/pkgs/by-name/pc/pcsx2/sources.nix @@ -2,20 +2,21 @@ lib, fetchFromGitHub, fetchpatch, - pcsx2, shaderc, }: -{ +let pcsx2 = let self = { pname = "pcsx2"; - version = "2.1.17"; + version = "2.1.102"; src = fetchFromGitHub { + pname = "pcsx2-source"; + inherit (self) version; owner = "PCSX2"; repo = "pcsx2"; rev = "v${self.version}"; - hash = "sha256-yVao/8ZAssM0llKMR66fMbzsRL3WCkFyUk6ZD/MEaSc="; + hash = "sha256-OBxrdZVx6HbSFO6sc2D2HP6iYH3ZKDj+uEqM7cxZNm0="; }; }; in @@ -23,16 +24,21 @@ # The pre-zipped files in releases don't have a versioned link, we need to zip # them ourselves - pcsx2_patches = { - pname = "pcsx2_patches"; - version = "0-unstable-2024-07-14"; - src = fetchFromGitHub { - owner = "PCSX2"; - repo = "pcsx2_patches"; - rev = "afb17c4d851c54f93d4249e1e1dc8c57e2d0e6c6"; - hash = "sha256-OaZ5TMbxM4v4HhLa2ctM8xx//FQkHH3+dkxZX9/svjc="; + pcsx2_patches = let + self = { + pname = "pcsx2_patches"; + version = "0-unstable-2024-08-12"; + src = fetchFromGitHub { + pname = "pcsx2_patches-source"; + inherit (self) version; + owner = "PCSX2"; + repo = "pcsx2_patches"; + rev = "9ea7fca481e1e4c2263ca69f9a5c9a70c92626dc"; + hash = "sha256-T0yTTW6P/NrZsANoduj+gCXyd5qqDRETxLblmnVnP/o="; + }; }; - }; + in + self; shaderc-patched = let pname = "shaderc-patched-for-pcsx2"; @@ -61,4 +67,7 @@ (lib.cmakeBool "SHADERC_SKIP_TESTS" true) ]; }); +in +{ + inherit pcsx2 pcsx2_patches shaderc-patched; } diff --git a/pkgs/by-name/pd/pdf2odt/package.nix b/pkgs/by-name/pd/pdf2odt/package.nix index 809af8919343..a5d14a6fc299 100644 --- a/pkgs/by-name/pd/pdf2odt/package.nix +++ b/pkgs/by-name/pd/pdf2odt/package.nix @@ -28,7 +28,7 @@ resholve.mkDerivation rec { runHook preInstall install -Dm0555 pdf2odt -t $out/bin - install -Dm0444 README.md LICENSE -t $out/share/doc/${pname} + install -Dm0444 README.md LICENSE -t $out/share/doc/pdf2odt ln -rs $out/bin/pdf2odt $out/bin/pdf2ods diff --git a/pkgs/by-name/pd/pdf4tcl/package.nix b/pkgs/by-name/pd/pdf4tcl/package.nix new file mode 100644 index 000000000000..94ba20ebd742 --- /dev/null +++ b/pkgs/by-name/pd/pdf4tcl/package.nix @@ -0,0 +1,29 @@ +{ + lib, + tcl, + fetchzip, +}: + +tcl.mkTclDerivation rec { + pname = "pdf4tcl"; + version = "0.9.4"; + + src = fetchzip { + url = "mirror://sourceforge/pdf4tcl/pdf4tcl${lib.replaceStrings [ "." ] [ "" ] version}.tar.gz"; + hash = "sha256-lmSt0UQDfUef8S7zevAvvbeWB/vd6jLbKz7Y5A7xJm4="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/pdf4tcl + cp -r * $out/lib/pdf4tcl/ + runHook postInstall + ''; + + meta = { + description = "Tcl package for generating PDF files"; + homepage = "https://pdf4tcl.sourceforge.net/"; + license = lib.licenses.tcltk; + maintainers = with lib.maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 97a02d0e2cb5..dbd86adc44cc 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -5,7 +5,7 @@ php, }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "phpactor"; version = "2024.06.30.0"; @@ -16,7 +16,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-QcKkkgpWWypapQPawK1hu+6tkF9c5ICPeEPWqCwrUBM="; }; - vendorHash = "sha256-onUhRO6d2osf7n5QlYY86eamlCCslQMVltAv1shskgI="; + vendorHash = "sha256-Q72EeGeVqjaOZeW8VAB59OY0E/wvL8Ljq/9XC4iK/rg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 258e76c3fed8..55d6064f5dbf 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -4,7 +4,7 @@ , php }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; version = "11.3.1"; @@ -15,7 +15,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-uTH5LlXabhsu86Te/oNnIrvq88MhAqYbVTyKEaPtTuU="; }; - vendorHash = "sha256-hAIuAX3cBxs+mubgS/RlJ+QELvFoV35nAVDmkcaOddY="; + vendorHash = "sha256-cOy5kipPr73LbxmQAsqqR0GfegQp1ARrbqei2zi5JHc="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pl/plemoljp-hs/package.nix b/pkgs/by-name/pl/plemoljp-hs/package.nix index fe94bdc0a147..e96b55472637 100644 --- a/pkgs/by-name/pl/plemoljp-hs/package.nix +++ b/pkgs/by-name/pl/plemoljp-hs/package.nix @@ -12,10 +12,10 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm444 PlemolJP_HS/*.ttf -t $out/share/fonts/truetype/${pname} - install -Dm444 PlemolJP35_HS/*.ttf -t $out/share/fonts/truetype/${pname}-35 - install -Dm444 PlemolJPConsole_HS/*.ttf -t $out/share/fonts/truetype/${pname}-console - install -Dm444 PlemolJP35Console_HS/*.ttf -t $out/share/fonts/truetype/${pname}-35console + install -Dm444 PlemolJP_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs + install -Dm444 PlemolJP35_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs-35 + install -Dm444 PlemolJPConsole_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs-console + install -Dm444 PlemolJP35Console_HS/*.ttf -t $out/share/fonts/truetype/plemoljp-hs-35console runHook postInstall ''; diff --git a/pkgs/by-name/pl/plemoljp-nf/package.nix b/pkgs/by-name/pl/plemoljp-nf/package.nix index 40687bb720f9..c4675319ec0e 100644 --- a/pkgs/by-name/pl/plemoljp-nf/package.nix +++ b/pkgs/by-name/pl/plemoljp-nf/package.nix @@ -12,8 +12,8 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm444 PlemolJPConsole_NF/*.ttf -t $out/share/fonts/truetype/${pname}-console - install -Dm444 PlemolJP35Console_NF/*.ttf -t $out/share/fonts/truetype/${pname}-35console + install -Dm444 PlemolJPConsole_NF/*.ttf -t $out/share/fonts/truetype/plemoljp-nf-console + install -Dm444 PlemolJP35Console_NF/*.ttf -t $out/share/fonts/truetype/plemoljp-nf-35console runHook postInstall ''; diff --git a/pkgs/by-name/pl/plemoljp/package.nix b/pkgs/by-name/pl/plemoljp/package.nix index 43472cb743e0..8f7f092de310 100644 --- a/pkgs/by-name/pl/plemoljp/package.nix +++ b/pkgs/by-name/pl/plemoljp/package.nix @@ -12,10 +12,10 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm444 PlemolJP/*.ttf -t $out/share/fonts/truetype/${pname} - install -Dm444 PlemolJP35/*.ttf -t $out/share/fonts/truetype/${pname}-35 - install -Dm444 PlemolJPConsole/*.ttf -t $out/share/fonts/truetype/${pname}-console - install -Dm444 PlemolJP35Console/*.ttf -t $out/share/fonts/truetype/${pname}-35console + install -Dm444 PlemolJP/*.ttf -t $out/share/fonts/truetype/plemoljp + install -Dm444 PlemolJP35/*.ttf -t $out/share/fonts/truetype/plemoljp-35 + install -Dm444 PlemolJPConsole/*.ttf -t $out/share/fonts/truetype/plemoljp-console + install -Dm444 PlemolJP35Console/*.ttf -t $out/share/fonts/truetype/plemoljp-35console runHook postInstall ''; diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 666f12396681..a1c3717c2188 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -26,9 +26,12 @@ python3Packages.buildPythonApplication rec { # Tests depend on sudo doCheck = stdenv.isLinux; + build-system = [ + python3Packages.setuptools + ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook - python3Packages.setuptools git openssl ps diff --git a/pkgs/by-name/po/poptop/package.nix b/pkgs/by-name/po/poptop/package.nix new file mode 100644 index 000000000000..8796c2b16272 --- /dev/null +++ b/pkgs/by-name/po/poptop/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +let + pname = "poptop"; + version = "0.1.8"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "bakks"; + repo = "poptop"; + rev = "v${version}"; + hash = "sha256-CwJpkGNTDmtXfJx6GGz2XRU0fMeKl7I3fXm4BJ9MAQ4="; + }; + + vendorHash = "sha256-Ccvr+J+GDKnhlrlv0/kTaQYD986As7yb/h6Vyiuqjoc="; + + meta = { + description = "Modern top command that charts system metrics like CPU load, network IO, etc in the terminal"; + changelog = "https://github.com/bakks/poptop/releases/tag/v${version}"; + homepage = "https://github.com/bakks/poptop"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + mainProgram = "poptop"; + }; +} diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix index 494331045c00..aaa80787e8c9 100644 --- a/pkgs/by-name/po/portablemc/package.nix +++ b/pkgs/by-name/po/portablemc/package.nix @@ -43,7 +43,7 @@ let in python3Packages.buildPythonApplication rec { pname = "portablemc"; - version = "4.3.0"; + version = "4.4.0"; pyproject = true; disabled = python3Packages.pythonOlder "3.8"; @@ -51,8 +51,8 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mindstorm38"; repo = "portablemc"; - rev = "v${version}"; - hash = "sha256-jCv4ncXUWbkWlBZr3P1hNeVpdQzY9HtrFz+pmKknL0I="; + rev = "refs/tags/v${version}"; + hash = "sha256-JDosvjbpoDC+xJ15ejcMJd+jA09RLR+whVZblMu+ljk="; }; patches = [ diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 3f65974c9d3a..6142aa26813a 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -1,15 +1,15 @@ { - lib, - stdenv, autoPatchelfHook, fetchurl, + glib, glib-networking, - glibc, - gcc-unwrapped, gtk3, - openjdk17, + lib, libsecret, makeDesktopItem, + openjdk17, + stdenvNoCC, + swt, webkitgtk, wrapGAppsHook3, gitUpdater, @@ -25,11 +25,15 @@ let }; runtimeLibs = lib.makeLibraryPath [ + glib + glib-networking gtk3 + libsecret + swt webkitgtk ]; in -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "PortfolioPerformance"; version = "0.70.3"; @@ -43,12 +47,8 @@ stdenv.mkDerivation rec { wrapGAppsHook3 ]; - buildInputs = [ - gcc-unwrapped - glib-networking - glibc - libsecret - ]; + dontConfigure = true; + dontBuild = true; installPhase = '' mkdir -p $out/portfolio @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --prefix CLASSPATH : "${swt}/jars/swt.jar" \ --prefix PATH : ${openjdk17}/bin # Create desktop item diff --git a/pkgs/by-name/pp/ppsspp/fix-ffmpeg-6.patch b/pkgs/by-name/pp/ppsspp/fix-ffmpeg-6.patch new file mode 100644 index 000000000000..fb7f41621539 --- /dev/null +++ b/pkgs/by-name/pp/ppsspp/fix-ffmpeg-6.patch @@ -0,0 +1,170 @@ +Backported from . + +Original author: Andrew Udvare + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bfd5e69035..f7c43800fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,6 +117,7 @@ + endif() + + include(ccache) ++include(CheckCXXSourceCompiles) + include(GNUInstallDirs) + + add_definitions(-DASSETS_DIR="${CMAKE_INSTALL_FULL_DATADIR}/ppsspp/assets/") +@@ -949,6 +950,23 @@ + endif() + + find_package(FFmpeg REQUIRED avcodec avformat avutil swresample swscale) ++ # Check if we need to use avcodec_(alloc|free)_frame instead of av_frame_(alloc|free) ++ # Check if we need to use const AVCodec ++ set(CMAKE_REQUIRED_LIBRARIES avcodec;avformat) ++ set(CMAKE_REQUIRED_FLAGS "-pedantic -Wall -Werror -Wno-unused-variable") ++ check_cxx_source_compiles("extern \"C\" { ++ #include ++ #include ++ } ++ static AVCodecContext *s_codec_context = NULL; ++ int main() { ++ const AVCodec *codec = avcodec_find_encoder(s_codec_context->codec_id); ++ return 0; ++ } ++ " HAVE_LIBAVCODEC_CONST_AVCODEC FAIL_REGEX "invalid conversion") ++ ++ # Check if we need to use avcodec_alloc_context3 instead of stream->codec ++ # Check if we need to use av_frame_get_buffer instead of avcodec_default_get_buffer + endif(USE_FFMPEG) + + find_package(ZLIB) +@@ -2020,6 +2038,7 @@ + Core/ELF/PrxDecrypter.h + Core/ELF/ParamSFO.cpp + Core/ELF/ParamSFO.h ++ Core/FFMPEGCompat.h + Core/FileSystems/tlzrc.cpp + Core/FileSystems/BlobFileSystem.cpp + Core/FileSystems/BlobFileSystem.h +@@ -2354,6 +2373,9 @@ + + if(FFmpeg_FOUND) + target_compile_definitions(${CoreLibName} PRIVATE USE_FFMPEG=1) ++ if (HAVE_LIBAVCODEC_CONST_AVCODEC) ++ target_compile_definitions(${CoreLibName} PRIVATE HAVE_LIBAVCODEC_CONST_AVCODEC=1) ++ endif() + set_target_properties(${CoreLibName} PROPERTIES NO_SYSTEM_FROM_IMPORTED true) + target_include_directories(${CoreLibName} BEFORE PUBLIC ${FFmpeg_INCLUDE_avcodec}) + target_link_libraries(${CoreLibName} +diff --git a/Core/AVIDump.cpp b/Core/AVIDump.cpp +index 7c9576d292..aa81165031 100644 +--- a/Core/AVIDump.cpp ++++ b/Core/AVIDump.cpp +@@ -45,9 +45,7 @@ + #define av_frame_free avcodec_free_frame + #endif + +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 16, 100) +-#define AVCodec const AVCodec +-#endif ++#include "FFMPEGCompat.h" + + static AVFormatContext *s_format_context = nullptr; + static AVCodecContext *s_codec_context = nullptr; +diff --git a/Core/FFMPEGCompat.h b/Core/FFMPEGCompat.h +new file mode 100644 +index 0000000000..fed3b1c853 +--- /dev/null ++++ b/Core/FFMPEGCompat.h +@@ -1,0 +1,8 @@ ++#ifndef FFMPEG_COMPAT_H ++#define FFMPEG_COMPAT_H ++ ++#ifdef HAVE_LIBAVCODEC_CONST_AVCODEC ++#define AVCodec const AVCodec ++#endif ++ ++#endif // FFMPEG_COMPAT_H +diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp +index fe0e8a54de..f83d9ffdf1 100644 +--- a/Core/HLE/sceAtrac.cpp ++++ b/Core/HLE/sceAtrac.cpp +@@ -129,10 +129,7 @@ + #include "libavcodec/avcodec.h" + #include "libavutil/version.h" + } +- +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 16, 100) +-#define AVCodec const AVCodec +-#endif ++#include "Core/FFMPEGCompat.h" + + #endif // USE_FFMPEG + +diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp +index d050d62f3d..8be78c73e0 100644 +--- a/Core/HLE/sceMpeg.cpp ++++ b/Core/HLE/sceMpeg.cpp +@@ -113,9 +113,7 @@ + #include "libswscale/swscale.h" + #include "libavcodec/avcodec.h" + } +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 16, 100) +-#define AVCodec const AVCodec +-#endif ++#include "Core/FFMPEGCompat.h" + static AVPixelFormat pmp_want_pix_fmt; + + #endif +diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp +index 0ed957edfd..7e8b37d4dc 100644 +--- a/Core/HW/MediaEngine.cpp ++++ b/Core/HW/MediaEngine.cpp +@@ -56,9 +56,7 @@ + + #ifdef USE_FFMPEG + +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 16, 100) +-#define AVCodec const AVCodec +-#endif ++#include "Core/FFMPEGCompat.h" + + static AVPixelFormat getSwsFormat(int pspFormat) + { +diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp +index 7994a7f402..80397bf6da 100644 +--- a/Core/HW/SimpleAudioDec.cpp ++++ b/Core/HW/SimpleAudioDec.cpp +@@ -33,6 +33,7 @@ + #include "libavutil/samplefmt.h" + #include "libavcodec/avcodec.h" + } ++#include "Core/FFMPEGCompat.h" + + #endif // USE_FFMPEG + +diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h +index 52a78bf3b4..9bf2427a4a 100644 +--- a/Core/HW/SimpleAudioDec.h ++++ b/Core/HW/SimpleAudioDec.h +@@ -33,10 +33,6 @@ + #include "libavutil/version.h" + }; + +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 16, 100) +-#define AVCodec const AVCodec +-#endif +- + #endif + + // Wraps FFMPEG for audio decoding in a nice interface. +@@ -90,6 +86,9 @@ + int wanted_resample_freq; // wanted resampling rate/frequency + + AVFrame *frame_; ++#if HAVE_LIBAVCODEC_CONST_AVCODEC // USE_FFMPEG is implied ++ const ++#endif + AVCodec *codec_; + AVCodecContext *codecCtx_; + SwrContext *swrCtx_; diff --git a/pkgs/by-name/pp/ppsspp/package.nix b/pkgs/by-name/pp/ppsspp/package.nix index 2fbcdef3f744..1b2b2931247d 100644 --- a/pkgs/by-name/pp/ppsspp/package.nix +++ b/pkgs/by-name/pp/ppsspp/package.nix @@ -4,7 +4,7 @@ cmake, copyDesktopItems, fetchFromGitHub, - ffmpeg, + ffmpeg_6, glew, libffi, libsForQt5, @@ -48,6 +48,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-I84zJqEE1X/eo/ukeGA2iZe3lWKvilk+RNGUzl2wZXY="; }; + patches = lib.optionals useSystemFfmpeg [ + ./fix-ffmpeg-6.patch + ]; + postPatch = '' substituteInPlace git-version.cmake --replace unknown ${finalAttrs.src.rev} substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share @@ -69,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals useSystemFfmpeg [ - ffmpeg + ffmpeg_6 ] ++ lib.optionals useSystemSnappy [ snappy diff --git a/pkgs/by-name/pr/process-cpp/package.nix b/pkgs/by-name/pr/process-cpp/package.nix index 2a04e385c325..eb9638e74ab1 100644 --- a/pkgs/by-name/pr/process-cpp/package.nix +++ b/pkgs/by-name/pr/process-cpp/package.nix @@ -1,27 +1,28 @@ -{ lib -, stdenv -, fetchFromGitLab -, testers -, unstableGitUpdater -, cmake -, coreutils -, boost -, gtest -, lomiri -, properties-cpp -, pkg-config +{ + lib, + stdenv, + fetchFromGitLab, + testers, + gitUpdater, + cmake, + coreutils, + boost, + gtest, + lomiri, + properties-cpp, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "process-cpp"; - version = "3.0.1-unstable-2024-03-14"; + version = "3.0.2"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "ubports"; repo = "development/core/lib-cpp/process-cpp"; - rev = "7b0a829abcbcdd25d949e5f9e2c26bb985a58b31"; - hash = "sha256-Az+lSJ7uVR4pAWvOeah5vFtIPb12eKp0nAFF1qsHZXA="; + rev = finalAttrs.version; + hash = "sha256-UCNmD5Ea2wnEwG9gkt88TaX0vfS4SCaIOPRMeNFx80Y="; }; outputs = [ @@ -52,27 +53,29 @@ stdenv.mkDerivation (finalAttrs: { properties-cpp ]; - checkInputs = [ - gtest - ]; + checkInputs = [ gtest ]; - cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) - ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; passthru = { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - updateScript = unstableGitUpdater { }; + updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Simple convenience library for handling processes in C++11"; homepage = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp"; - license = with licenses; [ gpl3Only lgpl3Only ]; - maintainers = with maintainers; [ onny OPNA2608 ]; - platforms = platforms.linux; + license = with lib.licenses; [ + gpl3Only + lgpl3Only + ]; + maintainers = with lib.maintainers; [ + onny + OPNA2608 + ]; + platforms = lib.platforms.linux; pkgConfigModules = [ "process-cpp" ]; }; }) diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 0e19eb417167..d108ed652b10 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "moonrepo"; - repo = pname; + repo = "proto"; rev = "v${version}"; hash = "sha256-o/du9XmiS7U5ypm6osQtVTjrJY60iLCkJ4DWCYOeIoY="; }; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' # proto looks up a proto-shim executable file in $PROTO_LOOKUP_DIR - wrapProgram $out/bin/${pname} \ + wrapProgram $out/bin/proto \ --set PROTO_LOOKUP_DIR $out/bin ''; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 58d26335599a..66aa1c255a49 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.20.2"; + version = "1.22.0"; src = fetchurl { url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb"; - hash = "sha256-4QSBKVnEH7yDXwqY+29/a+yWv89i/TVCYO26V95KA4s="; + hash = "sha256-ARIUHmU/YN8IoAFMkcxzGAoH31vbJLT7HfYD6a57QaY="; }; dontConfigure = true; @@ -44,7 +44,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Desktop application for Proton Pass"; homepage = "https://proton.me/pass"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ massimogengarelli sebtm ]; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + massimogengarelli + sebtm + ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "proton-pass"; diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix index cee003e5f7d9..1fe983d258d6 100644 --- a/pkgs/by-name/pt/ptyxis/package.nix +++ b/pkgs/by-name/pt/ptyxis/package.nix @@ -14,27 +14,25 @@ pcre2, }: -let - version = "46.5"; +stdenv.mkDerivation (finalAttrs: { + pname = "ptyxis"; + version = "46.6"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "ptyxis"; - rev = version; - hash = "sha256-PHjQJEM0W26ZpzW//+gsYCCq0lcikWh0707kDXxryAo="; + rev = finalAttrs.version; + hash = "sha256-exsb5+5jxUKRHDaaBG3rJcJoqLGa6n/dsMlDtwUGfJo="; }; + # FIXME: drop patched vte-gtk4 in 47.x release vte-gtk4-patched = vte-gtk4.overrideAttrs (prev: { patches = (prev.patches or [ ]) ++ [ - "${src}/build-aux/0001-a11y-implement-GtkAccessibleText.patch" - "${src}/build-aux/0001-add-notification-and-shell-precmd-preexec.patch" + "${finalAttrs.src}/build-aux/0001-a11y-implement-GtkAccessibleText.patch" + "${finalAttrs.src}/build-aux/0001-add-notification-and-shell-precmd-preexec.patch" ]; }); -in -stdenv.mkDerivation { - pname = "ptyxis"; - inherit version src; nativeBuildInputs = [ meson @@ -47,15 +45,11 @@ stdenv.mkDerivation { buildInputs = [ libadwaita json-glib - vte-gtk4-patched + finalAttrs.vte-gtk4-patched libportal-gtk4 pcre2 ]; - passthru = { - inherit vte-gtk4-patched; - }; - meta = { description = "Terminal for GNOME with first-class support for containers"; homepage = "https://gitlab.gnome.org/chergert/ptyxis"; @@ -64,4 +58,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index 84318d14e482..1f7123e468b7 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -34,13 +34,13 @@ let pname = "pulsar"; - version = "1.119.0"; + version = "1.120.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-wW+mbN+XPpqdksFrJ37eHMYccXxg9zIR139SkuawTmA="; + x86_64-linux.hash = "sha256-35/ZMi6YsXs27icV3kXuKl3Kl8IHLLYbV0aO49qMJ2Q="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-XSEAo/wGNdzx8MtUrCJ6U1pDoY1p+cTdVAn1NsayZW4="; + aarch64-linux.hash = "sha256-N1CAWeBHePd2KnnePEJQnvIKfIxal1RQ5UB8pxpVJCk="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); newLibpath = lib.makeLibraryPath [ @@ -232,6 +232,7 @@ stdenv.mkDerivation { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ bryango ]; knownVulnerabilities = [ + # electron 12.2.3, efforts are in place to bump it "CVE-2023-5217" "CVE-2022-21718" "CVE-2022-29247" diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index c1b925e200bb..b78ac0a2b50d 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -15,7 +15,7 @@ buildDotnetModule rec { src = fetchFromGitHub { owner = "mattpannella"; - repo = "${pname}"; + repo = "pupdate"; rev = "${version}"; hash = "sha256-odlKNp6kjOAYeRIHnLniqkCXTi1UXF3szn8tJtrxzQU="; }; diff --git a/pkgs/by-name/pw/pw3270/package.nix b/pkgs/by-name/pw/pw3270/package.nix index 953674cd3ec5..b46d30355a29 100644 --- a/pkgs/by-name/pw/pw3270/package.nix +++ b/pkgs/by-name/pw/pw3270/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "PerryWerneck"; - repo = pname; + repo = "pw3270"; rev = version; hash = "sha256-Nk/OUqrWngKgb1D1Wi8q5ygKtvuRKUPhPQaLvWi1Z4g="; }; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { postFixup = '' # Schemas get installed to wrong directory. mkdir -p $out/share/glib-2.0 - mv $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas $out/share/glib-2.0/ + mv $out/share/gsettings-schemas/pw3270-${version}/glib-2.0/schemas $out/share/glib-2.0/ rm -rf $out/share/gsettings-schemas ''; diff --git a/pkgs/by-name/py/pylyzer/Cargo.lock b/pkgs/by-name/py/pylyzer/Cargo.lock index 7f4fe640cd5f..e8e4f697e531 100644 --- a/pkgs/by-name/py/pylyzer/Cargo.lock +++ b/pkgs/by-name/py/pylyzer/Cargo.lock @@ -85,6 +85,12 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +[[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" @@ -139,9 +145,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "els" -version = "0.1.54-nightly.2" +version = "0.1.54-nightly.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d774d511ed129b8438a9633b17f3303768fa7a3941372c1650e61a7bc7b00c" +checksum = "bdc6282121d9e2871553e0731cfb88119cbfe76ce8aab08ac2be01f5644e3bee" dependencies = [ "erg_common", "erg_compiler", @@ -153,9 +159,9 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.42-nightly.2" +version = "0.6.42-nightly.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b084d80afdb59d10d300595b2860868e52d1a0a72ad98ac995c9f5abfba9acd8" +checksum = "c0dfc622cc65f230a05a284a21f62c8f4a3c964c51c97881cc4e01202ef2a3c0" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", @@ -165,9 +171,9 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.42-nightly.2" +version = "0.6.42-nightly.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "805b009c668055c8d72d11f8b26853c9a65a2744548909beda8b32bd4058a375" +checksum = "42247c4ab1eb33ed3e2e9e74f4773565eba4491f76bfbda4b965015938704ca1" dependencies = [ "erg_common", "erg_parser", @@ -175,9 +181,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.42-nightly.2" +version = "0.6.42-nightly.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec4f2cc69904baae639ff154323d1cc0e100ca2785bfb6d8c392c88e0560771" +checksum = "6c921c178517c2071e45418e8c5b35e0c3a19021e4459283fd8f6997b89ba216" dependencies = [ "erg_common", "erg_proc_macros", @@ -186,9 +192,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.42-nightly.2" +version = "0.6.42-nightly.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6234abaef2fed929391add7520409890b2b7ee7029f2a5dcb9c2f4905bb7556b" +checksum = "c1381ca7a7a0781834cb1d617cd8361cca23f880cb9c515d249905d585832734" dependencies = [ "quote", "syn 1.0.109", @@ -554,7 +560,7 @@ dependencies = [ [[package]] name = "py2erg" -version = "0.0.59" +version = "0.0.61" dependencies = [ "erg_common", "erg_compiler", @@ -564,9 +570,18 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.59" +version = "0.0.61" dependencies = [ "els", + "erg_common", + "erg_compiler", + "pylyzer_core", +] + +[[package]] +name = "pylyzer_core" +version = "0.0.61" +dependencies = [ "erg_common", "erg_compiler", "py2erg", @@ -574,6 +589,16 @@ dependencies = [ "rustpython-parser", ] +[[package]] +name = "pylyzer_wasm" +version = "0.0.61" +dependencies = [ + "erg_common", + "erg_compiler", + "pylyzer_core", + "wasm-bindgen", +] + [[package]] name = "quote" version = "1.0.36" @@ -968,6 +993,61 @@ 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.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.74", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + [[package]] name = "windows-targets" version = "0.52.6" diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 771304ce0bb5..0aa0865c97da 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.59"; + version = "0.0.61"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-8XwNdxPREqrmd3IoD+Z/uTEGs3Qk6+vGa4S+6qje1Ic="; + hash = "sha256-t0BzNNofjeBlNqf6iqaWrTzVpzEACyyrZ3YKDYz713U="; }; cargoLock = { diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 555e3cab65be..5f24f8e592bc 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.376"; + version = "1.1.377"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-OxLZF2ZqAHdiXRAO+bC9e9gU05di+NufZhmN/wesm3I="; + hash = "sha256-OvdA3IFUdeBEU97+F9C86k6PDGOYggExj+ZoIt77PuI="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-j7+uigtOnYFqHKxcnOJWaQcvGoHJ5FM3BkW6folfkuw="; + npmDepsHash = "sha256-nvqg0145zW+4uvgoATWqzexQVmUBmateowxd6E14Tl8="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-m66enEsj5G0jq3xTnJySIc9bS9SW6YagO00H37lIEIU="; + npmDepsHash = "sha256-aTBk8O6yEwOt1N/WaFOOfPZvfILZ5x7E2vm9N7+qth4="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/qc/qcm/package.nix b/pkgs/by-name/qc/qcm/package.nix index c1aaa0e3311e..88ecd5770402 100644 --- a/pkgs/by-name/qc/qcm/package.nix +++ b/pkgs/by-name/qc/qcm/package.nix @@ -9,16 +9,16 @@ , cubeb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qcm"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "hypengw"; repo = "Qcm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-9xbAw5U4BtpupelsOzfZGosdLx06TKPTG8hhc/no3R0="; + hash = "sha256-dwzstlmGuY8oRxxO2BPXmSCSnE7Fbp+dyYVs17HUopA="; }; patches = [ ./remove_cubeb_vendor.patch ]; @@ -42,16 +42,12 @@ stdenv.mkDerivation rec { "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath cubeb.passthru.backendLibs}" ]; - postInstall = '' - rm -r $out/{include,lib/cmake} - ''; - - meta = with lib; { + meta = { description = "Unofficial Qt client for netease cloud music"; homepage = "https://github.com/hypengw/Qcm"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; mainProgram = "Qcm"; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix index 7c66fbd0a78a..5105e6c30a1c 100644 --- a/pkgs/by-name/qd/qdiskinfo/package.nix +++ b/pkgs/by-name/qd/qdiskinfo/package.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "QDiskInfo"; - version = "0.2"; + pname = "qdiskinfo"; + version = "0.3"; src = fetchFromGitHub { owner = "edisionnano"; repo = "QDiskInfo"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-YLNpQOmh/exBJDuYRUEvzNv/El4x+PttEoj+aCur9wg="; + hash = "sha256-0zF3Nc5K8+K68HOSy30ieYvYP9/oSkTe0+cp0hVo9Gs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qs/qsv/Cargo.lock b/pkgs/by-name/qs/qsv/Cargo.lock new file mode 100644 index 000000000000..69ebb3db094c --- /dev/null +++ b/pkgs/by-name/qs/qsv/Cargo.lock @@ -0,0 +1,7815 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "actix-codec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "futures-core", + "futures-sink", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "actix-governor" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e7b88f3804e01bd4191fdb08650430bbfcb43d3d9b2890064df3551ec7d25b" +dependencies = [ + "actix-http", + "actix-web", + "futures", + "governor", +] + +[[package]] +name = "actix-http" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", + "ahash 0.8.11", + "base64", + "bitflags 2.6.0", + "brotli", + "bytes", + "bytestring", + "derive_more", + "encoding_rs", + "flate2", + "futures-core", + "http 0.2.12", + "httparse", + "httpdate", + "itoa", + "language-tags", + "local-channel", + "mime", + "percent-encoding", + "pin-project-lite", + "rand", + "sha1", + "smallvec", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "actix-router" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" +dependencies = [ + "bytestring", + "cfg-if", + "http 0.2.12", + "regex-lite", + "serde", + "tracing", +] + +[[package]] +name = "actix-rt" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" +dependencies = [ + "futures-core", + "tokio", +] + +[[package]] +name = "actix-server" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca2549781d8dd6d75c40cf6b6051260a2cc2f3c62343d761a969a0640646894" +dependencies = [ + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "futures-util", + "mio", + "socket2", + "tokio", + "tracing", +] + +[[package]] +name = "actix-service" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" +dependencies = [ + "futures-core", + "paste", + "pin-project-lite", +] + +[[package]] +name = "actix-utils" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" +dependencies = [ + "local-waker", + "pin-project-lite", +] + +[[package]] +name = "actix-web" +version = "4.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" +dependencies = [ + "actix-codec", + "actix-http", + "actix-router", + "actix-rt", + "actix-server", + "actix-service", + "actix-utils", + "ahash 0.8.11", + "bytes", + "bytestring", + "cfg-if", + "derive_more", + "encoding_rs", + "futures-core", + "futures-util", + "itoa", + "language-tags", + "log", + "mime", + "once_cell", + "pin-project-lite", + "regex-lite", + "serde", + "serde_json", + "serde_urlencoded", + "smallvec", + "socket2", + "time", + "url", +] + +[[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 = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[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 = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "const-random", + "getrandom", + "once_cell", + "serde", + "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 = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[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" +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 = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arboard" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +dependencies = [ + "clipboard-win", + "core-graphics", + "image", + "log", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot 0.12.3", + "windows-sys 0.48.0", + "x11rb", +] + +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "argminmax" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52424b59d69d69d5056d508b260553afd91c57e21849579cd1f50ee8b8b88eaa" +dependencies = [ + "num-traits", +] + +[[package]] +name = "array-init-cursor" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "arrow" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05048a8932648b63f21c37d88b552ccc8a65afb6dfe9fc9f30ce79174c2e7a85" +dependencies = [ + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", + "arrow-string", +] + +[[package]] +name = "arrow-arith" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d8a57966e43bfe9a3277984a14c24ec617ad874e4c0e1d2a1b083a39cfbf22c" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "num", +] + +[[package]] +name = "arrow-array" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f4a9468c882dc66862cef4e1fd8423d47e67972377d85d80e022786427768c" +dependencies = [ + "ahash 0.8.11", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "hashbrown 0.14.5", + "num", +] + +[[package]] +name = "arrow-buffer" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1" +dependencies = [ + "bytes", + "half", + "num", +] + +[[package]] +name = "arrow-cast" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da26719e76b81d8bc3faad1d4dbdc1bcc10d14704e63dc17fc9f3e7e1e567c8e" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "atoi", + "base64", + "chrono", + "comfy-table", + "half", + "lexical-core", + "num", + "ryu", +] + +[[package]] +name = "arrow-data" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5" +dependencies = [ + "arrow-buffer", + "arrow-schema", + "half", + "num", +] + +[[package]] +name = "arrow-ord" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42745f86b1ab99ef96d1c0bcf49180848a64fe2c7a7a0d945bc64fa2b21ba9bc" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "half", + "num", +] + +[[package]] +name = "arrow-row" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd09a518c602a55bd406bcc291a967b284cfa7a63edfbf8b897ea4748aad23c" +dependencies = [ + "ahash 0.8.11", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "half", +] + +[[package]] +name = "arrow-schema" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e972cd1ff4a4ccd22f86d3e53e835c2ed92e0eea6a3e8eadb72b4f1ac802cf8" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "arrow-select" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600bae05d43483d216fb3494f8c32fdbefd8aa4e1de237e790dbb3d9f44690a3" +dependencies = [ + "ahash 0.8.11", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "num", +] + +[[package]] +name = "arrow-string" +version = "52.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dc1985b67cb45f6606a248ac2b4a288849f196bab8c657ea5589f47cdd55e6" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "memchr", + "num", + "regex", + "regex-syntax", +] + +[[package]] +name = "ashpd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +dependencies = [ + "async-fs", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "url", + "zbus", +] + +[[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 = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" +dependencies = [ + "event-listener", + "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-compression" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "zstd", + "zstd-safe", +] + +[[package]] +name = "async-executor" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener", + "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", + "blocking", + "futures-lite", +] + +[[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", + "async-lock", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix", + "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.72", +] + +[[package]] +name = "async-signal" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[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.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atoi_simd" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae037714f313c1353189ead58ef9eec30a8e8dc101b2622d461418fd59e28a9" + +[[package]] +name = "atoi_simd" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4790f9e8961209112beb783d85449b508673cf4a6a419c8449b210743ac4dbe9" + +[[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.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "avro-schema" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5281855b39aba9684d2f47bf96983fbfd8f1725f12fabb0513a8ab879647bbd" +dependencies = [ + "crc 2.1.0", + "fallible-streaming-iterator", + "libflate", + "serde", + "serde_json", + "snap", +] + +[[package]] +name = "az" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" + +[[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 = "base62" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f879ef8fc74665ed7f0e6127cb106315888fc2744f68e14b74f83edbb2a08992" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.72", + "which", +] + +[[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 = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] + +[[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" +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 = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + +[[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", + "piper", +] + +[[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.72", + "syn_derive", +] + +[[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[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" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "bytecount" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" + +[[package]] +name = "bytemuck" +version = "1.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" +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.72", +] + +[[package]] +name = "byteorder" +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.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "bytestring" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" +dependencies = [ + "bytes", +] + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cached" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4d73155ae6b28cf5de4cfc29aeb02b8a1c6dab883cb015d15cd514e42766846" +dependencies = [ + "ahash 0.8.11", + "cached_proc_macro", + "cached_proc_macro_types", + "directories", + "hashbrown 0.14.5", + "once_cell", + "r2d2", + "redis 0.25.4", + "rmp-serde", + "serde", + "serde_json", + "sled", + "thiserror", + "web-time", +] + +[[package]] +name = "cached_proc_macro" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f42a145ed2d10dce2191e1dcf30cfccfea9026660e143662ba5eec4017d5daa" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "cached_proc_macro_types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" + +[[package]] +name = "calamine" +version = "0.25.0" +source = "git+https://github.com/tafia/calamine?rev=a90e877#a90e877aed7984fca28b9925110b5c42d48bf4e7" +dependencies = [ + "byteorder", + "chrono", + "codepage", + "encoding_rs", + "log", + "quick-xml 0.31.0", + "serde", + "zip", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "censor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41e3b9fdbb9b3edc10dc66a06dc255822f699c432e19403fb966e6d60e0dec4" +dependencies = [ + "once_cell", +] + +[[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.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", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "chrono-tz" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" +dependencies = [ + "chrono", + "chrono-tz-build 0.2.1", + "phf 0.11.2", +] + +[[package]] +name = "chrono-tz" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" +dependencies = [ + "chrono", + "chrono-tz-build 0.3.0", + "phf 0.11.2", +] + +[[package]] +name = "chrono-tz-build" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +dependencies = [ + "parse-zoneinfo", + "phf 0.11.2", + "phf_codegen", +] + +[[package]] +name = "chrono-tz-build" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" +dependencies = [ + "parse-zoneinfo", + "phf 0.11.2", + "phf_codegen", +] + +[[package]] +name = "chumsky" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" +dependencies = [ + "hashbrown 0.14.5", +] + +[[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 = "clipboard-win" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +dependencies = [ + "error-code", +] + +[[package]] +name = "codepage" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48f68d061bc2828ae826206326e61251aca94c1e4a5305cf52d9138639c918b4" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "comfy-table" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" +dependencies = [ + "crossterm", + "strum 0.26.3", + "strum_macros 0.26.4", + "unicode-width", +] + +[[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 = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[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 = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" +dependencies = [ + "cookie", + "idna 0.5.0", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] + +[[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 = "core_affinity" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622892f5635ce1fc38c8f16dfc938553ed64af482edb5e150bf4caedbfcb2304" +dependencies = [ + "libc", + "num_cpus", + "winapi", +] + +[[package]] +name = "counter" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f009fcafa949dc1fc46a762dae84d0c2687d3b550906b633c4979d58d2c6ae52" +dependencies = [ + "num-traits", +] + +[[package]] +name = "cpc" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "623b2754bc61b8c833868ff971286e90f83576df3fc64c52cd3c45805d86a18b" +dependencies = [ + "decimal", + "unicode-segmentation", +] + +[[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 = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" +dependencies = [ + "crc-catalog 1.1.1", +] + +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog 2.4.0", +] + +[[package]] +name = "crc-catalog" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" + +[[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 = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "libc", + "parking_lot 0.12.3", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "csv-diff" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf378965e48a7d858973826f7e7ef4a09c38543d0c074195f126023e30572fb5" +dependencies = [ + "ahash 0.8.11", + "crossbeam-channel", + "csv", + "mown", + "rayon", + "thiserror", + "xxhash-rust", +] + +[[package]] +name = "csv-index" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f274135fcb98bd7e6e47a9e0b44639ec53b3e5d6c1930e2a9e6a014f90470404" +dependencies = [ + "byteorder", + "csv", +] + +[[package]] +name = "csvs_convert" +version = "0.8.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7633dcaa54b3ab40e9d81a58d525f03c4e936f39ba672908b5e90f4f61fd969" +dependencies = [ + "chrono", + "counter", + "crossbeam-channel", + "csv", + "csv-index", + "duckdb", + "lazy_static", + "log", + "minijinja", + "pathdiff", + "pdatastructs", + "petgraph", + "postgres", + "rand", + "regex", + "rusqlite", + "serde_json", + "snafu", + "streaming-stats", + "tempfile", + "thiserror", + "threadpool", + "typed-builder", + "walkdir", + "xlsxwriter", + "zip", +] + +[[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.72", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.72", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core 0.9.10", +] + +[[package]] +name = "data-encoding" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "decimal" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8ab77e91baeb15034c3be91e87bff4665c9036216148e4996d9a9f5792114d" +dependencies = [ + "bitflags 1.3.2", + "cc", + "libc", + "ord_subset", + "serde", +] + +[[package]] +name = "deepsize" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdb987ec36f6bf7bfbea3f928b75590b736fc42af8e54d97592481351b2b96c" +dependencies = [ + "deepsize_derive", +] + +[[package]] +name = "deepsize_derive" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990101d41f3bc8c1a45641024377ee284ecc338e5ecf3ea0f0e236d897c72796" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "deflate64" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" + +[[package]] +name = "der" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" +dependencies = [ + "const-oid", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "derive_more" +version = "0.99.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 2.0.72", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "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.72", +] + +[[package]] +name = "divrem" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69dde51e8fef5e12c1d65e0929b03d66e4c0c18282bc30ed2ca050ad6f44dd82" + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "duckdb" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626373a331b49f94b24edc4e53a59b0b354f085ac3b339d43d31da7a9b145004" +dependencies = [ + "arrow", + "cast", + "fallible-iterator 0.3.0", + "fallible-streaming-iterator", + "hashlink 0.8.4", + "libduckdb-sys", + "memchr", + "num-integer", + "rust_decimal", + "smallvec", + "strum 0.25.0", +] + +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "dynfmt" +version = "0.1.5" +source = "git+https://github.com/jqnatividad/dynfmt?branch=2021-clippy_ptr_as_ptr-bumpdeps#0dec5eaceba58e294283d8ebc6333b421220c186" +dependencies = [ + "erased-serde", + "lazy_static", + "regex", + "serde", + "thiserror", +] + +[[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", + "serde", + "sha2", + "signature", + "subtle", + "zeroize", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +dependencies = [ + "serde", +] + +[[package]] +name = "elapsed" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f4e5af126dafd0741c2ad62d47f68b28602550102e5f0dd45c8a97fc8b49c29" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enum_dispatch" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[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.72", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + +[[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 = "ethnum" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c" + +[[package]] +name = "eudex" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95cb9bf0969366245682aedd5197be1491f2a044fc99c45564710b22b0e9ac87" + +[[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", + "pin-project-lite", +] + +[[package]] +name = "ext-sort" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf73e44617eab501beba39234441a194cf138629d3b6447f81f573e1c3d0a13" +dependencies = [ + "deepsize", + "log", + "rayon", + "rmp-serde", + "serde", + "tempfile", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "fast-float" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" + +[[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 = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "file-format" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ffe3a660c3a1b10e96f304a9413d673b2118d62e4520f7ddf4a4faccfe8b9b9" + +[[package]] +name = "filetime" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +dependencies = [ + "cfg-if", + "libc", + "libredox", + "windows-sys 0.59.0", +] + +[[package]] +name = "fixed" +version = "1.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c6e0b89bf864acd20590dbdbad56f69aeb898abfc9443008fd7bd48b2cc85a" +dependencies = [ + "az", + "bytemuck", + "half", + "num-traits", + "typenum", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flatten-json-object" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9539d6d8c87acbf7c3189fb4d1c8ce926de16369212e97ba1629b62febb3d512" +dependencies = [ + "serde_json", + "thiserror", +] + +[[package]] +name = "flexi_logger" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca927478b3747ba47f98af6ba0ac0daea4f12d12f55e9104071b3dc00276310" +dependencies = [ + "chrono", + "crossbeam-channel", + "crossbeam-queue", + "flate2", + "glob", + "log", + "thiserror", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "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.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.72", +] + +[[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.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f158e3ff0a1b334408dc9fb811cd99b446986f4d8b741bb08f9df1604085ae7" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + +[[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-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.72", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" + +[[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 = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gender_guesser" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b93a4238a98f7f34ff4462543eae8587175d7cf24879dd9bfb1b90c3670033e" + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[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 = "geosuggest-core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e443eee3f77dd64cbe0079c4c713f8d2c296b4bbee72816270d609fa99ff99c2" +dependencies = [ + "bincode", + "csv", + "itertools 0.12.1", + "kiddo", + "rayon", + "serde", + "serde_json", + "strsim", +] + +[[package]] +name = "geosuggest-utils" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc433b923a60001983e9534171231bbdb7f287bf054fa5fb017ae53dcee9dee" +dependencies = [ + "anyhow", + "futures", + "geosuggest-core", + "reqwest", + "serde", + "tokio", + "zip", +] + +[[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", + "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 = "governor" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" +dependencies = [ + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot 0.12.3", + "portable-atomic", + "quanta", + "rand", + "smallvec", + "spinning_top", +] + +[[package]] +name = "grex" +version = "1.4.5" +source = "git+https://github.com/pemistahl/grex?rev=6a78534#6a785342995a4b056b4af95011277d2fa6689cb1" +dependencies = [ + "itertools 0.13.0", + "lazy_static", + "ndarray", + "petgraph", + "regex", + "unic-char-range", + "unic-ucd-category", + "unicode-segmentation", + "wasm-bindgen", +] + +[[package]] +name = "gzp" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c65d1899521a11810501b50b898464d133e1afc96703cff57726964cfa7baf" +dependencies = [ + "byteorder", + "bytes", + "core_affinity", + "flate2", + "flume", + "num_cpus", + "snap", + "thiserror", +] + +[[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", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", + "num-traits", +] + +[[package]] +name = "halfbrown" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" +dependencies = [ + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.8", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash 0.8.11", + "allocator-api2", + "rayon", + "serde", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "heck" +version = "0.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.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 = "hifijson" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9958ab3ce3170c061a27679916bd9b969eceeb5e8b120438e6751d0987655c42" + +[[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 = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +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", + "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 = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http 1.1.0", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "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 1.1.0", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[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 0.52.0", +] + +[[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 = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[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.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "num-traits", + "png", + "tiff", +] + +[[package]] +name = "indexmap" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "rayon", + "serde", +] + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "init_with" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0175f63815ce00183bf755155ad0cb48c65226c5d17a724e369c25418d2b7699" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "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 = "iso8601" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153" +dependencies = [ + "nom", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "itoap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" + +[[package]] +name = "jaq-interpret" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fe95ec3c24af3fd9f3dd1091593f5e49b003a66c496a8aa39d764d0a06ae17b" +dependencies = [ + "ahash 0.8.11", + "dyn-clone", + "hifijson", + "indexmap", + "jaq-syn", + "once_cell", + "serde_json", +] + +[[package]] +name = "jaq-parse" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0346d7d3146cdda8acd929581f3d6626a332356c74d5c95aeaffaac2eb6dee82" +dependencies = [ + "chumsky", + "jaq-syn", +] + +[[package]] +name = "jaq-syn" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba44fe4428c71304604261ecbae047ee9cfb60c4f1a6bd222ebbb31726d3948" +dependencies = [ + "serde", +] + +[[package]] +name = "jemalloc-sys" +version = "0.5.4+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "jemallocator" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc" +dependencies = [ + "jemalloc-sys", + "libc", +] + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "jql-parser" +version = "7.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d215ff4717b98d7d294bca2262b63cf50487d5d99fbfcf7cbadb8e7e3be887" +dependencies = [ + "thiserror", + "winnow 0.6.18", +] + +[[package]] +name = "jql-runner" +version = "7.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61a4716f6e19e19668a319f94df5a771b9e7071936298844b13229d37f8a025" +dependencies = [ + "indexmap", + "jql-parser", + "rayon", + "serde_json", + "thiserror", +] + +[[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 = "json-objects-to-csv" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af3b789ec1548099bb74f65733e795b2d120f44fa0b34be8bae9fdb34d579b09" +dependencies = [ + "csv", + "flatten-json-object", + "serde_json", + "tempfile", + "thiserror", +] + +[[package]] +name = "jsonpath_lib_polars_vendor" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4bd9354947622f7471ff713eacaabdb683ccb13bba4edccaab9860abf480b7d" +dependencies = [ + "log", + "serde", + "serde_json", +] + +[[package]] +name = "jsonschema" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0afd06142c9bcb03f4a8787c77897a87b6be9c4918f1946c33caa714c27578" +dependencies = [ + "ahash 0.8.11", + "anyhow", + "base64", + "bytecount", + "fancy-regex", + "fraction", + "getrandom", + "iso8601", + "itoa", + "memchr", + "num-cmp", + "once_cell", + "parking_lot 0.12.3", + "percent-encoding", + "regex", + "reqwest", + "serde", + "serde_json", + "time", + "url", + "uuid", +] + +[[package]] +name = "kiddo" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d2f8d9e1bc7c6919ad2cdc83472a9a4b5ed2ea2c5392c9514fdf958a7920f9a" +dependencies = [ + "az", + "divrem", + "doc-comment", + "elapsed", + "fixed", + "generator", + "init_with", + "itertools 0.12.1", + "log", + "num-traits", + "ordered-float 4.2.2", + "sorted-vec", + "tracing", + "tracing-subscriber", + "ubyte", +] + +[[package]] +name = "language-tags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lexical-core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[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 = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libduckdb-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa48143af4679c674db9ad7951ff1d3ce67b8b55578e523d96af54152df6c13b" +dependencies = [ + "autocfg", + "cc", + "flate2", + "pkg-config", + "serde", + "serde_json", + "tar", + "vcpkg", +] + +[[package]] +name = "libflate" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" +dependencies = [ + "adler32", + "crc32fast", + "libflate_lz77", +] + +[[package]] +name = "libflate_lz77" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" +dependencies = [ + "rle-decode-fast", +] + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libmimalloc-sys" +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.5.3", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libxlsxwriter-sys" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd2753d56c22afb5bbd4fa33f8c47288a5cb57e16870eda33b21016d8c44672" +dependencies = [ + "bindgen", + "cc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "local-channel" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8" +dependencies = [ + "futures-core", + "futures-sink", + "local-waker", +] + +[[package]] +name = "local-encoding" +version = "0.2.0" +source = "git+https://github.com/slonopotamus/local-encoding-rs?branch=travis-madness#4ac63dd0c32e42244aa563dd694ce488121873b1" +dependencies = [ + "winapi", +] + +[[package]] +name = "local-waker" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" + +[[package]] +name = "localzone" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718530aa7b3842752f82224791ea1db5e6b7260513b8ab45706937dbf54f7b4d" +dependencies = [ + "chrono-tz 0.9.0", + "js-sys", + "windows 0.54.0", +] + +[[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 = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "luau0-src" +version = "0.10.2+luau635" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8bd6bc70c84fdd4e89b71b528f7ab7db7b97adf759faa8dbe15c5011468e290" +dependencies = [ + "cc", +] + +[[package]] +name = "lz4" +version = "1.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958b4caa893816eea05507c20cfe47574a43d9a697138a7872990bba8a0ece68" +dependencies = [ + "libc", + "lz4-sys", +] + +[[package]] +name = "lz4-sys" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "lzma-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" +dependencies = [ + "byteorder", + "crc 3.2.1", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matrixmultiply" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" +dependencies = [ + "autocfg", + "rawpointer", +] + +[[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.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minijinja" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf369fce3289017a63e514dfca10a0a6f1a02216b21b588b79f6a1081eb999f5" +dependencies = [ + "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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "log", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "mlua" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d111deb18a9c9bd33e1541309f4742523bfab01d276bfa9a27519f6de9c11dc7" +dependencies = [ + "bstr", + "erased-serde", + "libloading", + "mlua-sys", + "num-traits", + "once_cell", + "rustc-hash 2.0.0", + "serde", + "serde-value", +] + +[[package]] +name = "mlua-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab7a5b4756b8177a2dfa8e0bbcde63bd4000afbc4ab20cbb68d114a25470f29" +dependencies = [ + "cc", + "cfg-if", + "luau0-src", + "pkg-config", +] + +[[package]] +name = "mown" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7627d8bbeb17edbf1c3f74b21488e4af680040da89713b4217d0010e9cbd97e" + +[[package]] +name = "multiversion" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4851161a11d3ad0bf9402d90ffc3967bf231768bfd7aeb61755ad06dbf1a142" +dependencies = [ + "multiversion-macros", + "target-features", +] + +[[package]] +name = "multiversion-macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79a74ddee9e0c27d2578323c13905793e91622148f138ba29738f9dddb835e90" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "target-features", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ndarray" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "087ee1ca8a7c22830c2bba4a96ed8e72ce0968ae944349324d52522f66aa3944" +dependencies = [ + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "portable-atomic", + "portable-atomic-util", + "rawpointer", +] + +[[package]] +name = "newline-converter" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f" +dependencies = [ + "unicode-segmentation", +] + +[[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", + "libc", + "memoffset", +] + +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[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 = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + +[[package]] +name = "now" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d89e9874397a1f0a52fc1f197a8effd9735223cb2390e9dcc83ac6cd02923d0" +dependencies = [ + "chrono", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[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-cmp" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa" + +[[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-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[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 = "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", +] + +[[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.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "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.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]] +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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +dependencies = [ + "memchr", +] + +[[package]] +name = "odht" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a518809ac14b25b569624d0268eba1e88498f71615893dca57982bed7621abb" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ord_subset" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7ce14664caf5b27f5656ff727defd68ae1eb75ef3c4d95259361df1eb376bef" + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-float" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" +dependencies = [ + "num-traits", +] + +[[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 = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[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.3", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "parquet-format-safe" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1131c54b167dd4e4799ce762e1ab01549ebb94d5bdd13e6ec1b467491c378e1f" +dependencies = [ + "async-trait", + "futures", +] + +[[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.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 = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "pdatastructs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bdcb4943c3c68659690124771ffb2fd93b73900bd0fb47e934f7b8b2e6687fa" +dependencies = [ + "bytecount", + "fixedbitset", + "num-traits", + "rand", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_macros 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[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 2.0.72", +] + +[[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 = "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 = "planus" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1691dd09e82f428ce8d6310bd6d5da2557c82ff17694d2a32cad7242aea89f" +dependencies = [ + "array-init-cursor", +] + +[[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 = "polars" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "getrandom", + "polars-arrow", + "polars-core", + "polars-error", + "polars-io", + "polars-lazy", + "polars-ops", + "polars-parquet", + "polars-sql", + "polars-time", + "polars-utils", + "version_check", +] + +[[package]] +name = "polars-arrow" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "ahash 0.8.11", + "atoi", + "atoi_simd 0.15.6", + "avro-schema", + "bytemuck", + "chrono", + "chrono-tz 0.8.6", + "dyn-clone", + "either", + "ethnum", + "fast-float", + "futures", + "getrandom", + "hashbrown 0.14.5", + "itoa", + "itoap", + "lz4", + "multiversion", + "num-traits", + "parking_lot 0.12.3", + "polars-arrow-format", + "polars-error", + "polars-utils", + "ryu", + "serde", + "simdutf8", + "streaming-iterator", + "strength_reduce", + "version_check", + "zstd", +] + +[[package]] +name = "polars-arrow-format" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b0ef2474af9396b19025b189d96e992311e6a47f90c53cd998b36c4c64b84c" +dependencies = [ + "planus", + "serde", +] + +[[package]] +name = "polars-compute" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "bytemuck", + "either", + "num-traits", + "polars-arrow", + "polars-error", + "polars-utils", + "strength_reduce", + "version_check", +] + +[[package]] +name = "polars-core" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "ahash 0.8.11", + "bitflags 2.6.0", + "bytemuck", + "chrono", + "chrono-tz 0.8.6", + "comfy-table", + "either", + "hashbrown 0.14.5", + "indexmap", + "num-traits", + "once_cell", + "polars-arrow", + "polars-compute", + "polars-error", + "polars-row", + "polars-utils", + "rand", + "rand_distr", + "rayon", + "regex", + "serde", + "serde_json", + "smartstring", + "thiserror", + "version_check", + "xxhash-rust", +] + +[[package]] +name = "polars-error" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "avro-schema", + "polars-arrow-format", + "regex", + "simdutf8", + "thiserror", +] + +[[package]] +name = "polars-expr" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "ahash 0.8.11", + "bitflags 2.6.0", + "once_cell", + "polars-arrow", + "polars-core", + "polars-io", + "polars-ops", + "polars-plan", + "polars-time", + "polars-utils", + "rayon", + "smartstring", +] + +[[package]] +name = "polars-io" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "ahash 0.8.11", + "async-trait", + "atoi_simd 0.15.6", + "bytes", + "chrono", + "chrono-tz 0.8.6", + "fast-float", + "futures", + "glob", + "home", + "itoa", + "memchr", + "memmap2", + "num-traits", + "once_cell", + "percent-encoding", + "polars-arrow", + "polars-core", + "polars-error", + "polars-json", + "polars-parquet", + "polars-time", + "polars-utils", + "rayon", + "regex", + "ryu", + "serde", + "serde_json", + "simd-json", + "simdutf8", + "smartstring", + "tokio", + "tokio-util", +] + +[[package]] +name = "polars-json" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "ahash 0.8.11", + "chrono", + "chrono-tz 0.8.6", + "fallible-streaming-iterator", + "hashbrown 0.14.5", + "indexmap", + "itoa", + "num-traits", + "polars-arrow", + "polars-error", + "polars-utils", + "ryu", + "simd-json", + "streaming-iterator", +] + +[[package]] +name = "polars-lazy" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "ahash 0.8.11", + "bitflags 2.6.0", + "memchr", + "once_cell", + "polars-arrow", + "polars-core", + "polars-expr", + "polars-io", + "polars-json", + "polars-mem-engine", + "polars-ops", + "polars-pipe", + "polars-plan", + "polars-time", + "polars-utils", + "rayon", + "smartstring", + "version_check", +] + +[[package]] +name = "polars-mem-engine" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "memmap2", + "polars-arrow", + "polars-core", + "polars-error", + "polars-expr", + "polars-io", + "polars-json", + "polars-ops", + "polars-plan", + "polars-time", + "polars-utils", + "rayon", +] + +[[package]] +name = "polars-ops" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "ahash 0.8.11", + "argminmax", + "base64", + "bytemuck", + "chrono", + "chrono-tz 0.8.6", + "either", + "hashbrown 0.14.5", + "hex", + "indexmap", + "jsonpath_lib_polars_vendor", + "memchr", + "num-traits", + "polars-arrow", + "polars-compute", + "polars-core", + "polars-error", + "polars-json", + "polars-utils", + "rayon", + "regex", + "serde", + "serde_json", + "smartstring", + "unicode-reverse", + "version_check", +] + +[[package]] +name = "polars-parquet" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "ahash 0.8.11", + "async-stream", + "base64", + "brotli", + "bytemuck", + "ethnum", + "flate2", + "futures", + "lz4", + "num-traits", + "parquet-format-safe", + "polars-arrow", + "polars-compute", + "polars-error", + "polars-utils", + "serde", + "simdutf8", + "snap", + "streaming-decompression", + "zstd", +] + +[[package]] +name = "polars-pipe" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "crossbeam-channel", + "crossbeam-queue", + "enum_dispatch", + "hashbrown 0.14.5", + "num-traits", + "polars-arrow", + "polars-compute", + "polars-core", + "polars-expr", + "polars-io", + "polars-ops", + "polars-plan", + "polars-row", + "polars-utils", + "rayon", + "smartstring", + "uuid", + "version_check", +] + +[[package]] +name = "polars-plan" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "ahash 0.8.11", + "bitflags 2.6.0", + "bytemuck", + "chrono-tz 0.8.6", + "either", + "hashbrown 0.14.5", + "memmap2", + "once_cell", + "percent-encoding", + "polars-arrow", + "polars-core", + "polars-io", + "polars-json", + "polars-ops", + "polars-parquet", + "polars-time", + "polars-utils", + "rayon", + "recursive", + "regex", + "serde", + "smartstring", + "strum_macros 0.26.4", + "version_check", +] + +[[package]] +name = "polars-row" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "bytemuck", + "polars-arrow", + "polars-error", + "polars-utils", +] + +[[package]] +name = "polars-sql" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "hex", + "once_cell", + "polars-arrow", + "polars-core", + "polars-error", + "polars-lazy", + "polars-ops", + "polars-plan", + "polars-time", + "rand", + "serde", + "serde_json", + "sqlparser", +] + +[[package]] +name = "polars-time" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "atoi", + "bytemuck", + "chrono", + "chrono-tz 0.8.6", + "now", + "once_cell", + "polars-arrow", + "polars-core", + "polars-error", + "polars-ops", + "polars-utils", + "regex", + "serde", + "smartstring", +] + +[[package]] +name = "polars-utils" +version = "0.41.3" +source = "git+https://github.com/pola-rs/polars?rev=9dd9569#9dd9569249732af921d750608db7c84c7e46ec56" +dependencies = [ + "ahash 0.8.11", + "bytemuck", + "bytes", + "hashbrown 0.14.5", + "indexmap", + "memmap2", + "num-traits", + "once_cell", + "polars-error", + "raw-cpuid", + "rayon", + "smartstring", + "stacker", + "sysinfo", + "version_check", +] + +[[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", + "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 = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "portable-atomic-util" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcdd8420072e66d54a407b3316991fe946ce3ab1083a7f575b2463866624704d" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "postgres" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c9ec84ab55b0f9e418675de50052d494ba893fd28c65769a6e68fcdacbee2b8" +dependencies = [ + "bytes", + "fallible-iterator 0.2.0", + "futures-util", + "log", + "tokio", + "tokio-postgres", +] + +[[package]] +name = "postgres-protocol" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23" +dependencies = [ + "base64", + "byteorder", + "bytes", + "fallible-iterator 0.2.0", + "hmac", + "md-5", + "memchr", + "rand", + "sha2", + "stringprep", +] + +[[package]] +name = "postgres-types" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02048d9e032fb3cc3413bbf7b83a15d84a5d419778e2628751896d856498eee9" +dependencies = [ + "bytes", + "fallible-iterator 0.2.0", + "postgres-protocol", +] + +[[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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.72", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[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", + "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-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[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 = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + +[[package]] +name = "pyo3" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "once_cell", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "qsv" +version = "0.131.1" +dependencies = [ + "actix-governor", + "actix-web", + "ahash 0.8.11", + "anyhow", + "arboard", + "assert-json-diff", + "atoi_simd 0.16.0", + "base62", + "bincode", + "byteorder", + "bytes", + "cached", + "calamine", + "censor", + "chrono", + "chrono-tz 0.9.0", + "console", + "cpc", + "crossbeam-channel", + "csv", + "csv-diff", + "csv-index", + "csvs_convert", + "data-encoding", + "dotenvy", + "dynfmt", + "eudex", + "ext-sort", + "file-format", + "filetime", + "flate2", + "flexi_logger", + "futures", + "futures-util", + "gender_guesser", + "geosuggest-core", + "geosuggest-utils", + "governor", + "grex", + "gzp", + "hashbrown 0.14.5", + "indexmap", + "indicatif", + "itertools 0.13.0", + "itoa", + "jaq-interpret", + "jaq-parse", + "jemallocator", + "jql-runner", + "json-objects-to-csv", + "jsonschema", + "local-encoding", + "localzone", + "log", + "mimalloc", + "mlua", + "newline-converter", + "num_cpus", + "odht", + "parking_lot 0.12.3", + "phf 0.11.2", + "polars", + "postgres", + "pyo3", + "qsv-dateparser", + "qsv-sniffer", + "qsv-stats", + "qsv_currency", + "qsv_docopt", + "quickcheck", + "rand", + "rand_hc", + "rand_xoshiro", + "rayon", + "redis 0.26.1", + "regex", + "reqwest", + "rfd", + "rusqlite", + "rust_decimal", + "ryu", + "sanitize-filename", + "self_update", + "semver", + "serde", + "serde_json", + "serde_stacker", + "serde_urlencoded", + "serial_test", + "simdutf8", + "simple-expand-tilde", + "smartstring", + "snap", + "strsim", + "strum 0.26.3", + "strum_macros 0.26.4", + "sysinfo", + "tabwriter", + "tempfile", + "thousands", + "threadpool", + "titlecase", + "tokio", + "url", + "uuid", + "vader_sentiment", + "whatlang", + "xxhash-rust", +] + +[[package]] +name = "qsv-dateparser" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1e4144f1853fec6688ef12489dfcaced63f7b09cd234fa41bbe9d8f4a2bd84c" +dependencies = [ + "anyhow", + "chrono", + "regex", +] + +[[package]] +name = "qsv-sniffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c66171fd11b237cc1398ee258e708b2498d9463199a1592caf69ff0a6e9a375" +dependencies = [ + "bitflags 2.6.0", + "bytecount", + "csv", + "csv-core", + "hashbrown 0.14.5", + "memchr", + "qsv-dateparser", + "regex", + "simdutf8", + "tabwriter", +] + +[[package]] +name = "qsv-stats" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3f7d1793ba1e11749ed595824a853c5211054c8c2596eea21c5553c4441ee55" +dependencies = [ + "ahash 0.8.11", + "num-traits", + "rayon", + "serde", +] + +[[package]] +name = "qsv_currency" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e34b3032b7942a4217f388aeac39a8b2f2d50405d6e21185d06c3c45d1e4ca9e" +dependencies = [ + "num", + "serde", +] + +[[package]] +name = "qsv_docopt" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ea3daf409527575c5bc34b17a26d3006f042185a503f77652c58d591ddc0b96" +dependencies = [ + "ahash 0.8.11", + "regex", + "serde", + "strsim", +] + +[[package]] +name = "quanta" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", +] + +[[package]] +name = "quick-xml" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "encoding_rs", + "memchr", +] + +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "rand", +] + +[[package]] +name = "quinn" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls", + "socket2", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash 2.0.0", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +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.3", + "scheduled-thread-pool", +] + +[[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 = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "rand_hc" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b363d4f6370f88d62bf586c80405657bde0f0e1b8945d47d2ad59b906cb4f54" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core", +] + +[[package]] +name = "raw-cpuid" +version = "11.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[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 = "recursive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0786a43debb760f491b1bc0269fe5e84155353c67482b9e60d0cfb596054b43e" +dependencies = [ + "recursive-proc-macro-impl", + "stacker", +] + +[[package]] +name = "recursive-proc-macro-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" +dependencies = [ + "quote", + "syn 2.0.72", +] + +[[package]] +name = "redis" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d7a6955c7511f60f3ba9e86c6d02b3c3f144f8c24b288d1f4e18074ab8bbec" +dependencies = [ + "ahash 0.8.11", + "combine", + "itoa", + "percent-encoding", + "r2d2", + "ryu", + "sha1_smol", + "socket2", + "url", +] + +[[package]] +name = "redis" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e902a69d09078829137b4a5d9d082e0490393537badd7c91a3d69d14639e115f" +dependencies = [ + "ahash 0.8.11", + "arc-swap", + "combine", + "itoa", + "num-bigint", + "percent-encoding", + "ryu", + "url", +] + +[[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.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "ref-cast" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +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-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "async-compression", + "base64", + "bytes", + "cookie", + "cookie_store", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 1.1.0", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots", + "winreg", +] + +[[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 = "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 = "rkyv" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rle-decode-fast" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + +[[package]] +name = "rmp" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[package]] +name = "rusqlite" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +dependencies = [ + "bitflags 2.6.0", + "fallible-iterator 0.3.0", + "fallible-streaming-iterator", + "hashlink 0.9.1", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rust_decimal" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand", + "rkyv", + "serde", + "serde_json", +] + +[[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-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[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.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.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[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 = "sanitize-filename" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "scc" +version = "2.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ff467073ddaff34c3a39e5b454f25dd982484a26fff50254ca793c56a1b714" +dependencies = [ + "sdd", +] + +[[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.3", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sdd" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177258b64c0faaa9ffd3c65cd3262c2bc7e2588dbbd9c1641d0346145c1bbda8" + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "self-replace" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7828a58998685d8bf5a3c5e7a3379a5867289c20828c3ee436280b44b598515" +dependencies = [ + "fastrand 1.9.0", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "self_update" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469a3970061380c19852269f393e74c0fe607a4e23d85267382cf25486aa8de5" +dependencies = [ + "hyper", + "indicatif", + "log", + "quick-xml 0.23.1", + "regex", + "reqwest", + "self-replace", + "semver", + "serde_json", + "tempfile", + "urlencoding", + "zip", + "zipsign-api", +] + +[[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.205" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float 2.10.1", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.205" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "serde_json" +version = "1.0.122" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +dependencies = [ + "indexmap", + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "serde_stacker" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "babfccff5773ff80657f0ecf553c7c516bdc2eb16389c0918b36b73e7015276e" +dependencies = [ + "serde", + "stacker", +] + +[[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 = "serial_test" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +dependencies = [ + "fslock", + "futures", + "log", + "once_cell", + "parking_lot 0.12.3", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[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 = "sha1_smol" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + +[[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 = "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 = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simd-json" +version = "0.13.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" +dependencies = [ + "ahash 0.8.11", + "getrandom", + "halfbrown", + "lexical-core", + "once_cell", + "ref-cast", + "serde", + "serde_json", + "simdutf8", + "value-trait", +] + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "simple-expand-tilde" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faedb3ba93be480c554003ab3b52e20c738e4537d6acd92eec66ca5a96e5da14" +dependencies = [ + "simple-home-dir", +] + +[[package]] +name = "simple-home-dir" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee786d36d89b647cb282c7253385e4c563f363b83e6cdc5c2737724980a8a6a6" +dependencies = [ + "windows-sys 0.52.0", +] + +[[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 = "sled" +version = "0.34.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" +dependencies = [ + "crc32fast", + "crossbeam-epoch", + "crossbeam-utils", + "fs2", + "fxhash", + "libc", + "log", + "parking_lot 0.11.2", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "serde", + "static_assertions", + "version_check", +] + +[[package]] +name = "snafu" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b835cb902660db3415a672d862905e791e54d306c6e8189168c7f3d9ae1c79d" +dependencies = [ + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d1e02fca405f6280643174a50c942219f0bbf4dbf7d480f1dd864d6f211ae5" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + +[[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 = "sorted-vec" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6734caf0b6f51addd5eeacca12fb39b2c6c14e8d4f3ac42f3a78955c0467458" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +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 = "sqlparser" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" +dependencies = [ + "log", +] + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +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 = "streaming-decompression" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf6cc3b19bfb128a8ad11026086e31d3ce9ad23f8ea37354b31383a187c44cf3" +dependencies = [ + "fallible-streaming-iterator", +] + +[[package]] +name = "streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" + +[[package]] +name = "streaming-stats" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d670ce4e348a2081843569e0f79b21c99c91bb9028b3b3ecb0f050306de547" +dependencies = [ + "num-traits", +] + +[[package]] +name = "strength_reduce" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" + +[[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.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros 0.25.3", +] + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "phf 0.10.1", +] + +[[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.72", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.72", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[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.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + +[[package]] +name = "sysinfo" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4115055da5f572fff541dd0c4e61b0262977f453cc9fe04be83aba25a89bdab" +dependencies = [ + "core-foundation-sys", + "libc", + "memchr", + "ntapi", + "rayon", + "windows 0.57.0", +] + +[[package]] +name = "tabwriter" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a327282c4f64f6dc37e3bba4c2b6842cc3a992f204fa58d917696a89f691e5f6" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-features" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5" + +[[package]] +name = "target-lexicon" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "thousands" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[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 = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "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 = "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.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +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 = "titlecase" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0e20e744fbec1913fa168f3ffbef64324bbcb152c6cda8394baa79fa5ec9142" +dependencies = [ + "regex", +] + +[[package]] +name = "tokio" +version = "1.39.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot 0.12.3", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "tokio-postgres" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03adcf0147e203b6032c0b2d30be1415ba03bc348901f3ff1cc0df6a733e60c3" +dependencies = [ + "async-trait", + "byteorder", + "bytes", + "fallible-iterator 0.2.0", + "futures-channel", + "futures-util", + "log", + "parking_lot 0.12.3", + "percent-encoding", + "phf 0.11.2", + "pin-project-lite", + "postgres-protocol", + "postgres-types", + "rand", + "socket2", + "tokio", + "tokio-util", + "whoami", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "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_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" + +[[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 = "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 = [ + "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.72", +] + +[[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", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typed-builder" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06fbd5b8de54c5f7c91f6fe4cebb949be2125d7758e630bb58b1d831dbce600" +dependencies = [ + "typed-builder-macro", +] + +[[package]] +name = "typed-builder-macro" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ubyte" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f720def6ce1ee2fc44d40ac9ed6d3a59c361c80a75a7aa8e75bb9baed31cf2ea" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi", +] + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-ucd-category" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0" +dependencies = [ + "matches", + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.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-reverse" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6f4888ebc23094adfb574fdca9fdc891826287a6397d2cd28802ffd6f20c76" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[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 0.5.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", +] + +[[package]] +name = "vader_sentiment" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f79fb65bbfaf53d62afa05b1d162ff245cda71257d094e5d2de022fa5cff112" +dependencies = [ + "lazy_static", + "maplit", + "regex", + "unicase", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-trait" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" +dependencies = [ + "float-cmp", + "halfbrown", + "itoa", + "ryu", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[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 = "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 = "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.72", + "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.72", + "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-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "whatlang" +version = "0.16.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "471d1c1645d361eb782a1650b1786a8fb58dd625e681a04c09f5ff7c8764a7b0" +dependencies = [ + "hashbrown 0.14.5", + "once_cell", +] + +[[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 = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", + "web-sys", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +dependencies = [ + "windows-core 0.57.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[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.6", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +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", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "x11rb" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" +dependencies = [ + "gethostname", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[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 = "xlsxwriter" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133705957274c5c33ad516ce6091b2776e9f211f94fdc0de7e32be3595f64c7e" +dependencies = [ + "chrono", + "libxlsxwriter-sys", +] + +[[package]] +name = "xxhash-rust" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" + +[[package]] +name = "zbus" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.72", + "zvariant_utils", +] + +[[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", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "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 2.0.72", +] + +[[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.72", +] + +[[package]] +name = "zip" +version = "2.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" +dependencies = [ + "aes", + "arbitrary", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "deflate64", + "displaydoc", + "flate2", + "hmac", + "indexmap", + "lzma-rs", + "memchr", + "pbkdf2", + "rand", + "sha1", + "thiserror", + "time", + "zeroize", + "zopfli", + "zstd", +] + +[[package]] +name = "zipsign-api" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6413a546ada9dbcd0b9a3e0b0880581279e35047bce9797e523b3408e1df607c" +dependencies = [ + "ed25519-dalek", + "thiserror", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", +] + +[[package]] +name = "zstd" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.13+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "zvariant" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.72", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix new file mode 100644 index 000000000000..ba0280c19bd8 --- /dev/null +++ b/pkgs/by-name/qs/qsv/package.nix @@ -0,0 +1,118 @@ +{ + darwin, + fetchFromGitHub, + file, + lib, + pkg-config, + rustPlatform, + sqlite, + stdenv, + zstd, +}: + +let + pname = "qsv"; + version = "0.131.1"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "jqnatividad"; + repo = "qsv"; + rev = version; + hash = "sha256-erXMDZBkOPnZdhhjnUTiS0eCuFo1v5sNhLn8o7QN/5g="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "calamine-0.25.0" = "sha256-LFQahQ+SfGWhp5Kfs7AJCj4zyxWiz099pwVuQucCF00="; + "dynfmt-0.1.5" = "sha256-/SrNOOQJW3XFZOPL/mzdOBppVCaJNNyGBuJumQGx6sA="; + "grex-1.4.5" = "sha256-4Tr5L87HuiUW8tJdqr4oT1yQXviU7XtDrKY7iYNcwbo="; + "local-encoding-0.2.0" = "sha256-ThXYKr3u/n2kvINcyobB2Ayex2sNbJEOyyjZH993Z4U="; + "polars-0.41.3" = "sha256-8xkcJgfKo7BzeBnR6XVdbcH9ZY9Kh4dcGFMmyA5LuQg="; + }; + }; + + buildInputs = + [ + file + sqlite + zstd + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + CoreFoundation + CoreGraphics + IOKit + Security + SystemConfiguration + ] + ); + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildFeatures = [ + "apply" + "feature_capable" + "fetch" + "foreach" + "geocode" + "to" + ]; + + checkFeatures = [ + "apply" + "feature_capable" + "fetch" + "foreach" + "geocode" + ]; + + checkFlags = [ + # Skip tests that require network access. + "--skip test_fetch" + "--skip test_geocode" + "--skip cmd::validate::test_load_json_via_url" + "--skip test_describegpt::describegpt_invalid_api_key" + "--skip test_sample::sample_seed_url" + "--skip test_snappy::snappy_decompress_url" + "--skip test_sniff::sniff_justmime_remote" + "--skip test_sniff::sniff_url_notcsv" + "--skip test_sniff::sniff_url_snappy" + "--skip test_sniff::sniff_url_snappy_noinfer" + "--skip test_validate::validate_adur_public_toilets_dataset_with_json_schema_url" + # Skip test that uses sh. + "--skip test_foreach::foreach_multiple_commands_with_shell_script" + # Skip features that aren't enabled. + "--skip test_luau" + # Skip tests that return the wrong datetime in CI. + "--skip test_stats::stats_cache_negative_threshold" + "--skip test_stats::stats_cache_negative_threshold_five" + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + meta = { + description = "CSVs sliced, diced & analyzed"; + homepage = "https://github.com/jqnatividad/qsv"; + changelog = "https://github.com/jqnatividad/qsv/blob/${version}/CHANGELOG.md"; + license = with lib.licenses; [ + mit + # or + unlicense + ]; + maintainers = with lib.maintainers; [ + detroyejr + uncenter + ]; + }; +} diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index 5e79bb7ae9b8..e31e4c0354a2 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rasm"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; rev = "v${version}"; - hash = "sha256-m2XRi9RF089dBpkwcu/zgmd3XnBF4uJU5B4ec4WJ36I="; + hash = "sha256-DX+i9G+HK0Iek6qmsYQFbieHUtRazKkcyv+gYQ748X0="; }; # by default the EXEC variable contains `rasm.exe` diff --git a/pkgs/by-name/ra/ratchet/package.nix b/pkgs/by-name/ra/ratchet/package.nix index a613bea272aa..6d94200fcc9c 100644 --- a/pkgs/by-name/ra/ratchet/package.nix +++ b/pkgs/by-name/ra/ratchet/package.nix @@ -35,7 +35,7 @@ buildGoModule rec { [ "-s" "-w" - "-X ${package_url}/internal/version.name=${pname}" + "-X ${package_url}/internal/version.name=ratchet" "-X ${package_url}/internal/version.version=${version}" "-X ${package_url}/internal/version.commit=${src.rev}" ]; diff --git a/pkgs/by-name/re/read-it-later/package.nix b/pkgs/by-name/re/read-it-later/package.nix index 397d03a13e13..d25117c00b4c 100644 --- a/pkgs/by-name/re/read-it-later/package.nix +++ b/pkgs/by-name/re/read-it-later/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; - repo = pname; + repo = "read-it-later"; rev = version; hash = "sha256-A8u1fecJAsVlordgZmUJt/KZWxx6EWMhfdayKWHTTFY="; }; diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix index ae93928bc0ae..503358c565ed 100644 --- a/pkgs/by-name/re/rectangle/package.nix +++ b/pkgs/by-name/re/rectangle/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.81"; + version = "0.82"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-oZZz6bsgG+4leQNq2C+nLaAO/Yk+OkS6BnlMQHjlK9E="; + hash = "sha256-Uwo98Mf7Ce6vbRRoNSsxtJh1zS5/p8Sicd/vcjczmVk="; }; sourceRoot = "."; diff --git a/pkgs/by-name/re/recyclarr/001-Git-Version.patch b/pkgs/by-name/re/recyclarr/001-Git-Version.patch new file mode 100644 index 000000000000..2d43e0124a52 --- /dev/null +++ b/pkgs/by-name/re/recyclarr/001-Git-Version.patch @@ -0,0 +1,14 @@ +diff --git a/Directory.Build.props b/Directory.Build.props +index af8e3b12..07dd1898 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -9,7 +9,7 @@ + $(MSBuildThisFileDirectory) + $(RepositoryRoot)tests\ + $(RepositoryRoot) +- ++ true + + +