diff options
958 files changed, 24220 insertions, 44276 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7bca80f5af88c..a206164d66850 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -116,7 +116,6 @@ /maintainers/scripts/update-python-libraries @FRidh /pkgs/development/interpreters/python @FRidh /doc/languages-frameworks/python.section.md @FRidh @mweinelt -/pkgs/development/tools/poetry2nix @adisbladis /pkgs/development/interpreters/python/hooks @FRidh @jonringer # Haskell @@ -149,6 +148,8 @@ # C compilers /pkgs/development/compilers/gcc @amjoseph-nixpkgs /pkgs/development/compilers/llvm @RaitoBezarius +/pkgs/development/compilers/emscripten @raitobezarius +/doc/languages-frameworks/emscripten.section.md @raitobezarius # Audio /nixos/modules/services/audio/botamusique.nix @mweinelt diff --git a/.github/ISSUE_TEMPLATE/unreproducible_package.md b/.github/ISSUE_TEMPLATE/unreproducible_package.md index a868c26ca54b8..13988026f8d76 100644 --- a/.github/ISSUE_TEMPLATE/unreproducible_package.md +++ b/.github/ISSUE_TEMPLATE/unreproducible_package.md @@ -14,10 +14,10 @@ Fixing bit-by-bit reproducibility also has additional advantages, such as avoidi ### Steps To Reproduce ``` -nix-build '<nixpkgs>' -A ... --check --keep-failed +nix-build '<nixpkgs>' -A ... && nix-build '<nixpkgs>' -A ... --check --keep-failed ``` -You can use `diffoscope` to analyze the differences in the output of the two builds. +If this command completes successfully, no differences where found. However, when it ends in `error: derivation '<X>' may not be deterministic: output '<Y>' differs from '<Z>'`, you can use `diffoscope <Y> <Z>` to analyze the differences in the output of the two builds. To view the build log of the build that produced the artifact in the binary cache: diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index ba7b1b1901285..c99b46097e9f4 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -243,21 +243,21 @@ or *** ``` -## `fetchFromBittorrent` {#fetchfrombittorrent} +## `fetchtorrent` {#fetchtorrent} -`fetchFromBittorrent` expects two arguments. `url` which can either be a Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. It can also take a `config` argument which will craft a `settings.json` configuration file and give it to `transmission`, the underlying program that is performing the fetch. The available config options for `transmission` can be found [here](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options) +`fetchtorrent` expects two arguments. `url` which can either be a Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. It can also take a `config` argument which will craft a `settings.json` configuration file and give it to `transmission`, the underlying program that is performing the fetch. The available config options for `transmission` can be found [here](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options) ``` -{ fetchFromBittorrent }: +{ fetchtorrent }: -fetchFromBittorrent { +fetchtorrent { config = { peer-limit-global = 100; }; url = "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c"; sha256 = ""; } ``` -### Parameters {#fetchfrombittorrent-parameters} +### Parameters {#fetchtorrent-parameters} - `url`: Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. diff --git a/doc/languages-frameworks/emscripten.section.md b/doc/languages-frameworks/emscripten.section.md index 5f93dd5ff3159..20d358f2e9e3f 100644 --- a/doc/languages-frameworks/emscripten.section.md +++ b/doc/languages-frameworks/emscripten.section.md @@ -2,168 +2,159 @@ [Emscripten](https://github.com/kripken/emscripten): An LLVM-to-JavaScript Compiler -This section of the manual covers how to use `emscripten` in nixpkgs. +If you want to work with `emcc`, `emconfigure` and `emmake` as you are used to from Ubuntu and similar distributions, -Minimal requirements: - -* nix -* nixpkgs - -Modes of use of `emscripten`: - -* **Imperative usage** (on the command line): - - If you want to work with `emcc`, `emconfigure` and `emmake` as you are used to from Ubuntu and similar distributions you can use these commands: - - * `nix-env -f "<nixpkgs>" -iA emscripten` - * `nix-shell -p emscripten` - -* **Declarative usage**: - - This mode is far more power full since this makes use of `nix` for dependency management of emscripten libraries and targets by using the `mkDerivation` which is implemented by `pkgs.emscriptenStdenv` and `pkgs.buildEmscriptenPackage`. The source for the packages is in `pkgs/top-level/emscripten-packages.nix` and the abstraction behind it in `pkgs/development/em-modules/generic/default.nix`. From the root of the nixpkgs repository: - * build and install all packages: - * `nix-env -iA emscriptenPackages` - - * dev-shell for zlib implementation hacking: - * `nix-shell -A emscriptenPackages.zlib` - -## Imperative usage {#imperative-usage} +```console +nix-shell -p emscripten +``` A few things to note: * `export EMCC_DEBUG=2` is nice for debugging -* `~/.emscripten`, the build artifact cache sometimes creates issues and needs to be removed from time to time +* The build artifact cache in `~/.emscripten` sometimes creates issues and needs to be removed from time to time -## Declarative usage {#declarative-usage} +## Examples {#declarative-usage} Let's see two different examples from `pkgs/top-level/emscripten-packages.nix`: * `pkgs.zlib.override` * `pkgs.buildEmscriptenPackage` -Both are interesting concepts. - -A special requirement of the `pkgs.buildEmscriptenPackage` is the `doCheck = true` is a default meaning that each emscriptenPackage requires a `checkPhase` implemented. - -* Use `export EMCC_DEBUG=2` from within a emscriptenPackage's `phase` to get more detailed debug output what is going wrong. -* ~/.emscripten cache is requiring us to set `HOME=$TMPDIR` in individual phases. This makes compilation slower but also makes it more deterministic. - -### Usage 1: pkgs.zlib.override {#usage-1-pkgs.zlib.override} - -This example uses `zlib` from nixpkgs but instead of compiling **C** to **ELF** it compiles **C** to **JS** since we were using `pkgs.zlib.override` and changed stdenv to `pkgs.emscriptenStdenv`. A few adaptions and hacks were set in place to make it working. One advantage is that when `pkgs.zlib` is updated, it will automatically update this package as well. However, this can also be the downside... - -See the `zlib` example: - - zlib = (pkgs.zlib.override { - stdenv = pkgs.emscriptenStdenv; - }).overrideAttrs - (old: rec { - buildInputs = old.buildInputs ++ [ pkg-config ]; - # we need to reset this setting! - env = (old.env or { }) // { NIX_CFLAGS_COMPILE = ""; }; - configurePhase = '' - # FIXME: Some tests require writing at $HOME - HOME=$TMPDIR - runHook preConfigure - - #export EMCC_DEBUG=2 - emconfigure ./configure --prefix=$out --shared - - runHook postConfigure - ''; - dontStrip = true; - outputs = [ "out" ]; - buildPhase = '' - emmake make - ''; - installPhase = '' - emmake make install - ''; - checkPhase = '' - echo "================= testing zlib using node =================" - - echo "Compiling a custom test" - set -x - emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \ - libz.so.${old.version} -I . -o example.js - - echo "Using node to execute the test" - ${pkgs.nodejs}/bin/node ./example.js - - set +x - if [ $? -ne 0 ]; then - echo "test failed for some reason" - exit 1; - else - echo "it seems to work! very good." - fi - echo "================= /testing zlib using node =================" - ''; - - postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' - substituteInPlace configure \ - --replace '/usr/bin/libtool' 'ar' \ - --replace 'AR="libtool"' 'AR="ar"' \ - --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' - ''; - }); - -### Usage 2: pkgs.buildEmscriptenPackage {#usage-2-pkgs.buildemscriptenpackage} - -This `xmlmirror` example features a emscriptenPackage which is defined completely from this context and no `pkgs.zlib.override` is used. - - xmlmirror = pkgs.buildEmscriptenPackage rec { - name = "xmlmirror"; - - buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; - nativeBuildInputs = [ pkg-config zlib ]; - - src = pkgs.fetchgit { - url = "https://gitlab.com/odfplugfest/xmlmirror.git"; - rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd"; - hash = "sha256-i+QgY+5PYVg5pwhzcDnkfXAznBg3e8sWH2jZtixuWsk="; - }; - - configurePhase = '' - rm -f fastXmlLint.js* - # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728 - # https://gitlab.com/odfplugfest/xmlmirror/issues/8 - sed -e "s/TOTAL_MEMORY=234217728/TOTAL_MEMORY=268435456/g" -i Makefile.emEnv - # https://github.com/kripken/emscripten/issues/6344 - # https://gitlab.com/odfplugfest/xmlmirror/issues/9 - sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv - # https://gitlab.com/odfplugfest/xmlmirror/issues/11 - sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv - ''; - - buildPhase = '' - HOME=$TMPDIR - make -f Makefile.emEnv - ''; - - outputs = [ "out" "doc" ]; - - installPhase = '' - mkdir -p $out/share - mkdir -p $doc/share/${name} - - cp Demo* $out/share - cp -R codemirror-5.12 $out/share - cp fastXmlLint.js* $out/share - cp *.xsd $out/share - cp *.js $out/share - cp *.xhtml $out/share - cp *.html $out/share - cp *.json $out/share - cp *.rng $out/share - cp README.md $doc/share/${name} - ''; - checkPhase = '' - - ''; - }; - -### Declarative debugging {#declarative-debugging} +A special requirement of the `pkgs.buildEmscriptenPackage` is the `doCheck = true`. +This means each Emscripten package requires that a [`checkPhase`](#ssec-check-phase) is implemented. + +* Use `export EMCC_DEBUG=2` from within a phase to get more detailed debug output what is going wrong. +* The cache at `~/.emscripten` requires to set `HOME=$TMPDIR` in individual phases. + This makes compilation slower but also more deterministic. + +::: {.example #usage-1-pkgs.zlib.override} + +# Using `pkgs.zlib.override {}` + +This example uses `zlib` from Nixpkgs, but instead of compiling **C** to **ELF** it compiles **C** to **JavaScript** since we were using `pkgs.zlib.override` and changed `stdenv` to `pkgs.emscriptenStdenv`. + +A few adaptions and hacks were put in place to make it work. +One advantage is that when `pkgs.zlib` is updated, it will automatically update this package as well. + + +```nix +(pkgs.zlib.override { + stdenv = pkgs.emscriptenStdenv; +}).overrideAttrs +(old: rec { + buildInputs = old.buildInputs ++ [ pkg-config ]; + # we need to reset this setting! + env = (old.env or { }) // { NIX_CFLAGS_COMPILE = ""; }; + configurePhase = '' + # FIXME: Some tests require writing at $HOME + HOME=$TMPDIR + runHook preConfigure + + #export EMCC_DEBUG=2 + emconfigure ./configure --prefix=$out --shared + + runHook postConfigure + ''; + dontStrip = true; + outputs = [ "out" ]; + buildPhase = '' + emmake make + ''; + installPhase = '' + emmake make install + ''; + checkPhase = '' + echo "================= testing zlib using node =================" + + echo "Compiling a custom test" + set -x + emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \ + libz.so.${old.version} -I . -o example.js + + echo "Using node to execute the test" + ${pkgs.nodejs}/bin/node ./example.js + + set +x + if [ $? -ne 0 ]; then + echo "test failed for some reason" + exit 1; + else + echo "it seems to work! very good." + fi + echo "================= /testing zlib using node =================" + ''; + + postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' + substituteInPlace configure \ + --replace '/usr/bin/libtool' 'ar' \ + --replace 'AR="libtool"' 'AR="ar"' \ + --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' + ''; +}) +``` + +:::{.example #usage-2-pkgs.buildemscriptenpackage} + +# Using `pkgs.buildEmscriptenPackage {}` + +This `xmlmirror` example features an Emscripten package that is defined completely from this context and no `pkgs.zlib.override` is used. + +```nix +pkgs.buildEmscriptenPackage rec { + name = "xmlmirror"; + + buildInputs = [ pkg-config autoconf automake libtool gnumake libxml2 nodejs openjdk json_c ]; + nativeBuildInputs = [ pkg-config zlib ]; + + src = pkgs.fetchgit { + url = "https://gitlab.com/odfplugfest/xmlmirror.git"; + rev = "4fd7e86f7c9526b8f4c1733e5c8b45175860a8fd"; + hash = "sha256-i+QgY+5PYVg5pwhzcDnkfXAznBg3e8sWH2jZtixuWsk="; + }; + + configurePhase = '' + rm -f fastXmlLint.js* + # a fix for ERROR:root:For asm.js, TOTAL_MEMORY must be a multiple of 16MB, was 234217728 + # https://gitlab.com/odfplugfest/xmlmirror/issues/8 + sed -e "s/TOTAL_MEMORY=234217728/TOTAL_MEMORY=268435456/g" -i Makefile.emEnv + # https://github.com/kripken/emscripten/issues/6344 + # https://gitlab.com/odfplugfest/xmlmirror/issues/9 + sed -e "s/\$(JSONC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(LIBXML20_LDFLAGS)/\$(JSONC_LDFLAGS) \$(LIBXML20_LDFLAGS) \$(ZLIB_LDFLAGS) /g" -i Makefile.emEnv + # https://gitlab.com/odfplugfest/xmlmirror/issues/11 + sed -e "s/-o fastXmlLint.js/-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' -o fastXmlLint.js/g" -i Makefile.emEnv + ''; + + buildPhase = '' + HOME=$TMPDIR + make -f Makefile.emEnv + ''; + + outputs = [ "out" "doc" ]; + + installPhase = '' + mkdir -p $out/share + mkdir -p $doc/share/${name} + + cp Demo* $out/share + cp -R codemirror-5.12 $out/share + cp fastXmlLint.js* $out/share + cp *.xsd $out/share + cp *.js $out/share + cp *.xhtml $out/share + cp *.html $out/share + cp *.json $out/share + cp *.rng $out/share + cp README.md $doc/share/${name} + ''; + checkPhase = '' + + ''; +} +``` + +::: + +## Debugging {#declarative-debugging} Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from there you can go trough the individual steps. This makes it easy to build a good `unit test` or list the files of the project. @@ -174,9 +165,3 @@ Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from 5. `configurePhase` 6. `buildPhase` 7. ... happy hacking... - -## Summary {#summary} - -Using this toolchain makes it easy to leverage `nix` from NixOS, MacOSX or even Windows (WSL+ubuntu+nix). This toolchain is reproducible, behaves like the rest of the packages from nixpkgs and contains a set of well working examples to learn and adapt from. - -If in trouble, ask the maintainers. diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index c5049326a776f..310ea88a86d55 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -134,11 +134,11 @@ The site proposes two types of packages, the `rockspec` and the `src.rock` Luarocks-based packages are generated in [pkgs/development/lua-modules/generated-packages.nix](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/lua-modules/generated-packages.nix) from the whitelist maintainers/scripts/luarocks-packages.csv and updated by running -the script -[maintainers/scripts/update-luarocks-packages](https://github.com/NixOS/nixpkgs/tree/master/maintainers/scripts/update-luarocks-packages): +the package `luarocks-packages-updater`: ```sh -./maintainers/scripts/update-luarocks-packages update + +nix-shell -p luarocks-packages-updater --run luarocks-packages-updater ``` [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock). diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index 2d52a8cb410b1..76b95c6ae471b 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -424,7 +424,7 @@ rec { # Filter suited when there's some files # This can't be used for when there's no files, because the base directory is always included nonEmpty = - path: _: + path: type: let # Add a slash to the path string, turning "/foo" to "/foo/", # making sure to not have any false prefix matches below. @@ -433,25 +433,37 @@ rec { # meaning this function can never receive "/" as an argument pathSlash = path + "/"; in - # Same as `hasPrefix pathSlash baseString`, but more efficient. - # With base /foo/bar we need to include /foo: - # hasPrefix "/foo/" "/foo/bar/" - if substring 0 (stringLength pathSlash) baseString == pathSlash then - true - # Same as `! hasPrefix baseString pathSlash`, but more efficient. - # With base /foo/bar we need to exclude /baz - # ! hasPrefix "/baz/" "/foo/bar/" - else if substring 0 baseLength pathSlash != baseString then - false - else - # Same as `removePrefix baseString path`, but more efficient. - # From the above code we know that hasPrefix baseString pathSlash holds, so this is safe. - # We don't use pathSlash here because we only needed the trailing slash for the prefix matching. - # With base /foo and path /foo/bar/baz this gives - # inTree (split "/" (removePrefix "/foo/" "/foo/bar/baz")) - # == inTree (split "/" "bar/baz") - # == inTree [ "bar" "baz" ] - inTree (split "/" (substring baseLength (-1) path)); + ( + # Same as `hasPrefix pathSlash baseString`, but more efficient. + # With base /foo/bar we need to include /foo: + # hasPrefix "/foo/" "/foo/bar/" + if substring 0 (stringLength pathSlash) baseString == pathSlash then + true + # Same as `! hasPrefix baseString pathSlash`, but more efficient. + # With base /foo/bar we need to exclude /baz + # ! hasPrefix "/baz/" "/foo/bar/" + else if substring 0 baseLength pathSlash != baseString then + false + else + # Same as `removePrefix baseString path`, but more efficient. + # From the above code we know that hasPrefix baseString pathSlash holds, so this is safe. + # We don't use pathSlash here because we only needed the trailing slash for the prefix matching. + # With base /foo and path /foo/bar/baz this gives + # inTree (split "/" (removePrefix "/foo/" "/foo/bar/baz")) + # == inTree (split "/" "bar/baz") + # == inTree [ "bar" "baz" ] + inTree (split "/" (substring baseLength (-1) path)) + ) + # This is a way have an additional check in case the above is true without any significant performance cost + && ( + # This relies on the fact that Nix only distinguishes path types "directory", "regular", "symlink" and "unknown", + # so everything except "unknown" is allowed, seems reasonable to rely on that + type != "unknown" + || throw '' + lib.fileset.toSource: `fileset` contains a file that cannot be added to the store: ${path} + This file is neither a regular file nor a symlink, the only file types supported by the Nix store. + Therefore the file set cannot be added to the Nix store as is. Make sure to not include that file to avoid this error.'' + ); in # Special case because the code below assumes that the _internalBase is always included in the result # which shouldn't be done when we have no files at all in the base diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh index d8d8dd4131894..5b756b8fc5931 100755 --- a/lib/fileset/tests.sh +++ b/lib/fileset/tests.sh @@ -332,7 +332,7 @@ expectFailure 'with ((import <nixpkgs/lib>).extend (import <nixpkgs/lib/fileset/ \s*`root`: root "'"$work"'/foo/mock-root" \s*`fileset`: root "'"$work"'/bar/mock-root" \s*Different roots are not supported.' -rm -rf * +rm -rf -- * # `root` needs to exist expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: `root` \('"$work"'/a\) does not exist.' @@ -342,7 +342,7 @@ touch a expectFailure 'toSource { root = ./a; fileset = ./a; }' 'lib.fileset.toSource: `root` \('"$work"'/a\) is a file, but it should be a directory instead. Potential solutions: \s*- If you want to import the file into the store _without_ a containing directory, use string interpolation or `builtins.path` instead of this function. \s*- If you want to import the file into the store _with_ a containing directory, set `root` to the containing directory, such as '"$work"', and set `fileset` to the file path.' -rm -rf * +rm -rf -- * # The fileset argument should be evaluated, even if the directory is empty expectFailure 'toSource { root = ./.; fileset = abort "This should be evaluated"; }' 'evaluation aborted with the following error message: '\''This should be evaluated'\' @@ -352,7 +352,14 @@ mkdir a expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: `fileset` could contain files in '"$work"', which is not under the `root` \('"$work"'/a\). Potential solutions: \s*- Set `root` to '"$work"' or any directory higher up. This changes the layout of the resulting store path. \s*- Set `fileset` to a file set that cannot contain files outside the `root` \('"$work"'/a\). This could change the files included in the result.' -rm -rf * +rm -rf -- * + +# non-regular and non-symlink files cannot be added to the Nix store +mkfifo a +expectFailure 'toSource { root = ./.; fileset = ./a; }' 'lib.fileset.toSource: `fileset` contains a file that cannot be added to the store: '"$work"'/a +\s*This file is neither a regular file nor a symlink, the only file types supported by the Nix store. +\s*Therefore the file set cannot be added to the Nix store as is. Make sure to not include that file to avoid this error.' +rm -rf -- * # Path coercion only works for paths expectFailure 'toSource { root = ./.; fileset = 10; }' 'lib.fileset.toSource: `fileset` is of type int, but it should be a file set or a path instead.' @@ -493,7 +500,7 @@ expectFailure 'with ((import <nixpkgs/lib>).extend (import <nixpkgs/lib/fileset/ \s*element 0: root "'"$work"'/foo/mock-root" \s*element 1: root "'"$work"'/bar/mock-root" \s*Different roots are not supported.' -rm -rf * +rm -rf -- * # Coercion errors show the correct context expectFailure 'toSource { root = ./.; fileset = union ./a ./.; }' 'lib.fileset.union: first argument \('"$work"'/a\) does not exist.' diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bb0f7c67a917a..a9dcb0b64e471 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1386,6 +1386,12 @@ githubId = 59743220; name = "Vinícius Müller"; }; + arcuru = { + email = "patrick@jackson.dev"; + github = "arcuru"; + githubId = 160646; + name = "Patrick Jackson"; + }; ardumont = { email = "eniotna.t@gmail.com"; github = "ardumont"; @@ -1765,12 +1771,6 @@ githubId = 1217745; name = "Aldwin Vlasblom"; }; - aveltras = { - email = "romain.viallard@outlook.fr"; - github = "aveltras"; - githubId = 790607; - name = "Romain Viallard"; - }; averelld = { email = "averell+nixos@rxd4.com"; github = "averelld"; @@ -2763,6 +2763,12 @@ githubId = 7435854; name = "Victor Calvert"; }; + camelpunch = { + email = "me@andrewbruce.net"; + github = "camelpunch"; + githubId = 141733; + name = "Andrew Bruce"; + }; cameronfyfe = { email = "cameron.j.fyfe@gmail.com"; github = "cameronfyfe"; @@ -3674,6 +3680,15 @@ fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; }]; }; + Cryolitia = { + name = "Beiyan Cryolitia"; + email = "Cryolitia@gmail.com"; + github = "Cryolitia"; + githubId = 23723294; + keys = [{ + fingerprint = "1C3C 6547 538D 7152 310C 0EEA 84DD 0C01 30A5 4DF7"; + }]; + }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; @@ -7454,6 +7469,12 @@ githubId = 25505957; name = "Ilian"; }; + iliayar = { + email = "iliayar3@gmail.com"; + github = "iliayar"; + githubId = 17529355; + name = "Ilya Yaroshevskiy"; + }; ilikeavocadoes = { email = "ilikeavocadoes@hush.com"; github = "ilikeavocadoes"; @@ -7866,6 +7887,12 @@ githubId = 2212681; name = "Jakub Grzgorz Sokołowski"; }; + jakuzure = { + email = "shin@posteo.jp"; + github = "jakuzure"; + githubId = 11823547; + name = "jakuzure"; + }; jali-clarke = { email = "jinnah.ali-clarke@outlook.com"; name = "Jinnah Ali-Clarke"; @@ -9770,6 +9797,11 @@ }]; name = "Joseph LaFreniere"; }; + lagoja = { + github = "Lagoja"; + githubId =750845; + name = "John Lago"; + }; laikq = { email = "gwen@quasebarth.de"; github = "laikq"; @@ -12085,6 +12117,16 @@ githubId = 839693; name = "Ingolf Wanger"; }; + msanft = { + email = "moritz.sanft@outlook.de"; + matrix = "@msanft:matrix.org"; + name = "Moritz Sanft"; + github = "msanft"; + githubId = 58110325; + keys = [{ + fingerprint = "3CAC 1D21 3D97 88FF 149A E116 BB8B 30F5 A024 C31C"; + }]; + }; mschristiansen = { email = "mikkel@rheosystems.com"; github = "mschristiansen"; @@ -13297,6 +13339,15 @@ githubId = 75299; name = "Malcolm Matalka"; }; + orhun = { + email = "orhunparmaksiz@gmail.com"; + github = "orhun"; + githubId = 24392180; + name = "Orhun Parmaksız"; + keys = [{ + fingerprint = "165E 0FF7 C48C 226E 1EC3 63A7 F834 2482 4B3E 4B90"; + }]; + }; orichter = { email = "richter-oliver@gmx.net"; github = "ORichterSec"; @@ -13541,12 +13592,6 @@ githubId = 6931743; name = "pasqui23"; }; - patricksjackson = { - email = "patrick@jackson.dev"; - github = "patricksjackson"; - githubId = 160646; - name = "Patrick Jackson"; - }; patryk27 = { email = "pwychowaniec@pm.me"; github = "Patryk27"; @@ -13568,6 +13613,11 @@ githubId = 15645854; name = "Brad Christensen"; }; + paumr = { + github = "paumr"; + name = "Michael Bergmeister"; + githubId = 53442728; + }; paveloom = { email = "paveloom@riseup.net"; github = "paveloom"; @@ -13629,6 +13679,7 @@ pbsds = { name = "Peder Bergebakken Sundt"; email = "pbsds@hotmail.com"; + matrix = "@pederbs:pvv.ntnu.no"; github = "pbsds"; githubId = 140964; }; @@ -19518,6 +19569,12 @@ fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; }]; }; + yunfachi = { + email = "yunfachi@gmail.com"; + github = "yunfachi"; + githubId = 73419713; + name = "Yunfachi"; + }; yureien = { email = "contact@sohamsen.me"; github = "Yureien"; diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 52e9af399709b..44a445875d918 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -468,6 +468,7 @@ class Editor: "--input-names", "-i", dest="input_file", + type=Path, default=self.default_in, help="A list of plugins in the form owner/repo", ) @@ -476,6 +477,7 @@ class Editor: "-o", dest="outfile", default=self.default_out, + type=Path, help="Filename to save generated nix code", ) common.add_argument( @@ -787,10 +789,17 @@ def update_plugins(editor: Editor, args): if autocommit: from datetime import date - editor.nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) - updated = date.today().strftime('%m-%d-%Y') - commit(editor.nixpkgs_repo, f"{editor.attr_path}: updated the {updated}", [args.outfile]) + try: + repo = git.Repo(os.getcwd()) + updated = date.today().strftime('%m-%d-%Y') + print(args.outfile) + commit(repo, + f"{editor.attr_path}: updated the {updated}", [args.outfile] + ) + except git.InvalidGitRepositoryError as e: + print(f"Not in a git repository: {e}", file=sys.stderr) + sys.exit(1) if redirects: update() diff --git a/maintainers/scripts/update-luarocks-shell.nix b/maintainers/scripts/update-luarocks-shell.nix deleted file mode 100644 index 346b0319b08c9..0000000000000 --- a/maintainers/scripts/update-luarocks-shell.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ nixpkgs ? import ../.. { } -}: -with nixpkgs; -let - pyEnv = python3.withPackages(ps: [ ps.gitpython ]); -in -mkShell { - packages = [ - pyEnv - luarocks-nix - nix-prefetch-scripts - ]; -} diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index f8dbd637d77f6..5a205f3cb22ee 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -430,6 +430,7 @@ with lib.maintainers; { members = [ cleeyv ryantm + lassulus ]; scope = "Maintain Jitsi."; shortName = "Jitsi"; @@ -931,7 +932,6 @@ with lib.maintainers; { wdz = { members = [ n0emis - netali vidister johannwagner yuka diff --git a/nixos/doc/manual/development/non-switchable-systems.section.md b/nixos/doc/manual/development/non-switchable-systems.section.md new file mode 100644 index 0000000000000..87bb46c789091 --- /dev/null +++ b/nixos/doc/manual/development/non-switchable-systems.section.md @@ -0,0 +1,21 @@ +# Non Switchable Systems {#sec-non-switchable-system} + +In certain systems, most notably image based appliances, updates are handled +outside the system. This means that you do not need to rebuild your +configuration on the system itself anymore. + +If you want to build such a system, you can use the `image-based-appliance` +profile: + +```nix +{ modulesPath, ... }: { + imports = [ "${modulesPath}/profiles/image-based-appliance.nix" ] +} +``` + +The most notable deviation of this profile from a standard NixOS configuration +is that after building it, you cannot switch *to* the configuration anymore. +The profile sets `config.system.switch.enable = false;`, which excludes +`switch-to-configuration`, the central script called by `nixos-rebuild`, from +your system. Removing this script makes the image lighter and slightly more +secure. diff --git a/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md b/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md index 82522b33740e7..ccadb819e061d 100644 --- a/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md +++ b/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md @@ -55,4 +55,5 @@ explained in the next sections. ```{=include=} sections unit-handling.section.md activation-script.section.md +non-switchable-systems.section.md ``` diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index bd0d74a8885bf..74d29ab1cf9ca 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -86,6 +86,8 @@ - [pgBouncer](https://www.pgbouncer.org), a PostgreSQL connection pooler. Available as [services.pgbouncer](#opt-services.pgbouncer.enable). +- [Goss](https://goss.rocks/), a YAML based serverspec alternative tool for validating a server's configuration. Available as [services.goss](#opt-services.goss.enable). + - [trust-dns](https://trust-dns.org/), a Rust based DNS server built to be safe and secure from the ground up. Available as [services.trust-dns](#opt-services.trust-dns.enable). - [osquery](https://www.osquery.io/), a SQL powered operating system instrumentation, monitoring, and analytics. @@ -111,6 +113,8 @@ - [tuxedo-rs](https://github.com/AaronErhardt/tuxedo-rs), Rust utilities for interacting with hardware from TUXEDO Computers. +- [certspotter](https://github.com/SSLMate/certspotter), a certificate transparency log monitor. Available as [services.certspotter](#opt-services.certspotter.enable). + - [audiobookshelf](https://github.com/advplyr/audiobookshelf/), a self-hosted audiobook and podcast server. Available as [services.audiobookshelf](#opt-services.audiobookshelf.enable). - [ZITADEL](https://zitadel.com), a turnkey identity and access management platform. Available as [services.zitadel](#opt-services.zitadel.enable). @@ -125,6 +129,8 @@ - [Rosenpass](https://rosenpass.eu/), a service for post-quantum-secure VPNs with WireGuard. Available as [services.rosenpass](#opt-services.rosenpass.enable). +- [c2FmZQ](https://github.com/c2FmZQ/c2FmZQ/), an application that can securely encrypt, store, and share files, including but not limited to pictures and videos. Available as [services.c2fmzq-server](#opt-services.c2fmzq-server.enable). + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} - `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`. @@ -156,8 +162,16 @@ - `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms). +- `maintainers/scripts/update-luarocks-packages` is now a proper package + `luarocks-packages-updater` that can be run to maintain out-of-tree luarocks + packages + - The `users.users.<name>.passwordFile` has been renamed to `users.users.<name>.hashedPasswordFile` to avoid possible confusions. The option is in fact the file-based version of `hashedPassword`, not `password`, and expects a file containing the {manpage}`crypt(3)` hash of the user password. +- `chromiumBeta` and `chromiumDev` have been removed due to the lack of maintenance in nixpkgs. Consider using `chromium` instead. + +- `google-chrome-beta` and `google-chrome-dev` have been removed due to the lack of maintenance in nixpkgs. Consider using `google-chrome` instead. + - The `services.ananicy.extraRules` option now has the type of `listOf attrs` instead of `string`. - `buildVimPluginFrom2Nix` has been renamed to `buildVimPlugin`, which now @@ -236,8 +250,6 @@ - `baloo`, the file indexer/search engine used by KDE now has a patch to prevent files from constantly being reindexed when the device ids of the their underlying storage changes. This happens frequently when using btrfs or LVM. The patch has not yet been accepted upstream but it provides a significantly improved experience. When upgrading, reset baloo to get a clean index: `balooctl disable ; balooctl purge ; balooctl enable`. -- `services.ddclient` has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`. - - The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`. - `fileSystems.<name>.autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems.<name>.formatOptions` has been removed. @@ -335,8 +347,17 @@ - `services.kea.{ctrl-agent,dhcp-ddns,dhcp,dhcp6}` now use separate runtime directories instead of `/run/kea` to work around the runtime directory being cleared on service start. +- `mkDerivation` now rejects MD5 hashes. + +- The `junicode` font package has been updated to [major version 2](https://github.com/psb1558/Junicode-font/releases/tag/v2.001), which is now a font family. In particular, plain `Junicode.ttf` no longer exists. In addition, TrueType font files are now placed in `font/truetype` instead of `font/junicode-ttf`; this change does not affect use via `fonts.packages` NixOS option. + ## Other Notable Changes {#sec-release-23.11-notable-changes} +- A new option `system.switch.enable` was added. By default, this is option is + enabled. Disabling it makes the system unable to be reconfigured via + `nixos-rebuild`. This is good for image based appliances where updates are + handled outside the image. + - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. - GNOME, Pantheon, Cinnamon module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream (specifically, Cinnamon now defaults to the gtk2 style instead, following the default in Linux Mint). If you still want it, you can add the following options to your configuration but it will probably be eventually removed: @@ -375,6 +396,9 @@ - The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively. +- The `services.sslh` module has been updated to follow [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). As such, several options have been moved to the freeform attribute set [services.sslh.settings](#opt-services.sslh.settings), which allows to change any of the settings in {manpage}`sslh(8)`. + In addition, the newly added option [services.sslh.method](#opt-services.sslh.method) allows to switch between the {manpage}`fork(2)`, {manpage}`select(2)` and `libev`-based connection handling method; see the [sslh docs](https://github.com/yrutschle/sslh/blob/master/doc/INSTALL.md#binaries) for a comparison. + - `pkgs.openvpn3` now optionally supports systemd-resolved. `programs.openvpn3` will automatically enable systemd-resolved support if `config.services.resolved.enable` is enabled. - `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets. diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix index 6e01e00b43552..09d80deb85467 100644 --- a/nixos/lib/test-driver/default.nix +++ b/nixos/lib/test-driver/default.nix @@ -11,6 +11,7 @@ , tesseract4 , vde2 , extraPythonPackages ? (_ : []) +, nixosTests }: python3Packages.buildPythonApplication { @@ -31,6 +32,10 @@ python3Packages.buildPythonApplication { ++ (lib.optionals enableOCR [ imagemagick_light tesseract4 ]) ++ extraPythonPackages python3Packages; + passthru.tests = { + inherit (nixosTests.nixos-test-driver) driver-timeout; + }; + doCheck = true; nativeCheckInputs = with python3Packages; [ mypy ruff black ]; checkPhase = '' diff --git a/nixos/lib/test-driver/test_driver/__init__.py b/nixos/lib/test-driver/test_driver/__init__.py index 371719d7a9884..9daae1e941a65 100755 --- a/nixos/lib/test-driver/test_driver/__init__.py +++ b/nixos/lib/test-driver/test_driver/__init__.py @@ -77,6 +77,14 @@ def main() -> None: help="vlans to span by the driver", ) arg_parser.add_argument( + "--global-timeout", + type=int, + metavar="GLOBAL_TIMEOUT", + action=EnvDefault, + envvar="globalTimeout", + help="Timeout in seconds for the whole test", + ) + arg_parser.add_argument( "-o", "--output_directory", help="""The path to the directory where outputs copied from the VM will be placed. @@ -103,6 +111,7 @@ def main() -> None: args.testscript.read_text(), args.output_directory.resolve(), args.keep_vm_state, + args.global_timeout, ) as driver: if args.interactive: history_dir = os.getcwd() diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index 723c807178607..786821b0cc0d6 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -1,6 +1,8 @@ import os import re +import signal import tempfile +import threading from contextlib import contextmanager from pathlib import Path from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional, Union @@ -41,6 +43,8 @@ class Driver: vlans: List[VLan] machines: List[Machine] polling_conditions: List[PollingCondition] + global_timeout: int + race_timer: threading.Timer def __init__( self, @@ -49,9 +53,12 @@ class Driver: tests: str, out_dir: Path, keep_vm_state: bool = False, + global_timeout: int = 24 * 60 * 60 * 7, ): self.tests = tests self.out_dir = out_dir + self.global_timeout = global_timeout + self.race_timer = threading.Timer(global_timeout, self.terminate_test) tmp_dir = get_tmp_dir() @@ -82,6 +89,7 @@ class Driver: def __exit__(self, *_: Any) -> None: with rootlog.nested("cleanup"): + self.race_timer.cancel() for machine in self.machines: machine.release() @@ -144,6 +152,10 @@ class Driver: def run_tests(self) -> None: """Run the test script (for non-interactive test runs)""" + rootlog.info( + f"Test will time out and terminate in {self.global_timeout} seconds" + ) + self.race_timer.start() self.test_script() # TODO: Collect coverage data for machine in self.machines: @@ -161,6 +173,19 @@ class Driver: with rootlog.nested("wait for all VMs to finish"): for machine in self.machines: machine.wait_for_shutdown() + self.race_timer.cancel() + + def terminate_test(self) -> None: + # This will be usually running in another thread than + # the thread actually executing the test script. + with rootlog.nested("timeout reached; test terminating..."): + for machine in self.machines: + machine.release() + # As we cannot `sys.exit` from another thread + # We can at least force the main thread to get SIGTERM'ed. + # This will prevent any user who caught all the exceptions + # to swallow them and prevent itself from terminating. + os.kill(os.getpid(), signal.SIGTERM) def create_machine(self, args: Dict[str, Any]) -> Machine: tmp_dir = get_tmp_dir() diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 4904ad6e35913..f5222351518b5 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -42,6 +42,7 @@ rec { , nodes ? {} , testScript , enableOCR ? false + , globalTimeout ? (60 * 60) , name ? "unnamed" , skipTypeCheck ? false # Skip linting (mainly intended for faster dev cycles) diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix index cc97ca72083f9..b6f01c38191d2 100644 --- a/nixos/lib/testing/driver.nix +++ b/nixos/lib/testing/driver.nix @@ -94,6 +94,7 @@ let wrapProgram $out/bin/nixos-test-driver \ --set startScripts "''${vmStartScripts[*]}" \ --set testScript "$out/test-script" \ + --set globalTimeout "${toString config.globalTimeout}" \ --set vlans '${toString vlans}' \ ${lib.escapeShellArgs (lib.concatMap (arg: ["--add-flags" arg]) config.extraDriverArgs)} ''; @@ -123,6 +124,18 @@ in defaultText = "hostPkgs.qemu_test"; }; + globalTimeout = mkOption { + description = mdDoc '' + A global timeout for the complete test, expressed in seconds. + Beyond that timeout, every resource will be killed and released and the test will fail. + + By default, we use a 1 hour timeout. + ''; + type = types.int; + default = 60 * 60; + example = 10 * 60; + }; + enableOCR = mkOption { description = mdDoc '' Whether to enable Optical Character Recognition functionality for diff --git a/nixos/lib/testing/run.nix b/nixos/lib/testing/run.nix index 0cd07d8afd21d..9440c1acdfd81 100644 --- a/nixos/lib/testing/run.nix +++ b/nixos/lib/testing/run.nix @@ -16,6 +16,15 @@ in ''; }; + rawTestDerivation = mkOption { + type = types.package; + description = mdDoc '' + Unfiltered version of `test`, for troubleshooting the test framework and `testBuildFailure` in the test framework's test suite. + This is not intended for general use. Use `test` instead. + ''; + internal = true; + }; + test = mkOption { type = types.package; # TODO: can the interactive driver be configured to access the network? @@ -29,25 +38,26 @@ in }; config = { - test = lib.lazyDerivation { # lazyDerivation improves performance when only passthru items and/or meta are used. - derivation = hostPkgs.stdenv.mkDerivation { - name = "vm-test-run-${config.name}"; + rawTestDerivation = hostPkgs.stdenv.mkDerivation { + name = "vm-test-run-${config.name}"; - requiredSystemFeatures = [ "kvm" "nixos-test" ]; + requiredSystemFeatures = [ "kvm" "nixos-test" ]; - buildCommand = '' - mkdir -p $out + buildCommand = '' + mkdir -p $out - # effectively mute the XMLLogger - export LOGFILE=/dev/null + # effectively mute the XMLLogger + export LOGFILE=/dev/null - ${config.driver}/bin/nixos-test-driver -o $out - ''; + ${config.driver}/bin/nixos-test-driver -o $out + ''; - passthru = config.passthru; + passthru = config.passthru; - meta = config.meta; - }; + meta = config.meta; + }; + test = lib.lazyDerivation { # lazyDerivation improves performance when only passthru items and/or meta are used. + derivation = config.rawTestDerivation; inherit (config) passthru meta; }; diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/system.nix b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix index d283742701d19..d1044802e1f09 100644 --- a/nixos/maintainers/scripts/azure-new/examples/basic/system.nix +++ b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix @@ -21,7 +21,6 @@ in virtualisation.azureImage.diskSize = 2500; - system.stateVersion = "20.03"; boot.kernelPackages = pkgs.linuxPackages_latest; # test user doesn't have a password diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix index 7b743d170bc64..62a6e1f9aa3a8 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix @@ -2,13 +2,13 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, modulesPath, ... }: { imports = [ # Include the default lxd configuration. - ../../../modules/virtualisation/lxc-container.nix + "${modulesPath}/modules/virtualisation/lxc-container.nix" # Include the container-specific autogenerated configuration. ./lxd.nix ]; @@ -16,5 +16,5 @@ networking.useDHCP = false; networking.interfaces.eth0.useDHCP = true; - system.stateVersion = "21.05"; # Did you read the comment? + system.stateVersion = "@stateVersion@"; # Did you read the comment? } diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image.nix b/nixos/maintainers/scripts/lxd/lxd-container-image.nix index 3bd1320b2b680..b77f9f5aabe09 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image.nix @@ -13,11 +13,15 @@ }; # copy the config for nixos-rebuild - system.activationScripts.config = '' + system.activationScripts.config = let + config = pkgs.substituteAll { + src = ./lxd-container-image-inner.nix; + stateVersion = lib.trivial.release; + }; + in '' if [ ! -e /etc/nixos/configuration.nix ]; then mkdir -p /etc/nixos - cat ${./lxd-container-image-inner.nix} > /etc/nixos/configuration.nix - ${lib.getExe pkgs.gnused} 's|../../../modules/virtualisation/lxc-container.nix|<nixpkgs/nixos/modules/virtualisation/lxc-container.nix>|g' -i /etc/nixos/configuration.nix + cp ${config} /etc/nixos/configuration.nix fi ''; diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix index a8f2c63ac5c69..c1c50b32ff5bd 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix @@ -2,13 +2,13 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, modulesPath, ... }: { imports = [ # Include the default lxd configuration. - ../../../modules/virtualisation/lxd-virtual-machine.nix + "${modulesPath}/virtualisation/lxd-virtual-machine.nix" # Include the container-specific autogenerated configuration. ./lxd.nix ]; @@ -16,5 +16,5 @@ networking.useDHCP = false; networking.interfaces.eth0.useDHCP = true; - system.stateVersion = "23.05"; # Did you read the comment? + system.stateVersion = "@stateVersion@"; # Did you read the comment? } diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix index eb0d9217d4021..0d96eea0e2d2c 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix @@ -13,11 +13,15 @@ }; # copy the config for nixos-rebuild - system.activationScripts.config = '' + system.activationScripts.config = let + config = pkgs.substituteAll { + src = ./lxd-virtual-machine-image-inner.nix; + stateVersion = lib.trivial.release; + }; + in '' if [ ! -e /etc/nixos/configuration.nix ]; then mkdir -p /etc/nixos - cat ${./lxd-virtual-machine-image-inner.nix} > /etc/nixos/configuration.nix - ${lib.getExe pkgs.gnused} 's|../../../modules/virtualisation/lxd-virtual-machine.nix|<nixpkgs/nixos/modules/virtualisation/lxd-virtual-machine.nix>|g' -i /etc/nixos/configuration.nix + cp ${config} /etc/nixos/configuration.nix fi ''; diff --git a/nixos/modules/config/iproute2.nix b/nixos/modules/config/iproute2.nix index 7e4fb4d848e39..78bd07d680e20 100644 --- a/nixos/modules/config/iproute2.nix +++ b/nixos/modules/config/iproute2.nix @@ -18,15 +18,10 @@ in }; config = mkIf cfg.enable { - environment.etc."iproute2/bpf_pinning" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/bpf_pinning"; }; - environment.etc."iproute2/ematch_map" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/ematch_map"; }; - environment.etc."iproute2/group" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/group"; }; - environment.etc."iproute2/nl_protos" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/nl_protos"; }; - environment.etc."iproute2/rt_dsfield" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_dsfield"; }; - environment.etc."iproute2/rt_protos" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_protos"; }; - environment.etc."iproute2/rt_realms" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_realms"; }; - environment.etc."iproute2/rt_scopes" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_scopes"; }; - environment.etc."iproute2/rt_tables" = { mode = "0644"; text = (fileContents "${pkgs.iproute2}/etc/iproute2/rt_tables") - + (optionalString (cfg.rttablesExtraConfig != "") "\n\n${cfg.rttablesExtraConfig}"); }; + environment.etc."iproute2/rt_tables" = { + mode = "0644"; + text = (fileContents "${pkgs.iproute2}/lib/iproute2/rt_tables") + + (optionalString (cfg.rttablesExtraConfig != "") "\n\n${cfg.rttablesExtraConfig}"); + }; }; } diff --git a/nixos/modules/config/mysql.nix b/nixos/modules/config/mysql.nix index 2f13c56f2ae59..95c9ba76663ea 100644 --- a/nixos/modules/config/mysql.nix +++ b/nixos/modules/config/mysql.nix @@ -429,11 +429,11 @@ in ''; }; - # Activation script to append the password from the password file + # preStart script to append the password from the password file # to the configuration files. It also fixes the owner of the # libnss-mysql-root.cfg because it is changed to root after the # password is appended. - system.activationScripts.mysql-auth-passwords = '' + systemd.services.mysql.preStart = '' if [[ -r ${cfg.passwordFile} ]]; then org_umask=$(umask) umask 0077 diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index 3f8e088ede929..4abc846b08586 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -97,12 +97,9 @@ in nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault ""); - system.activationScripts.nix-channel = mkIf cfg.channel.enable - (stringAfter [ "etc" "users" ] '' - # Subscribe the root user to the NixOS channel by default. - if [ ! -e "/root/.nix-channels" ]; then - echo "${config.system.defaultChannel} nixos" > "/root/.nix-channels" - fi - ''); + systemd.tmpfiles.rules = lib.mkIf cfg.channel.enable [ + "f /root/.nix-channels -" + ''w "/root/.nix-channels" - - - - "${config.system.defaultChannel} nixos\n"'' + ]; }; } diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 97268a8d83efa..b4251214876ef 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -606,6 +606,14 @@ in { defaultText = literalExpression "config.users.users.\${name}.group"; default = cfg.users.${name}.group; }; + options.shell = mkOption { + type = types.passwdEntry types.path; + description = '' + The path to the user's shell in initrd. + ''; + default = "${pkgs.shadow}/bin/nologin"; + defaultText = literalExpression "\${pkgs.shadow}/bin/nologin"; + }; })); }; @@ -750,17 +758,20 @@ in { boot.initrd.systemd = lib.mkIf config.boot.initrd.systemd.enable { contents = { "/etc/passwd".text = '' - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: { uid, group }: let + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: { uid, group, shell }: let g = config.boot.initrd.systemd.groups.${group}; - in "${n}:x:${toString uid}:${toString g.gid}::/var/empty:") config.boot.initrd.systemd.users)} + in "${n}:x:${toString uid}:${toString g.gid}::/var/empty:${shell}") config.boot.initrd.systemd.users)} ''; "/etc/group".text = '' ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: { gid }: "${n}:x:${toString gid}:") config.boot.initrd.systemd.groups)} ''; + "/etc/shells".text = lib.concatStringsSep "\n" (lib.unique (lib.mapAttrsToList (_: u: u.shell) config.boot.initrd.systemd.users)) + "\n"; }; + storePaths = [ "${pkgs.shadow}/bin/nologin" ]; + users = { - root = {}; + root = { shell = lib.mkDefault "/bin/bash"; }; nobody = {}; }; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index d385e4a6b1c8e..15e10128ac9a4 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -224,12 +224,22 @@ in # accidentally delete configuration.nix. # system.copySystemConfiguration = true; - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It's perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . system.stateVersion = "${config.system.nixos.release}"; # Did you read the comment? } diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index 27a7651382b25..01931b2acfca4 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -21,7 +21,7 @@ with lib; services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ]; powerManagement.enable = false; - system.stateVersion = mkDefault "18.03"; + system.stateVersion = lib.mkDefault lib.trivial.release; installer.cloneConfigExtra = '' # Let demo build as a trusted user. diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 0a66eafe933ea..45dbf45b3ae70 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -121,22 +121,32 @@ in default = cfg.release; defaultText = literalExpression "config.${opt.release}"; description = lib.mdDoc '' - Every once in a while, a new NixOS release may change - configuration defaults in a way incompatible with stateful - data. For instance, if the default version of PostgreSQL - changes, the new version will probably be unable to read your - existing databases. To prevent such breakage, you should set the - value of this option to the NixOS release with which you want - to be compatible. The effect is that NixOS will use - defaults corresponding to the specified release (such as using - an older version of PostgreSQL). - It’s perfectly fine and recommended to leave this value at the - release version of the first install of this system. - Changing this option will not upgrade your system. In fact it - is meant to stay constant exactly when you upgrade your system. - You should only bump this option, if you are sure that you can - or have migrated all state on your system which is affected - by this option. + This option defines the first version of NixOS you have installed on this particular machine, + and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + + For example, if NixOS version XX.YY ships with AwesomeDB version N by default, and is then + upgraded to version XX.YY+1, which ships AwesomeDB version N+1, the existing databases + may no longer be compatible, causing applications to fail, or even leading to data loss. + + The `stateVersion` mechanism avoids this situation by making the default version of such packages + conditional on the first version of NixOS you've installed (encoded in `stateVersion`), instead of + simply always using the latest one. + + Note that this generally only affects applications that can't upgrade their data automatically - + applications and services supporting automatic migrations will remain on latest versions when + you upgrade. + + Most users should **never** change this value after the initial install, for any reason, + even if you've upgraded your system to a new NixOS release. + + This value does **not** affect the Nixpkgs version your packages and OS are pulled from, + so changing it will **not** upgrade your system. + + This value being lower than the current NixOS release does **not** mean your system is + out of date, out of support, or vulnerable. + + Do **not** change this value unless you have manually inspected all the changes it would + make to your configuration, and migrated your data accordingly. ''; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bf24ee7603fdf..bfac651f5a815 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -767,12 +767,14 @@ ./services/monitoring/below.nix ./services/monitoring/bosun.nix ./services/monitoring/cadvisor.nix + ./services/monitoring/certspotter.nix ./services/monitoring/cockpit.nix ./services/monitoring/collectd.nix ./services/monitoring/das_watchdog.nix ./services/monitoring/datadog-agent.nix ./services/monitoring/do-agent.nix ./services/monitoring/fusion-inventory.nix + ./services/monitoring/goss.nix ./services/monitoring/grafana-agent.nix ./services/monitoring/grafana-image-renderer.nix ./services/monitoring/grafana-reporter.nix @@ -1232,6 +1234,7 @@ ./services/web-apps/atlassian/jira.nix ./services/web-apps/audiobookshelf.nix ./services/web-apps/bookstack.nix + ./services/web-apps/c2fmzq-server.nix ./services/web-apps/calibre-web.nix ./services/web-apps/coder.nix ./services/web-apps/changedetection-io.nix @@ -1405,6 +1408,7 @@ ./system/activation/activatable-system.nix ./system/activation/activation-script.nix ./system/activation/specialisation.nix + ./system/activation/switchable-system.nix ./system/activation/bootspec.nix ./system/activation/top-level.nix ./system/boot/binfmt.nix diff --git a/nixos/modules/profiles/image-based-appliance.nix b/nixos/modules/profiles/image-based-appliance.nix new file mode 100644 index 0000000000000..7e8b6f696d54f --- /dev/null +++ b/nixos/modules/profiles/image-based-appliance.nix @@ -0,0 +1,26 @@ +# This profile sets up a sytem for image based appliance usage. An appliance is +# installed as an image, cannot be re-built, has no Nix available, and is +# generally not meant for interactive use. Updates to such an appliance are +# handled by updating whole partition images via a tool like systemd-sysupdate. + +{ lib, modulesPath, ... }: + +{ + + # Appliances are always "minimal". + imports = [ + "${modulesPath}/profiles/minimal.nix" + ]; + + # The system cannot be rebuilt. + nix.enable = false; + system.switch.enable = false; + + # The system is static. + users.mutableUsers = false; + + # The system avoids interpreters as much as possible to reduce its attack + # surface. + boot.initrd.systemd.enable = lib.mkDefault true; + networking.useNetworkd = lib.mkDefault true; +} diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index bd1b2b4521899..75f355b4a002b 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -18,6 +18,15 @@ with lib; documentation.nixos.enable = mkDefault false; + # Perl is a default package. + environment.defaultPackages = mkDefault [ ]; + + # The lessopen package pulls in Perl. + programs.less.lessopen = mkDefault null; + + # This pulls in nixos-containers which depends on Perl. + boot.enableContainers = mkDefault false; + programs.command-not-found.enable = mkDefault false; services.logrotate.enable = mkDefault false; diff --git a/nixos/modules/programs/cdemu.nix b/nixos/modules/programs/cdemu.nix index d43f009f2f92e..7eba4d29d83ba 100644 --- a/nixos/modules/programs/cdemu.nix +++ b/nixos/modules/programs/cdemu.nix @@ -53,6 +53,19 @@ in { dbus.packages = [ pkgs.cdemu-daemon ]; }; + users.groups.${config.programs.cdemu.group} = {}; + + # Systemd User service + # manually adapted from example in source package: + # https://sourceforge.net/p/cdemu/code/ci/master/tree/cdemu-daemon/service-example/cdemu-daemon.service + systemd.user.services.cdemu-daemon.description = "CDEmu daemon"; + systemd.user.services.cdemu-daemon.serviceConfig = { + Type = "dbus"; + BusName = "net.sf.cdemu.CDEmuDaemon"; + ExecStart = "${pkgs.cdemu-daemon}/bin/cdemu-daemon --config-file \"%h/.config/cdemu-daemon\""; + Restart = "no"; + }; + environment.systemPackages = [ pkgs.cdemu-daemon pkgs.cdemu-client ] ++ optional cfg.gui pkgs.gcdemu diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index 02b11766b3c09..2a855a77e3a39 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -193,8 +193,11 @@ in source = "${pkgs.duo-unix.out}/bin/login_duo"; }; - system.activationScripts = { - login_duo = mkIf cfg.ssh.enable '' + systemd.services.login-duo = lib.mkIf cfg.ssh.enable { + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + script = '' if test -f "${cfg.secretKeyFile}"; then mkdir -m 0755 -p /etc/duo @@ -209,7 +212,13 @@ in mv -fT "$conf" /etc/duo/login_duo.conf fi ''; - pam_duo = mkIf cfg.pam.enable '' + }; + + systemd.services.pam-duo = lib.mkIf cfg.ssh.enable { + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + script = '' if test -f "${cfg.secretKeyFile}"; then mkdir -m 0755 -p /etc/duo diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index a8bb0650b11af..250f9775be14d 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -275,33 +275,38 @@ in mrpx ${wrap.source}, '') wrappers; - ###### wrappers activation script - system.activationScripts.wrappers = - lib.stringAfter [ "specialfs" "users" ] - '' - chmod 755 "${parentWrapperDir}" - - # We want to place the tmpdirs for the wrappers to the parent dir. - wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) - chmod a+rx "$wrapperDir" - - ${lib.concatStringsSep "\n" mkWrappedPrograms} - - if [ -L ${wrapperDir} ]; then - # Atomically replace the symlink - # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ - old=$(readlink -f ${wrapperDir}) - if [ -e "${wrapperDir}-tmp" ]; then - rm --force --recursive "${wrapperDir}-tmp" - fi - ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp" - mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}" - rm --force --recursive "$old" - else - # For initial setup - ln --symbolic "$wrapperDir" "${wrapperDir}" + systemd.services.suid-sgid-wrappers = { + description = "Create SUID/SGID Wrappers"; + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + unitConfig.RequiresMountsFor = [ "/nix/store" "/run/wrappers" ]; + serviceConfig.Type = "oneshot"; + script = '' + chmod 755 "${parentWrapperDir}" + + # We want to place the tmpdirs for the wrappers to the parent dir. + wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) + chmod a+rx "$wrapperDir" + + ${lib.concatStringsSep "\n" mkWrappedPrograms} + + if [ -L ${wrapperDir} ]; then + # Atomically replace the symlink + # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ + old=$(readlink -f ${wrapperDir}) + if [ -e "${wrapperDir}-tmp" ]; then + rm --force --recursive "${wrapperDir}-tmp" fi - ''; + ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp" + mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}" + rm --force --recursive "$old" + else + # For initial setup + ln --symbolic "$wrapperDir" "${wrapperDir}" + fi + ''; + }; ###### wrappers consistency checks system.checks = lib.singleton (pkgs.runCommandLocal diff --git a/nixos/modules/services/audio/wyoming/faster-whisper.nix b/nixos/modules/services/audio/wyoming/faster-whisper.nix index 1fb67ecfe5060..205e05f2ed176 100644 --- a/nixos/modules/services/audio/wyoming/faster-whisper.nix +++ b/nixos/modules/services/audio/wyoming/faster-whisper.nix @@ -37,6 +37,9 @@ in enable = mkEnableOption (mdDoc "Wyoming faster-whisper server"); model = mkOption { + # Intersection between available and referenced models here: + # https://github.com/rhasspy/models/releases/tag/v1.0 + # https://github.com/rhasspy/rhasspy3/blob/wyoming-v1/programs/asr/faster-whisper/server/wyoming_faster_whisper/download.py#L17-L27 type = enum [ "tiny" "tiny-int8" @@ -44,7 +47,6 @@ in "base-int8" "small" "small-int8" - "medium" "medium-int8" ]; default = "tiny-int8"; diff --git a/nixos/modules/services/audio/wyoming/openwakeword.nix b/nixos/modules/services/audio/wyoming/openwakeword.nix index 06b7dd585fda1..713945c1df62e 100644 --- a/nixos/modules/services/audio/wyoming/openwakeword.nix +++ b/nixos/modules/services/audio/wyoming/openwakeword.nix @@ -22,15 +22,6 @@ let toString ; - models = [ - # wyoming_openwakeword/models/*.tflite - "alexa" - "hey_jarvis" - "hey_mycroft" - "hey_rhasspy" - "ok_nabu" - ]; - in { @@ -51,15 +42,22 @@ in }; models = mkOption { - type = listOf (enum models); - default = models; + type = listOf str; + default = [ + # wyoming_openwakeword/models/*.tflite + "alexa" + "hey_jarvis" + "hey_mycroft" + "hey_rhasspy" + "ok_nabu" + ]; description = mdDoc '' List of wake word models that should be made available. ''; }; preloadModels = mkOption { - type = listOf (enum models); + type = listOf str; default = [ "ok_nabu" ]; diff --git a/nixos/modules/services/backup/borgmatic.nix b/nixos/modules/services/backup/borgmatic.nix index d3ba7628e85dd..b27dd2817120b 100644 --- a/nixos/modules/services/backup/borgmatic.nix +++ b/nixos/modules/services/backup/borgmatic.nix @@ -81,7 +81,7 @@ in config = mkIf cfg.enable { warnings = [] - ++ optional (cfg.settings != null && cfg.settings.location != null) + ++ optional (cfg.settings != null && cfg.settings ? location) "`services.borgmatic.settings.location` is deprecated, please move your options out of sections to the global scope" ++ optional (catAttrs "location" (attrValues cfg.configurations) != []) "`services.borgmatic.configurations.<name>.location` is deprecated, please move your options out of sections to the global scope" diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 78220e99c3d1f..49a55d0560140 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -23,25 +23,13 @@ in environmentFile = mkOption { type = with types; nullOr str; - # added on 2021-08-28, s3CredentialsFile should - # be removed in the future (+ remember the warning) - default = config.s3CredentialsFile; + default = null; description = lib.mdDoc '' file containing the credentials to access the repository, in the format of an EnvironmentFile as described by systemd.exec(5) ''; }; - s3CredentialsFile = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - file containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY - for an S3-hosted repository, in the format of an EnvironmentFile - as described by systemd.exec(5) - ''; - }; - rcloneOptions = mkOption { type = with types; nullOr (attrsOf (oneOf [ str bool ])); default = null; @@ -113,12 +101,15 @@ in }; paths = mkOption { + # This is nullable for legacy reasons only. We should consider making it a pure listOf + # after some time has passed since this comment was added. type = types.nullOr (types.listOf types.str); - default = null; + default = [ ]; description = lib.mdDoc '' - Which paths to backup. If null or an empty array, no - backup command will be run. This can be used to create a - prune-only job. + Which paths to backup, in addition to ones specified via + `dynamicFilesFrom`. If null or an empty array and + `dynamicFilesFrom` is also null, no backup command will be run. + This can be used to create a prune-only job. ''; example = [ "/var/lib/postgresql" @@ -231,7 +222,7 @@ in description = lib.mdDoc '' A script that produces a list of files to back up. The results of this command are given to the '--files-from' - option. + option. The result is merged with paths specified via `paths`. ''; example = "find /home/matt/git -type d -name .git"; }; @@ -297,7 +288,6 @@ in }; config = { - warnings = mapAttrsToList (n: v: "services.restic.backups.${n}.s3CredentialsFile is deprecated, please use services.restic.backups.${n}.environmentFile instead.") (filterAttrs (n: v: v.s3CredentialsFile != null) config.services.restic.backups); assertions = mapAttrsToList (n: v: { assertion = (v.repository == null) != (v.repositoryFile == null); message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set"; @@ -310,10 +300,7 @@ in resticCmd = "${backup.package}/bin/restic${extraOptions}"; excludeFlags = optional (backup.exclude != []) "--exclude-file=${pkgs.writeText "exclude-patterns" (concatStringsSep "\n" backup.exclude)}"; filesFromTmpFile = "/run/restic-backups-${name}/includes"; - backupPaths = - if (backup.dynamicFilesFrom == null) - then optionalString (backup.paths != null) (concatStringsSep " " backup.paths) - else "--files-from ${filesFromTmpFile}"; + doBackup = (backup.dynamicFilesFrom != null) || (backup.paths != null && backup.paths != []); pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [ (resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts)) (resticCmd + " check " + (concatStringsSep " " backup.checkOpts)) @@ -348,7 +335,7 @@ in after = [ "network-online.target" ]; serviceConfig = { Type = "oneshot"; - ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ]) + ExecStart = (optionals doBackup [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} --files-from=${filesFromTmpFile}" ]) ++ pruneCmd; User = backup.user; RuntimeDirectory = "restic-backups-${name}"; @@ -366,8 +353,11 @@ in ${optionalString (backup.initialize) '' ${resticCmd} snapshots || ${resticCmd} init ''} + ${optionalString (backup.paths != null && backup.paths != []) '' + cat ${pkgs.writeText "staticPaths" (concatStringsSep "\n" backup.paths)} >> ${filesFromTmpFile} + ''} ${optionalString (backup.dynamicFilesFrom != null) '' - ${pkgs.writeScript "dynamicFilesFromScript" backup.dynamicFilesFrom} > ${filesFromTmpFile} + ${pkgs.writeScript "dynamicFilesFromScript" backup.dynamicFilesFrom} >> ${filesFromTmpFile} ''} ''; } // optionalAttrs (backup.dynamicFilesFrom != null || backup.backupCleanupCommand != null) { diff --git a/nixos/modules/services/blockchain/ethereum/erigon.nix b/nixos/modules/services/blockchain/ethereum/erigon.nix index 8ebe0fcaff549..945a373d12749 100644 --- a/nixos/modules/services/blockchain/ethereum/erigon.nix +++ b/nixos/modules/services/blockchain/ethereum/erigon.nix @@ -13,6 +13,8 @@ in { services.erigon = { enable = mkEnableOption (lib.mdDoc "Ethereum implementation on the efficiency frontier"); + package = mkPackageOptionMD pkgs "erigon" { }; + extraArgs = mkOption { type = types.listOf types.str; description = lib.mdDoc "Additional arguments passed to Erigon"; @@ -92,7 +94,7 @@ in { serviceConfig = { LoadCredential = "ERIGON_JWT:${cfg.secretJwtPath}"; - ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT ${lib.escapeShellArgs cfg.extraArgs}"; + ExecStart = "${cfg.package}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT ${lib.escapeShellArgs cfg.extraArgs}"; DynamicUser = true; Restart = "on-failure"; StateDirectory = "erigon"; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 56120094871cc..24987374ab0d6 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -350,7 +350,7 @@ in boot.kernelParams = mkIf (!config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ]; - boot.initrd.extraUdevRulesCommands = optionalString (!config.boot.initrd.systemd.enable && config.boot.initrd.services.udev.rules != "") + boot.initrd.extraUdevRulesCommands = mkIf (!config.boot.initrd.systemd.enable && config.boot.initrd.services.udev.rules != "") '' cat <<'EOF' > $out/99-local.rules ${config.boot.initrd.services.udev.rules} diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index d22acbeaa70c5..48d556b9459e5 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -67,7 +67,7 @@ in { configHeader = mkOption { type = types.lines; default = '' - @version: 3.6 + @version: 4.4 @include "scl.conf" ''; description = lib.mdDoc '' diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix index 642f8b20fe355..3f07fabcf1771 100644 --- a/nixos/modules/services/mail/mlmmj.nix +++ b/nixos/modules/services/mail/mlmmj.nix @@ -143,13 +143,11 @@ in environment.systemPackages = [ pkgs.mlmmj ]; - system.activationScripts.mlmmj = '' - ${pkgs.coreutils}/bin/mkdir -p ${stateDir} ${spoolDir}/${cfg.listDomain} - ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} ${spoolDir} - ${concatMapLines (createList cfg.listDomain) cfg.mailLists} - ${pkgs.postfix}/bin/postmap /etc/postfix/virtual - ${pkgs.postfix}/bin/postmap /etc/postfix/transport - ''; + systemd.tmpfiles.rules = [ + ''d "${stateDir}" -'' + ''d "${spoolDir}/${cfg.listDomain}" -'' + ''Z "${spoolDir}" - "${cfg.user}" "${cfg.group}" -'' + ]; systemd.services.mlmmj-maintd = { description = "mlmmj maintenance daemon"; @@ -158,6 +156,11 @@ in Group = cfg.group; ExecStart = "${pkgs.mlmmj}/bin/mlmmj-maintd -F -d ${spoolDir}/${cfg.listDomain}"; }; + preStart = '' + ${concatMapLines (createList cfg.listDomain) cfg.mailLists} + ${pkgs.postfix}/bin/postmap /etc/postfix/virtual + ${pkgs.postfix}/bin/postmap /etc/postfix/transport + ''; }; systemd.timers.mlmmj-maintd = { diff --git a/nixos/modules/services/monitoring/certspotter.md b/nixos/modules/services/monitoring/certspotter.md new file mode 100644 index 0000000000000..9bf6e1d946a04 --- /dev/null +++ b/nixos/modules/services/monitoring/certspotter.md @@ -0,0 +1,74 @@ +# Cert Spotter {#module-services-certspotter} + +Cert Spotter is a tool for monitoring [Certificate Transparency](https://en.wikipedia.org/wiki/Certificate_Transparency) +logs. + +## Service Configuration {#modules-services-certspotter-service-configuration} + +A basic config that notifies you of all certificate changes for your +domain would look as follows: + +```nix +services.certspotter = { + enable = true; + # replace example.org with your domain name + watchlist = [ ".example.org" ]; + emailRecipients = [ "webmaster@example.org" ]; +}; + +# Configure an SMTP client +programs.msmtp.enable = true; +# Or you can use any other module that provides sendmail, like +# services.nullmailer, services.opensmtpd, services.postfix +``` + +In this case, the leading dot in `".example.org"` means that Cert +Spotter should monitor not only `example.org`, but also all of its +subdomains. + +## Operation {#modules-services-certspotter-operation} + +**By default, NixOS configures Cert Spotter to skip all certificates +issued before its first launch**, because checking the entire +Certificate Transparency logs requires downloading tens of terabytes of +data. If you want to check the *entire* logs for previously issued +certificates, you have to set `services.certspotter.startAtEnd` to +`false` and remove all previously saved log state in +`/var/lib/certspotter/logs`. The downloaded logs aren't saved, so if you +add a new domain to the watchlist and want Cert Spotter to go through +the logs again, you will have to remove `/var/lib/certspotter/logs` +again. + +After catching up with the logs, Cert Spotter will start monitoring live +logs. As of October 2023, it uses around **20 Mbps** of traffic on +average. + +## Hooks {#modules-services-certspotter-hooks} + +Cert Spotter supports running custom hooks instead of (or in addition +to) sending emails. Hooks are shell scripts that will be passed certain +environment variables. + +To see hook documentation, see Cert Spotter's man pages: + +```ShellSession +nix-shell -p certspotter --run 'man 8 certspotter-script' +``` + +For example, you can remove `emailRecipients` and send email +notifications manually using the following hook: + +```nix +services.certspotter.hooks = [ + (pkgs.writeShellScript "certspotter-hook" '' + function print_email() { + echo "Subject: [certspotter] $SUMMARY" + echo "Mime-Version: 1.0" + echo "Content-Type: text/plain; charset=US-ASCII" + echo + cat "$TEXT_FILENAME" + } + print_email | ${config.services.certspotter.sendmailPath} -i webmaster@example.org + '') +]; +``` diff --git a/nixos/modules/services/monitoring/certspotter.nix b/nixos/modules/services/monitoring/certspotter.nix new file mode 100644 index 0000000000000..aafa29daa872c --- /dev/null +++ b/nixos/modules/services/monitoring/certspotter.nix @@ -0,0 +1,143 @@ +{ config +, lib +, pkgs +, ... }: + +let + cfg = config.services.certspotter; + + configDir = pkgs.linkFarm "certspotter-config" ( + lib.toList { + name = "watchlist"; + path = pkgs.writeText "certspotter-watchlist" (builtins.concatStringsSep "\n" cfg.watchlist); + } + ++ lib.optional (cfg.emailRecipients != [ ]) { + name = "email_recipients"; + path = pkgs.writeText "certspotter-email_recipients" (builtins.concatStringsSep "\n" cfg.emailRecipients); + } + # always generate hooks dir when no emails are provided to allow running cert spotter with no hooks/emails + ++ lib.optional (cfg.emailRecipients == [ ] || cfg.hooks != [ ]) { + name = "hooks.d"; + path = pkgs.linkFarm "certspotter-hooks" (lib.imap1 (i: path: { + inherit path; + name = "hook${toString i}"; + }) cfg.hooks); + }); +in +{ + options.services.certspotter = { + enable = lib.mkEnableOption "Cert Spotter, a Certificate Transparency log monitor"; + + package = lib.mkPackageOptionMD pkgs "certspotter" { }; + + startAtEnd = lib.mkOption { + type = lib.types.bool; + description = '' + Whether to skip certificates issued before the first launch of Cert Spotter. + Setting this to `false` will cause Cert Spotter to download tens of terabytes of data. + ''; + default = true; + }; + + sendmailPath = lib.mkOption { + type = with lib.types; nullOr path; + description = '' + Path to the `sendmail` binary. By default, the local sendmail wrapper is used + (see {option}`services.mail.sendmailSetuidWrapper`}). + ''; + example = lib.literalExpression ''"''${pkgs.system-sendmail}/bin/sendmail"''; + }; + + watchlist = lib.mkOption { + type = with lib.types; listOf str; + description = "Domain names to watch. To monitor a domain with all subdomains, prefix its name with `.` (e.g. `.example.org`)."; + default = [ ]; + example = [ ".example.org" "another.example.com" ]; + }; + + emailRecipients = lib.mkOption { + type = with lib.types; listOf str; + description = "A list of email addresses to send certificate updates to."; + default = [ ]; + }; + + hooks = lib.mkOption { + type = with lib.types; listOf path; + description = '' + Scripts to run upon the detection of a new certificate. See `man 8 certspotter-script` or + [the GitHub page](https://github.com/SSLMate/certspotter/blob/${pkgs.certspotter.src.rev or "master"}/man/certspotter-script.md) + for more info. + ''; + default = [ ]; + example = lib.literalExpression '' + [ + (pkgs.writeShellScript "certspotter-hook" ''' + echo "Event summary: $SUMMARY." + ''') + ] + ''; + }; + + extraFlags = lib.mkOption { + type = with lib.types; listOf str; + description = "Extra command-line arguments to pass to Cert Spotter"; + example = [ "-no_save" ]; + default = [ ]; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = (cfg.emailRecipients != [ ]) -> (cfg.sendmailPath != null); + message = '' + You must configure the sendmail setuid wrapper (services.mail.sendmailSetuidWrapper) + or services.certspotter.sendmailPath + ''; + } + ]; + + services.certspotter.sendmailPath = let + inherit (config.security) wrapperDir; + inherit (config.services.mail) sendmailSetuidWrapper; + in lib.mkMerge [ + (lib.mkIf (sendmailSetuidWrapper != null) (lib.mkOptionDefault "${wrapperDir}/${sendmailSetuidWrapper.program}")) + (lib.mkIf (sendmailSetuidWrapper == null) (lib.mkOptionDefault null)) + ]; + + users.users.certspotter = { + description = "Cert Spotter user"; + group = "certspotter"; + home = "/var/lib/certspotter"; + isSystemUser = true; + }; + users.groups.certspotter = { }; + + systemd.services.certspotter = { + description = "Cert Spotter - Certificate Transparency Monitor"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment.CERTSPOTTER_CONFIG_DIR = configDir; + environment.SENDMAIL_PATH = if cfg.sendmailPath != null then cfg.sendmailPath else "/run/current-system/sw/bin/false"; + script = '' + export CERTSPOTTER_STATE_DIR="$STATE_DIRECTORY" + cd "$CERTSPOTTER_STATE_DIR" + ${lib.optionalString cfg.startAtEnd '' + if [[ ! -d logs ]]; then + # Don't download certificates issued before the first launch + exec ${cfg.package}/bin/certspotter -start_at_end ${lib.escapeShellArgs cfg.extraFlags} + fi + ''} + exec ${cfg.package}/bin/certspotter ${lib.escapeShellArgs cfg.extraFlags} + ''; + serviceConfig = { + User = "certspotter"; + Group = "certspotter"; + StateDirectory = "certspotter"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ chayleaf ]; + meta.doc = ./certspotter.md; +} diff --git a/nixos/modules/services/monitoring/goss.md b/nixos/modules/services/monitoring/goss.md new file mode 100644 index 0000000000000..1e636aa3bdf33 --- /dev/null +++ b/nixos/modules/services/monitoring/goss.md @@ -0,0 +1,44 @@ +# Goss {#module-services-goss} + +[goss](https://goss.rocks/) is a YAML based serverspec alternative tool +for validating a server's configuration. + +## Basic Usage {#module-services-goss-basic-usage} + +A minimal configuration looks like this: + +``` +{ + services.goss = { + enable = true; + + environment = { + GOSS_FMT = "json"; + GOSS_LOGLEVEL = "TRACE"; + }; + + settings = { + addr."tcp://localhost:8080" = { + reachable = true; + local-address = "127.0.0.1"; + }; + command."check-goss-version" = { + exec = "${lib.getExe pkgs.goss} --version"; + exit-status = 0; + }; + dns.localhost.resolvable = true; + file."/nix" = { + filetype = "directory"; + exists = true; + }; + group.root.exists = true; + kernel-param."kernel.ostype".value = "Linux"; + service.goss = { + enabled = true; + running = true; + }; + user.root.exists = true; + }; + }; +} +``` diff --git a/nixos/modules/services/monitoring/goss.nix b/nixos/modules/services/monitoring/goss.nix new file mode 100644 index 0000000000000..64a8dad0703e8 --- /dev/null +++ b/nixos/modules/services/monitoring/goss.nix @@ -0,0 +1,86 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.goss; + + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "goss.yaml" cfg.settings; + +in { + meta = { + doc = ./goss.md; + maintainers = [ lib.maintainers.anthonyroussel ]; + }; + + options = { + services.goss = { + enable = lib.mkEnableOption (lib.mdDoc "Goss daemon"); + + package = lib.mkPackageOptionMD pkgs "goss" { }; + + environment = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + example = { + GOSS_FMT = "json"; + GOSS_LOGLEVEL = "FATAL"; + GOSS_LISTEN = ":8080"; + }; + description = lib.mdDoc '' + Environment variables to set for the goss service. + + See <https://github.com/goss-org/goss/blob/master/docs/manual.md> + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { freeformType = settingsFormat.type; }; + default = { }; + example = { + addr."tcp://localhost:8080" = { + reachable = true; + local-address = "127.0.0.1"; + }; + service.goss = { + enabled = true; + running = true; + }; + }; + description = lib.mdDoc '' + The global options in `config` file in yaml format. + + Refer to <https://github.com/goss-org/goss/blob/master/docs/goss-json-schema.yaml> for schema. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.services.goss = { + description = "Goss - Quick and Easy server validation"; + unitConfig.Documentation = "https://github.com/goss-org/goss/blob/master/docs/manual.md"; + + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + + environment = { + GOSS_FILE = configFile; + } // cfg.environment; + + reloadTriggers = [ configFile ]; + + serviceConfig = { + DynamicUser = true; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStart = "${cfg.package}/bin/goss serve"; + Group = "goss"; + Restart = "on-failure"; + RestartSec = 5; + User = "goss"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index bb11b6a1c1d01..efef2d777acd8 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -239,11 +239,9 @@ in power.ups.schedulerRules = mkDefault "${pkgs.nut}/etc/upssched.conf.sample"; - system.activationScripts.upsSetup = stringAfter [ "users" "groups" ] - '' - # Used to store pid files of drivers. - mkdir -p /var/state/ups - ''; + systemd.tmpfiles.rules = [ + "d /var/state/ups -" + ]; /* diff --git a/nixos/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix index 2279ceee2f58e..558f499022c81 100644 --- a/nixos/modules/services/networking/gvpe.nix +++ b/nixos/modules/services/networking/gvpe.nix @@ -29,7 +29,7 @@ let export PATH=$PATH:${pkgs.iproute2}/sbin - ip link set $IFNAME up + ip link set dev $IFNAME up ip address add ${cfg.ipAddress} dev $IFNAME ip route add ${cfg.subnet} dev $IFNAME diff --git a/nixos/modules/services/networking/iscsi/initiator.nix b/nixos/modules/services/networking/iscsi/initiator.nix index 9c71a988f29cc..6c30f89b7968a 100644 --- a/nixos/modules/services/networking/iscsi/initiator.nix +++ b/nixos/modules/services/networking/iscsi/initiator.nix @@ -52,25 +52,27 @@ in ''; environment.etc."iscsi/initiatorname.iscsi".text = "InitiatorName=${cfg.name}"; - system.activationScripts.iscsid = let - extraCfgDumper = optionalString (cfg.extraConfigFile != null) '' - if [ -f "${cfg.extraConfigFile}" ]; then - printf "\n# The following is from ${cfg.extraConfigFile}:\n" - cat "${cfg.extraConfigFile}" - else - echo "Warning: services.openiscsi.extraConfigFile ${cfg.extraConfigFile} does not exist!" >&2 - fi - ''; - in '' - ( - cat ${config.environment.etc."iscsi/iscsid.conf.fragment".source} - ${extraCfgDumper} - ) > /etc/iscsi/iscsid.conf - ''; - systemd.packages = [ cfg.package ]; - systemd.services."iscsid".wantedBy = [ "multi-user.target" ]; + systemd.services."iscsid" = { + wantedBy = [ "multi-user.target" ]; + preStart = + let + extraCfgDumper = optionalString (cfg.extraConfigFile != null) '' + if [ -f "${cfg.extraConfigFile}" ]; then + printf "\n# The following is from ${cfg.extraConfigFile}:\n" + cat "${cfg.extraConfigFile}" + else + echo "Warning: services.openiscsi.extraConfigFile ${cfg.extraConfigFile} does not exist!" >&2 + fi + ''; + in '' + ( + cat ${config.environment.etc."iscsi/iscsid.conf.fragment".source} + ${extraCfgDumper} + ) > /etc/iscsi/iscsid.conf + ''; + }; systemd.sockets."iscsid".wantedBy = [ "sockets.target" ]; systemd.services."iscsi" = mkIf cfg.enableAutoLoginOut { diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix index 82e68bf92af1f..99ffbf56ccb00 100644 --- a/nixos/modules/services/networking/mullvad-vpn.nix +++ b/nixos/modules/services/networking/mullvad-vpn.nix @@ -76,5 +76,5 @@ with lib; }; }; - meta.maintainers = with maintainers; [ patricksjackson ymarkus ]; + meta.maintainers = with maintainers; [ arcuru ymarkus ]; } diff --git a/nixos/modules/services/networking/multipath.nix b/nixos/modules/services/networking/multipath.nix index bd403e109c2af..9099cbe0cd32a 100644 --- a/nixos/modules/services/networking/multipath.nix +++ b/nixos/modules/services/networking/multipath.nix @@ -546,8 +546,9 @@ in { # We do not have systemd in stage-1 boot so must invoke `multipathd` # with the `-1` argument which disables systemd calls. Invoke `multipath` # to display the multipath mappings in the output of `journalctl -b`. + # TODO: Implement for systemd stage 1 boot.initrd.kernelModules = [ "dm-multipath" "dm-service-time" ]; - boot.initrd.postDeviceCommands = '' + boot.initrd.postDeviceCommands = mkIf (!config.boot.initrd.systemd.enable) '' modprobe -a dm-multipath dm-service-time multipathd -s (set -x && sleep 1 && multipath -ll) diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix index 3e01ace54ad17..547317dbcbe2a 100644 --- a/nixos/modules/services/networking/spiped.nix +++ b/nixos/modules/services/networking/spiped.nix @@ -197,8 +197,9 @@ in script = "exec ${pkgs.spiped}/bin/spiped -F `cat /etc/spiped/$1.spec`"; }; - system.activationScripts.spiped = optionalString (cfg.config != {}) - "mkdir -p /var/lib/spiped"; + systemd.tmpfiles.rules = lib.mkIf (cfg.config != { }) [ + "d /var/lib/spiped -" + ]; # Setup spiped config files environment.etc = mapAttrs' (name: cfg: nameValuePair "spiped/${name}.spec" diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index daa30fe09b896..f54ce59174387 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -12,22 +12,44 @@ let then cfgc.package else pkgs.buildPackages.openssh; - # reports boolean as yes / no - mkValueStringSshd = with lib; v: - if isInt v then toString v - else if isString v then v - else if true == v then "yes" - else if false == v then "no" - else if isList v then concatStringsSep "," v - else throw "unsupported type ${builtins.typeOf v}: ${(lib.generators.toPretty {}) v}"; - # dont use the "=" operator - settingsFormat = (pkgs.formats.keyValue { - mkKeyValue = lib.generators.mkKeyValueDefault { - mkValueString = mkValueStringSshd; - } " ";}); + settingsFormat = + let + # reports boolean as yes / no + mkValueString = with lib; v: + if isInt v then toString v + else if isString v then v + else if true == v then "yes" + else if false == v then "no" + else throw "unsupported type ${builtins.typeOf v}: ${(lib.generators.toPretty {}) v}"; + + base = pkgs.formats.keyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { inherit mkValueString; } " "; + }; + # OpenSSH is very inconsistent with options that can take multiple values. + # For some of them, they can simply appear multiple times and are appended, for others the + # values must be separated by whitespace or even commas. + # Consult either sshd_config(5) or, as last resort, the OpehSSH source for parsing + # the options at servconf.c:process_server_config_line_depth() to determine the right "mode" + # for each. But fortunaly this fact is documented for most of them in the manpage. + commaSeparated = [ "Ciphers" "KexAlgorithms" "Macs" ]; + spaceSeparated = [ "AuthorizedKeysFile" "AllowGroups" "AllowUsers" "DenyGroups" "DenyUsers" ]; + in { + inherit (base) type; + generate = name: value: + let transformedValue = mapAttrs (key: val: + if isList val then + if elem key commaSeparated then concatStringsSep "," val + else if elem key spaceSeparated then concatStringsSep " " val + else throw "list value for unknown key ${key}: ${(lib.generators.toPretty {}) val}" + else + val + ) value; + in + base.generate name transformedValue; + }; - configFile = settingsFormat.generate "sshd.conf-settings" cfg.settings; + configFile = settingsFormat.generate "sshd.conf-settings" (filterAttrs (n: v: v != null) cfg.settings); sshconf = pkgs.runCommand "sshd.conf-final" { } '' cat ${configFile} - >$out <<EOL ${cfg.extraConfig} @@ -431,6 +453,42 @@ in <https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67> ''; }; + AllowUsers = mkOption { + type = with types; nullOr (listOf str); + default = null; + description = lib.mdDoc '' + If specified, login is allowed only for the listed users. + See {manpage}`sshd_config(5)` for details. + ''; + }; + DenyUsers = mkOption { + type = with types; nullOr (listOf str); + default = null; + description = lib.mdDoc '' + If specified, login is denied for all listed users. Takes + precedence over [](#opt-services.openssh.settings.AllowUsers). + See {manpage}`sshd_config(5)` for details. + ''; + }; + AllowGroups = mkOption { + type = with types; nullOr (listOf str); + default = null; + description = lib.mdDoc '' + If specified, login is allowed only for users part of the + listed groups. + See {manpage}`sshd_config(5)` for details. + ''; + }; + DenyGroups = mkOption { + type = with types; nullOr (listOf str); + default = null; + description = lib.mdDoc '' + If specified, login is denied for all users part of the listed + groups. Takes precedence over + [](#opt-services.openssh.settings.AllowGroups). See + {manpage}`sshd_config(5)` for details. + ''; + }; }; }); }; diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix index daf2f2f3668ee..dd29db510020a 100644 --- a/nixos/modules/services/networking/sslh.nix +++ b/nixos/modules/services/networking/sslh.nix @@ -5,81 +5,131 @@ with lib; let cfg = config.services.sslh; user = "sslh"; - configFile = pkgs.writeText "sslh.conf" '' - verbose: ${boolToString cfg.verbose}; - foreground: true; - inetd: false; - numeric: false; - transparent: ${boolToString cfg.transparent}; - timeout: "${toString cfg.timeout}"; - - listen: - ( - ${ - concatMapStringsSep ",\n" - (addr: ''{ host: "${addr}"; port: "${toString cfg.port}"; }'') - cfg.listenAddresses - } - ); - - ${cfg.appendConfig} - ''; - defaultAppendConfig = '' - protocols: - ( - { name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; }, - { name: "openvpn"; host: "localhost"; port: "1194"; probe: "builtin"; }, - { name: "xmpp"; host: "localhost"; port: "5222"; probe: "builtin"; }, - { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; }, - { name: "tls"; host: "localhost"; port: "443"; probe: "builtin"; }, - { name: "anyprot"; host: "localhost"; port: "443"; probe: "builtin"; } - ); - ''; + + configFormat = pkgs.formats.libconfig {}; + configFile = configFormat.generate "sslh.conf" cfg.settings; in + { imports = [ (mkRenamedOptionModule [ "services" "sslh" "listenAddress" ] [ "services" "sslh" "listenAddresses" ]) + (mkRenamedOptionModule [ "services" "sslh" "timeout" ] [ "services" "sslh" "settings" "timeout" ]) + (mkRenamedOptionModule [ "services" "sslh" "transparent" ] [ "services" "sslh" "settings" "transparent" ]) + (mkRemovedOptionModule [ "services" "sslh" "appendConfig" ] "Use services.sslh.settings instead") + (mkChangedOptionModule [ "services" "sslh" "verbose" ] [ "services" "sslh" "settings" "verbose-connections" ] + (config: if config.services.sslh.verbose then 1 else 0)) ]; - options = { - services.sslh = { - enable = mkEnableOption (lib.mdDoc "sslh"); + meta.buildDocsInSandbox = false; - verbose = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Verbose logs."; - }; + options.services.sslh = { + enable = mkEnableOption (lib.mdDoc "sslh, protocol demultiplexer"); - timeout = mkOption { - type = types.int; - default = 2; - description = lib.mdDoc "Timeout in seconds."; - }; + method = mkOption { + type = types.enum [ "fork" "select" "ev" ]; + default = "fork"; + description = lib.mdDoc '' + The method to use for handling connections: - transparent = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Will the services behind sslh (Apache, sshd and so on) see the external IP and ports as if the external world connected directly to them"; - }; + - `fork` forks a new process for each incoming connection. It is + well-tested and very reliable, but incurs the overhead of many + processes. - listenAddresses = mkOption { - type = types.coercedTo types.str singleton (types.listOf types.str); - default = [ "0.0.0.0" "[::]" ]; - description = lib.mdDoc "Listening addresses or hostnames."; - }; + - `select` uses only one thread, which monitors all connections at once. + It has lower overhead per connection, but if it stops, you'll lose all + connections. - port = mkOption { - type = types.port; - default = 443; - description = lib.mdDoc "Listening port."; - }; + - `ev` is implemented using libev, it's similar to `select` but + scales better to a large number of connections. + ''; + }; + + listenAddresses = mkOption { + type = with types; coercedTo str singleton (listOf str); + default = [ "0.0.0.0" "[::]" ]; + description = lib.mdDoc "Listening addresses or hostnames."; + }; + + port = mkOption { + type = types.port; + default = 443; + description = lib.mdDoc "Listening port."; + }; + + settings = mkOption { + type = types.submodule { + freeformType = configFormat.type; + + options.timeout = mkOption { + type = types.ints.unsigned; + default = 2; + description = lib.mdDoc "Timeout in seconds."; + }; + + options.transparent = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether the services behind sslh (Apache, sshd and so on) will see the + external IP and ports as if the external world connected directly to + them. + ''; + }; + + options.verbose-connections = mkOption { + type = types.ints.between 0 4; + default = 0; + description = lib.mdDoc '' + Where to log connections information. Possible values are: + + 0. don't log anything + 1. write log to stdout + 2. write log to syslog + 3. write log to both stdout and syslog + 4. write to a log file ({option}`sslh.settings.logfile`) + ''; + }; + + options.numeric = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to disable reverse DNS lookups, thus keeping IP + address literals in the log. + ''; + }; + + options.protocols = mkOption { + type = types.listOf configFormat.type; + default = [ + { name = "ssh"; host = "localhost"; port = "22"; service= "ssh"; } + { name = "openvpn"; host = "localhost"; port = "1194"; } + { name = "xmpp"; host = "localhost"; port = "5222"; } + { name = "http"; host = "localhost"; port = "80"; } + { name = "tls"; host = "localhost"; port = "443"; } + { name = "anyprot"; host = "localhost"; port = "443"; } + ]; + description = lib.mdDoc '' + List of protocols sslh will probe for and redirect. + Each protocol entry consists of: + + - `name`: name of the probe. + + - `service`: libwrap service name (see {manpage}`hosts_access(5)`), - appendConfig = mkOption { - type = types.str; - default = defaultAppendConfig; - description = lib.mdDoc "Verbatim configuration file."; + - `host`, `port`: where to connect when this probe succeeds, + + - `log_level`: to log incoming connections, + + - `transparent`: proxy this protocol transparently, + + - etc. + + See the documentation for all options, including probe-specific ones. + ''; + }; }; + description = lib.mdDoc "sslh configuration. See {manpage}`sslh(8)` for available settings."; }; }; @@ -96,20 +146,29 @@ in PermissionsStartOnly = true; Restart = "always"; RestartSec = "1s"; - ExecStart = "${pkgs.sslh}/bin/sslh -F${configFile}"; + ExecStart = "${pkgs.sslh}/bin/sslh-${cfg.method} -F${configFile}"; KillMode = "process"; - AmbientCapabilities = "CAP_NET_BIND_SERVICE CAP_NET_ADMIN CAP_SETGID CAP_SETUID"; + AmbientCapabilities = ["CAP_NET_BIND_SERVICE" "CAP_NET_ADMIN" "CAP_SETGID" "CAP_SETUID"]; PrivateTmp = true; PrivateDevices = true; ProtectSystem = "full"; ProtectHome = true; }; }; + + services.sslh.settings = { + # Settings defined here are not supposed to be changed: doing so will + # break the module, as such you need `lib.mkForce` to override them. + foreground = true; + inetd = false; + listen = map (addr: { host = addr; port = toString cfg.port; }) cfg.listenAddresses; + }; + }) # code from https://github.com/yrutschle/sslh#transparent-proxy-support # the only difference is using iptables mark 0x2 instead of 0x1 to avoid conflicts with nixos/nat module - (mkIf (cfg.enable && cfg.transparent) { + (mkIf (cfg.enable && cfg.settings.transparent) { # Set route_localnet = 1 on all interfaces so that ssl can use "localhost" as destination boot.kernel.sysctl."net.ipv4.conf.default.route_localnet" = 1; boot.kernel.sysctl."net.ipv4.conf.all.route_localnet" = 1; diff --git a/nixos/modules/services/networking/strongswan-swanctl/module.nix b/nixos/modules/services/networking/strongswan-swanctl/module.nix index c51e8ad9f5fc9..bfea89969728f 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/module.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/module.nix @@ -43,21 +43,21 @@ in { # The swanctl command complains when the following directories don't exist: # See: https://wiki.strongswan.org/projects/strongswan/wiki/Swanctldirectory - system.activationScripts.strongswan-swanctl-etc = stringAfter ["etc"] '' - mkdir -p '/etc/swanctl/x509' # Trusted X.509 end entity certificates - mkdir -p '/etc/swanctl/x509ca' # Trusted X.509 Certificate Authority certificates - mkdir -p '/etc/swanctl/x509ocsp' - mkdir -p '/etc/swanctl/x509aa' # Trusted X.509 Attribute Authority certificates - mkdir -p '/etc/swanctl/x509ac' # Attribute Certificates - mkdir -p '/etc/swanctl/x509crl' # Certificate Revocation Lists - mkdir -p '/etc/swanctl/pubkey' # Raw public keys - mkdir -p '/etc/swanctl/private' # Private keys in any format - mkdir -p '/etc/swanctl/rsa' # PKCS#1 encoded RSA private keys - mkdir -p '/etc/swanctl/ecdsa' # Plain ECDSA private keys - mkdir -p '/etc/swanctl/bliss' - mkdir -p '/etc/swanctl/pkcs8' # PKCS#8 encoded private keys of any type - mkdir -p '/etc/swanctl/pkcs12' # PKCS#12 containers - ''; + systemd.tmpfiles.rules = [ + "d /etc/swanctl/x509 -" # Trusted X.509 end entity certificates + "d /etc/swanctl/x509ca -" # Trusted X.509 Certificate Authority certificates + "d /etc/swanctl/x509ocsp -" + "d /etc/swanctl/x509aa -" # Trusted X.509 Attribute Authority certificates + "d /etc/swanctl/x509ac -" # Attribute Certificates + "d /etc/swanctl/x509crl -" # Certificate Revocation Lists + "d /etc/swanctl/pubkey -" # Raw public keys + "d /etc/swanctl/private -" # Private keys in any format + "d /etc/swanctl/rsa -" # PKCS#1 encoded RSA private keys + "d /etc/swanctl/ecdsa -" # Plain ECDSA private keys + "d /etc/swanctl/bliss -" + "d /etc/swanctl/pkcs8 -" # PKCS#8 encoded private keys of any type + "d /etc/swanctl/pkcs12 -" # PKCS#12 containers + ]; systemd.services.strongswan-swanctl = { description = "strongSwan IPsec IKEv1/IKEv2 daemon using swanctl"; diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 8b35cc8d66697..a5d171e0baabe 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -31,6 +31,12 @@ in { package = lib.mkPackageOptionMD pkgs "tailscale" {}; + openFirewall = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc "Whether to open the firewall for the specified port."; + }; + useRoutingFeatures = mkOption { type = types.enum [ "none" "client" "server" "both" ]; default = "none"; @@ -113,6 +119,8 @@ in { "net.ipv6.conf.all.forwarding" = mkOverride 97 true; }; + networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ cfg.port ]; + networking.firewall.checkReversePath = mkIf (cfg.useRoutingFeatures == "client" || cfg.useRoutingFeatures == "both") "loose"; networking.dhcpcd.denyInterfaces = [ cfg.interfaceName ]; diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 37a739f41d485..6b68371098065 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -6,9 +6,9 @@ let cmd = '' @${cfg.jrePackage}/bin/java java \ ${optionalString (lib.versionAtLeast (lib.getVersion cfg.jrePackage) "16") - "--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED " + ("--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED " + "--add-opens java.base/sun.security.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED " - + "--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"} \ + + "--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED")} \ ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ -jar ${stateDir}/lib/ace.jar diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix index c9df20196dbd9..ce255cd8d0a46 100644 --- a/nixos/modules/services/system/nix-daemon.nix +++ b/nixos/modules/services/system/nix-daemon.nix @@ -249,11 +249,6 @@ in services.xserver.displayManager.hiddenUsers = attrNames nixbldUsers; - system.activationScripts.nix = stringAfter [ "etc" "users" ] - '' - install -m 0755 -d /nix/var/nix/{gcroots,profiles}/per-user - ''; - # Legacy configuration conversion. nix.settings = mkMerge [ (mkIf (isNixAtLeast "2.3pre") { sandbox-fallback = false; }) diff --git a/nixos/modules/services/web-apps/c2fmzq-server.md b/nixos/modules/services/web-apps/c2fmzq-server.md new file mode 100644 index 0000000000000..236953bd4ff7a --- /dev/null +++ b/nixos/modules/services/web-apps/c2fmzq-server.md @@ -0,0 +1,42 @@ +# c2FmZQ {#module-services-c2fmzq} + +c2FmZQ is an application that can securely encrypt, store, and share files, +including but not limited to pictures and videos. + +The service `c2fmzq-server` can be enabled by setting +``` +{ + services.c2fmzq-server.enable = true; +} +``` +This will spin up an instance of the server which is API-compatible with +[Stingle Photos](https://stingle.org) and an experimental Progressive Web App +(PWA) to interact with the storage via the browser. + +In principle the server can be exposed directly on a public interface and there +are command line options to manage HTTPS certificates directly, but the module +is designed to be served behind a reverse proxy or only accessed via localhost. + +``` +{ + services.c2fmzq-server = { + enable = true; + bindIP = "127.0.0.1"; # default + port = 8080; # default + }; + + services.nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts."example.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:8080"; + }; + }; + }; +} +``` + +For more information, see <https://github.com/c2FmZQ/c2FmZQ/>. diff --git a/nixos/modules/services/web-apps/c2fmzq-server.nix b/nixos/modules/services/web-apps/c2fmzq-server.nix new file mode 100644 index 0000000000000..2749c2a5a87aa --- /dev/null +++ b/nixos/modules/services/web-apps/c2fmzq-server.nix @@ -0,0 +1,125 @@ +{ lib, pkgs, config, ... }: + +let + inherit (lib) mkEnableOption mkPackageOption mkOption types; + + cfg = config.services.c2fmzq-server; + + argsFormat = { + type = with lib.types; nullOr (oneOf [ bool int str ]); + generate = lib.cli.toGNUCommandLineShell { }; + }; +in { + options.services.c2fmzq-server = { + enable = mkEnableOption "c2fmzq-server"; + + bindIP = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "The local address to use."; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = "The local port to use."; + }; + + passphraseFile = mkOption { + type = types.str; + example = "/run/secrets/c2fmzq/pwfile"; + description = "Path to file containing the database passphrase"; + }; + + package = mkPackageOption pkgs "c2fmzq" { }; + + settings = mkOption { + type = types.submodule { + freeformType = argsFormat.type; + + options = { + address = mkOption { + internal = true; + type = types.str; + default = "${cfg.bindIP}:${toString cfg.port}"; + }; + + database = mkOption { + type = types.str; + default = "%S/c2fmzq-server/data"; + description = "Path of the database"; + }; + + verbose = mkOption { + type = types.ints.between 1 3; + default = 2; + description = "The level of logging verbosity: 1:Error 2:Info 3:Debug"; + }; + }; + }; + description = '' + Configuration for c2FmZQ-server passed as CLI arguments. + Run {command}`c2FmZQ-server help` for supported values. + ''; + example = { + verbose = 3; + allow-new-accounts = true; + auto-approve-new-accounts = true; + encrypt-metadata = true; + enable-webapp = true; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.c2fmzq-server = { + description = "c2FmZQ-server"; + documentation = [ "https://github.com/c2FmZQ/c2FmZQ/blob/main/README.md" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "network-online.target" ]; + + serviceConfig = { + ExecStart = "${lib.getExe cfg.package} ${argsFormat.generate cfg.settings}"; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + DynamicUser = true; + Environment = "C2FMZQ_PASSPHRASE_FILE=%d/passphrase-file"; + IPAccounting = true; + IPAddressAllow = cfg.bindIP; + IPAddressDeny = "any"; + LoadCredential = "passphrase-file:${cfg.passphraseFile}"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateIPC = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SocketBindAllow = cfg.port; + SocketBindDeny = "any"; + StateDirectory = "c2fmzq-server"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged @obsolete" ]; + }; + }; + }; + + meta = { + doc = ./c2fmzq-server.md; + maintainers = with lib.maintainers; [ hmenke ]; + }; +} diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 66e5f1695a155..24f3b33318456 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -287,9 +287,9 @@ in # The systemd service will fail to execute the preStart hook # if the WorkingDirectory does not exist - system.activationScripts.mattermost = '' - mkdir -p "${cfg.statePath}" - ''; + systemd.tmpfiles.rules = [ + ''d "${cfg.statePath}" -'' + ]; systemd.services.mattermost = { description = "Mattermost chat service"; diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index e5deb6cf511f9..576b54a7edf24 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -78,9 +78,9 @@ in { server = { disableRegistration = mkOption { default = true; - type = types.bool; + type = types.enum [true false "invite_only"]; description = lib.mdDoc '' - Whether to prohibit creating an account in plausible's UI. + Whether to prohibit creating an account in plausible's UI or allow on `invite_only`. ''; }; secretKeybaseFile = mkOption { @@ -209,7 +209,7 @@ in { # Configuration options from # https://plausible.io/docs/self-hosting-configuration PORT = toString cfg.server.port; - DISABLE_REGISTRATION = boolToString cfg.server.disableRegistration; + DISABLE_REGISTRATION = if isBool cfg.server.disableRegistration then boolToString cfg.server.disableRegistration else cfg.server.disableRegistration; RELEASE_TMP = "/var/lib/plausible/tmp"; # Home is needed to connect to the node with iex diff --git a/nixos/modules/services/web-apps/shiori.nix b/nixos/modules/services/web-apps/shiori.nix index f0505e052e1c7..71b5ad4d4c062 100644 --- a/nixos/modules/services/web-apps/shiori.nix +++ b/nixos/modules/services/web-apps/shiori.nix @@ -29,6 +29,13 @@ in { default = 8080; description = lib.mdDoc "The port of the Shiori web application"; }; + + webRoot = mkOption { + type = types.str; + default = "/"; + example = "/shiori"; + description = lib.mdDoc "The root of the Shiori web application"; + }; }; }; @@ -40,7 +47,7 @@ in { environment.SHIORI_DIR = "/var/lib/shiori"; serviceConfig = { - ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}'"; + ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}' --webroot '${webRoot}'"; DynamicUser = true; StateDirectory = "shiori"; diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix index 9cba5cb4fa9e0..4fbf2bad750bc 100644 --- a/nixos/modules/services/web-apps/snipe-it.nix +++ b/nixos/modules/services/web-apps/snipe-it.nix @@ -18,15 +18,19 @@ let inherit (snipe-it.passthru) phpPackage; # shell script for local administration - artisan = pkgs.writeScriptBin "snipe-it" '' + artisan = (pkgs.writeScriptBin "snipe-it" '' #! ${pkgs.runtimeShell} - cd ${snipe-it} + cd "${snipe-it}/share/php/snipe-it" sudo=exec if [[ "$USER" != ${user} ]]; then sudo='exec /run/wrappers/bin/sudo -u ${user}' fi $sudo ${phpPackage}/bin/php artisan $* - ''; + '').overrideAttrs (old: { + meta = old.meta // { + mainProgram = "snipe-it"; + }; + }); in { options.services.snipe-it = { @@ -357,7 +361,7 @@ in { services.nginx = { enable = mkDefault true; virtualHosts."${cfg.hostName}" = mkMerge [ cfg.nginx { - root = mkForce "${snipe-it}/public"; + root = mkForce "${snipe-it}/share/php/snipe-it/public"; extraConfig = optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"; locations = { "/" = { @@ -394,7 +398,7 @@ in { RuntimeDirectory = "snipe-it/cache"; RuntimeDirectoryMode = "0700"; }; - path = [ pkgs.replace-secret ]; + path = [ pkgs.replace-secret artisan ]; script = let isSecret = v: isAttrs v && v ? _secret && (isString v._secret || builtins.isPath v._secret); @@ -451,7 +455,7 @@ in { rm "${cfg.dataDir}"/bootstrap/cache/*.php || true # migrate db - ${phpPackage}/bin/php artisan migrate --force + ${lib.getExe artisan} migrate --force # A placeholder file for invalid barcodes invalid_barcode_location="${cfg.dataDir}/public/uploads/barcodes/invalid_barcode.gif" diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 731d5315f23aa..47b4c6ab416e8 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -86,7 +86,7 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/garage server"; - StateDirectory = mkIf (hasPrefix "/var/lib/garage" cfg.settings.data_dir && hasPrefix "/var/lib/garage" cfg.settings.metadata_dir) "garage"; + StateDirectory = mkIf (hasPrefix "/var/lib/garage" cfg.settings.data_dir || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir) "garage"; DynamicUser = lib.mkDefault true; ProtectHome = true; NoNewPrivileges = true; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 9eebd18855c77..f2e8585a93654 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -35,6 +35,7 @@ let compressMimeTypes = [ "application/atom+xml" "application/geo+json" + "application/javascript" # Deprecated by IETF RFC 9239, but still widely used "application/json" "application/ld+json" "application/manifest+json" diff --git a/nixos/modules/services/web-servers/stargazer.nix b/nixos/modules/services/web-servers/stargazer.nix index f0c3cf8787ebb..18f57363137cf 100644 --- a/nixos/modules/services/web-servers/stargazer.nix +++ b/nixos/modules/services/web-servers/stargazer.nix @@ -204,11 +204,9 @@ in }; # Create default cert store - system.activationScripts.makeStargazerCertDir = - lib.optionalAttrs (cfg.store == /var/lib/gemini/certs) '' - mkdir -p /var/lib/gemini/certs - chown -R ${cfg.user}:${cfg.group} /var/lib/gemini/certs - ''; + systemd.tmpfiles.rules = lib.mkIf (cfg.store == /var/lib/gemini/certs) [ + ''d /var/lib/gemini/certs - "${cfg.user}" "${cfg.group}" -'' + ]; users.users = lib.optionalAttrs (cfg.user == "stargazer") { stargazer = { diff --git a/nixos/modules/system/activation/activatable-system.nix b/nixos/modules/system/activation/activatable-system.nix index 7f6154794bd8d..3d941596747bf 100644 --- a/nixos/modules/system/activation/activatable-system.nix +++ b/nixos/modules/system/activation/activatable-system.nix @@ -1,52 +1,16 @@ -{ config, lib, pkgs, ... }: +{ options, config, lib, pkgs, ... }: let inherit (lib) mkOption - optionalString types ; - perlWrapped = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); - systemBuilderArgs = { activationScript = config.system.activationScripts.script; dryActivationScript = config.system.dryActivationScript; }; - systemBuilderCommands = '' - echo "$activationScript" > $out/activate - echo "$dryActivationScript" > $out/dry-activate - substituteInPlace $out/activate --subst-var-by out ''${!toplevelVar} - substituteInPlace $out/dry-activate --subst-var-by out ''${!toplevelVar} - chmod u+x $out/activate $out/dry-activate - unset activationScript dryActivationScript - - mkdir $out/bin - substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \ - --subst-var out \ - --subst-var-by toplevel ''${!toplevelVar} \ - --subst-var-by coreutils "${pkgs.coreutils}" \ - --subst-var-by distroId ${lib.escapeShellArg config.system.nixos.distroId} \ - --subst-var-by installBootLoader ${lib.escapeShellArg config.system.build.installBootLoader} \ - --subst-var-by localeArchive "${config.i18n.glibcLocales}/lib/locale/locale-archive" \ - --subst-var-by perl "${perlWrapped}" \ - --subst-var-by shell "${pkgs.bash}/bin/sh" \ - --subst-var-by su "${pkgs.shadow.su}/bin/su" \ - --subst-var-by systemd "${config.systemd.package}" \ - --subst-var-by utillinux "${pkgs.util-linux}" \ - ; - - chmod +x $out/bin/switch-to-configuration - ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' - if ! output=$(${perlWrapped}/bin/perl -c $out/bin/switch-to-configuration 2>&1); then - echo "switch-to-configuration syntax is not valid:" - echo "$output" - exit 1 - fi - ''} - ''; - in { options = { @@ -60,6 +24,18 @@ in do, but for image based systems, this may not be needed or not be desirable. ''; }; + system.activatableSystemBuilderCommands = options.system.systemBuilderCommands // { + description = lib.mdDoc '' + Like `system.systemBuilderCommands`, but only for the commands that are + needed *both* when the system is activatable and when it isn't. + + Disclaimer: This option might go away in the future. It might be + superseded by separating switch-to-configuration into a separate script + which will make this option superfluous. See + https://github.com/NixOS/nixpkgs/pull/263462#discussion_r1373104845 for + a discussion. + ''; + }; system.build.separateActivationScript = mkOption { type = types.package; description = '' @@ -71,7 +47,18 @@ in }; }; config = { - system.systemBuilderCommands = lib.mkIf config.system.activatable systemBuilderCommands; + system.activatableSystemBuilderCommands = '' + echo "$activationScript" > $out/activate + echo "$dryActivationScript" > $out/dry-activate + substituteInPlace $out/activate --subst-var-by out ''${!toplevelVar} + substituteInPlace $out/dry-activate --subst-var-by out ''${!toplevelVar} + chmod u+x $out/activate $out/dry-activate + unset activationScript dryActivationScript + ''; + + system.systemBuilderCommands = lib.mkIf + config.system.activatable + config.system.activatableSystemBuilderCommands; system.systemBuilderArgs = lib.mkIf config.system.activatable (systemBuilderArgs // { toplevelVar = "out"; @@ -86,7 +73,7 @@ in }) '' mkdir $out - ${systemBuilderCommands} + ${config.system.activatableSystemBuilderCommands} ''; }; } diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index c8407dd6779a3..bc0b7266ce959 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -55,10 +55,6 @@ let # used as a garbage collection root. ln -sfn "$(readlink -f "$systemConfig")" /run/current-system - # Prevent the current configuration from being garbage-collected. - mkdir -p /nix/var/nix/gcroots - ln -sfn /run/current-system /nix/var/nix/gcroots/current-system - exit $_status ''; @@ -233,23 +229,15 @@ in config = { system.activationScripts.stdio = ""; # obsolete + system.activationScripts.var = ""; # obsolete - system.activationScripts.var = - '' - # Various log/runtime directories. - - mkdir -p /var/tmp - chmod 1777 /var/tmp - - # Empty, immutable home directory of many system accounts. - mkdir -p /var/empty - # Make sure it's really empty - ${pkgs.e2fsprogs}/bin/chattr -f -i /var/empty || true - find /var/empty -mindepth 1 -delete - chmod 0555 /var/empty - chown root:root /var/empty - ${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true - ''; + systemd.tmpfiles.rules = [ + # Prevent the current configuration from being garbage-collected. + "d /nix/var/nix/gcroots -" + "L+ /nix/var/nix/gcroots/current-system - - - - /run/current-system" + "D /var/empty 0555 root root -" + "h /var/empty - - - - +i" + ]; system.activationScripts.usrbinenv = if config.environment.usrbinenv != null then '' diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index b3ff3ac0abf30..e2f66a287bc4f 100755 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -22,6 +22,7 @@ use JSON::PP; use IPC::Cmd; use Sys::Syslog qw(:standard :macros); use Cwd qw(abs_path); +use Fcntl ':flock'; ## no critic(ControlStructures::ProhibitDeepNests) ## no critic(ErrorHandling::RequireCarping) @@ -91,6 +92,8 @@ if (!-f "/etc/NIXOS" && (read_file("/etc/os-release", err_mode => "quiet") // "" } make_path("/run/nixos", { mode => oct(755) }); +open(my $stc_lock, '>>', '/run/nixos/switch-to-configuration.lock') or die "Could not open lock - $!"; +flock($stc_lock, LOCK_EX) or die "Could not acquire lock - $!"; openlog("nixos", "", LOG_USER); # Install or update the bootloader. @@ -985,4 +988,5 @@ if ($res == 0) { syslog(LOG_ERR, "switching to system configuration $toplevel failed (status $res)"); } +close($stc_lock) or die "Could not close lock - $!"; exit($res); diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix new file mode 100644 index 0000000000000..00bc18e48d1fb --- /dev/null +++ b/nixos/modules/system/activation/switchable-system.nix @@ -0,0 +1,55 @@ +{ config, lib, pkgs, ... }: + +let + + perlWrapped = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); + +in + +{ + + options = { + system.switch.enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc '' + Whether to include the capability to switch configurations. + + Disabling this makes the system unable to be reconfigured via `nixos-rebuild`. + + This is good for image based appliances where updates are handled + outside the image. Reducing features makes the image lighter and + slightly more secure. + ''; + }; + }; + + config = lib.mkIf config.system.switch.enable { + system.activatableSystemBuilderCommands = '' + mkdir $out/bin + substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \ + --subst-var out \ + --subst-var-by toplevel ''${!toplevelVar} \ + --subst-var-by coreutils "${pkgs.coreutils}" \ + --subst-var-by distroId ${lib.escapeShellArg config.system.nixos.distroId} \ + --subst-var-by installBootLoader ${lib.escapeShellArg config.system.build.installBootLoader} \ + --subst-var-by localeArchive "${config.i18n.glibcLocales}/lib/locale/locale-archive" \ + --subst-var-by perl "${perlWrapped}" \ + --subst-var-by shell "${pkgs.bash}/bin/sh" \ + --subst-var-by su "${pkgs.shadow.su}/bin/su" \ + --subst-var-by systemd "${config.systemd.package}" \ + --subst-var-by utillinux "${pkgs.util-linux}" \ + ; + + chmod +x $out/bin/switch-to-configuration + ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' + if ! output=$(${perlWrapped}/bin/perl -c $out/bin/switch-to-configuration 2>&1); then + echo "switch-to-configuration syntax is not valid:" + echo "$output" + exit 1 + fi + ''} + ''; + }; + +} diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 8c9483f01c102..d16152ab9dec5 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -20,17 +20,13 @@ let optionalString fixBinary "F"; in ":${name}:${type}:${offset'}:${magicOrExtension}:${mask'}:${interpreter}:${flags}"; - activationSnippet = name: { interpreter, wrapInterpreterInShell, ... }: if wrapInterpreterInShell then '' - rm -f /run/binfmt/${name} - cat > /run/binfmt/${name} << 'EOF' - #!${pkgs.bash}/bin/sh - exec -- ${interpreter} "$@" - EOF - chmod +x /run/binfmt/${name} - '' else '' - rm -f /run/binfmt/${name} - ln -s ${interpreter} /run/binfmt/${name} - ''; + mkInterpreter = name: { interpreter, wrapInterpreterInShell, ... }: + if wrapInterpreterInShell + then pkgs.writeShellScript "${name}-interpreter" '' + #!${pkgs.bash}/bin/sh + exec -- ${interpreter} "$@" + '' + else interpreter; getEmulator = system: (lib.systems.elaborate { inherit system; }).emulator pkgs; getQemuArch = system: (lib.systems.elaborate { inherit system; }).qemuArch; @@ -318,18 +314,25 @@ in { environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); - system.activationScripts.binfmt = stringAfter [ "specialfs" ] '' - mkdir -p /run/binfmt - chmod 0755 /run/binfmt - ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} - ''; - systemd = lib.mkIf (config.boot.binfmt.registrations != {}) { - additionalUpstreamSystemUnits = [ - "proc-sys-fs-binfmt_misc.automount" - "proc-sys-fs-binfmt_misc.mount" - "systemd-binfmt.service" - ]; - services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; - }; + + systemd = lib.mkMerge [ + ({ tmpfiles.rules = [ + "d /run/binfmt 0755 -" + ] ++ lib.mapAttrsToList + (name: interpreter: + "L+ /run/binfmt/${name} - - - - ${interpreter}" + ) + (lib.mapAttrs mkInterpreter config.boot.binfmt.registrations); + }) + + (lib.mkIf (config.boot.binfmt.registrations != {}) { + additionalUpstreamSystemUnits = [ + "proc-sys-fs-binfmt_misc.automount" + "proc-sys-fs-binfmt_misc.mount" + "systemd-binfmt.service" + ]; + services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; + }) + ]; }; } diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix index 5bf38b6fa200b..88ba43caf0030 100644 --- a/nixos/modules/system/boot/initrd-network.nix +++ b/nixos/modules/system/boot/initrd-network.nix @@ -116,11 +116,11 @@ in boot.initrd.kernelModules = [ "af_packet" ]; - boot.initrd.extraUtilsCommands = '' + boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${pkgs.klibc}/lib/klibc/bin.static/ipconfig ''; - boot.initrd.preLVMCommands = mkBefore ( + boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkBefore ( # Search for interface definitions in command line. '' ifaces="" @@ -138,7 +138,7 @@ in # Bring up all interfaces. for iface in ${dhcpIfShellExpr}; do echo "bringing up network interface $iface..." - ip link set "$iface" up && ifaces="$ifaces $iface" + ip link set dev "$iface" up && ifaces="$ifaces $iface" done # Acquire DHCP leases. @@ -148,12 +148,12 @@ in done '' - + cfg.postCommands); + + cfg.postCommands)); - boot.initrd.postMountCommands = mkIf cfg.flushBeforeStage2 '' + boot.initrd.postMountCommands = mkIf (cfg.flushBeforeStage2 && !config.boot.initrd.systemd.enable) '' for iface in $ifaces; do - ip address flush "$iface" - ip link set "$iface" down + ip address flush dev "$iface" + ip link set dev "$iface" down done ''; diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 60c5ff62ffff0..3df14030ab687 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -164,13 +164,12 @@ in for instructions. ''; } - - { - assertion = config.boot.initrd.systemd.enable -> cfg.shell == null; - message = "systemd stage 1 does not support boot.initrd.network.ssh.shell"; - } ]; + warnings = lib.optional (config.boot.initrd.systemd.enable -> cfg.shell != null) '' + Please set 'boot.initrd.systemd.users.root.shell' instead of 'boot.initrd.network.ssh.shell' + ''; + boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${package}/bin/sshd cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib @@ -235,6 +234,8 @@ in users.sshd = { uid = 1; group = "sshd"; }; groups.sshd = { gid = 1; }; + users.root.shell = mkIf (config.boot.initrd.network.ssh.shell != null) config.boot.initrd.network.ssh.shell; + contents."/etc/ssh/authorized_keys.d/root".text = concatStringsSep "\n" config.boot.initrd.network.ssh.authorizedKeys; contents."/etc/ssh/sshd_config".text = sshdConfig; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 9ea6119196761..6b07686efcba2 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -269,6 +269,9 @@ in "ata_piix" "pata_marvell" + # NVMe + "nvme" + # Standard SCSI stuff. "sd_mod" "sr_mod" diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 4be040927540a..b7ced5b0d3466 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1020,7 +1020,7 @@ let "MulticastToUnicast" "NeighborSuppression" "Learning" - "Hairpin" + "HairPin" "Isolated" "UseBPDU" "FastLeave" @@ -1036,7 +1036,7 @@ let (assertValueOneOf "MulticastToUnicast" boolValues) (assertValueOneOf "NeighborSuppression" boolValues) (assertValueOneOf "Learning" boolValues) - (assertValueOneOf "Hairpin" boolValues) + (assertValueOneOf "HairPin" boolValues) (assertValueOneOf "Isolated" boolValues) (assertValueOneOf "UseBPDU" boolValues) (assertValueOneOf "FastLeave" boolValues) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index b0df4ce72ec4a..be40b8e969a17 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -344,6 +344,27 @@ in { }; config = mkIf (config.boot.initrd.enable && cfg.enable) { + assertions = map (name: { + assertion = lib.attrByPath name (throw "impossible") config.boot.initrd == ""; + message = '' + systemd stage 1 does not support 'boot.initrd.${lib.concatStringsSep "." name}'. Please + convert it to analogous systemd units in 'boot.initrd.systemd'. + + Definitions: + ${lib.concatMapStringsSep "\n" ({ file, ... }: " - ${file}") (lib.attrByPath name (throw "impossible") options.boot.initrd).definitionsWithLocations} + ''; + }) [ + [ "preFailCommands" ] + [ "preDeviceCommands" ] + [ "preLVMCommands" ] + [ "postDeviceCommands" ] + [ "postMountCommands" ] + [ "extraUdevRulesCommands" ] + [ "extraUtilsCommands" ] + [ "extraUtilsCommandsTest" ] + [ "network" "postCommands" ] + ]; + system.build = { inherit initialRamdisk; }; boot.initrd.availableKernelModules = [ diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index a6604802c38ca..7487cf97fe531 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -46,6 +46,28 @@ with lib; wantedBy = [ "sysinit.target" ]; aliases = [ "dbus-org.freedesktop.timesync1.service" ]; restartTriggers = [ config.environment.etc."systemd/timesyncd.conf".source ]; + + preStart = ( + # Ensure that we have some stored time to prevent + # systemd-timesyncd to resort back to the fallback time. If + # the file doesn't exist we assume that our current system + # clock is good enough to provide an initial value. + '' + if ! [ -f /var/lib/systemd/timesync/clock ]; then + test -d /var/lib/systemd/timesync || mkdir -p /var/lib/systemd/timesync + touch /var/lib/systemd/timesync/clock + fi + '' + + # workaround an issue of systemd-timesyncd not starting due to upstream systemd reverting their dynamic users changes + # - https://github.com/NixOS/nixpkgs/pull/61321#issuecomment-492423742 + # - https://github.com/systemd/systemd/issues/12131 + (lib.optionalString (versionOlder config.system.stateVersion "19.09") '' + if [ -L /var/lib/systemd/timesync ]; then + rm /var/lib/systemd/timesync + mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync + fi + '') + ); }; environment.etc."systemd/timesyncd.conf".text = '' @@ -59,28 +81,5 @@ with lib; group = "systemd-timesync"; }; users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync; - - system.activationScripts.systemd-timesyncd-migration = - # workaround an issue of systemd-timesyncd not starting due to upstream systemd reverting their dynamic users changes - # - https://github.com/NixOS/nixpkgs/pull/61321#issuecomment-492423742 - # - https://github.com/systemd/systemd/issues/12131 - mkIf (versionOlder config.system.stateVersion "19.09") '' - if [ -L /var/lib/systemd/timesync ]; then - rm /var/lib/systemd/timesync - mv /var/lib/private/systemd/timesync /var/lib/systemd/timesync - fi - ''; - system.activationScripts.systemd-timesyncd-init-clock = - # Ensure that we have some stored time to prevent systemd-timesyncd to - # resort back to the fallback time. - # If the file doesn't exist we assume that our current system clock is - # good enough to provide an initial value. - '' - if ! [ -f /var/lib/systemd/timesync/clock ]; then - test -d /var/lib/systemd/timesync || mkdir -p /var/lib/systemd/timesync - touch /var/lib/systemd/timesync/clock - fi - ''; }; - } diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 7837a34b49844..da9c83ba339c2 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -5,8 +5,22 @@ with lib; let fileSystems = config.system.build.fileSystems ++ config.swapDevices; encDevs = filter (dev: dev.encrypted.enable) fileSystems; - keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs; - keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs; + + # With scripted initrd, devices with a keyFile have to be opened + # late, after file systems are mounted, because that could be where + # the keyFile is located. With systemd initrd, each individual + # systemd-cryptsetup@ unit has RequiresMountsFor= to delay until all + # the mount units for the key file are done; i.e. no special + # treatment is needed. + lateEncDevs = + if config.boot.initrd.systemd.enable + then { } + else filter (dev: dev.encrypted.keyFile != null) encDevs; + earlyEncDevs = + if config.boot.initrd.systemd.enable + then encDevs + else filter (dev: dev.encrypted.keyFile == null) encDevs; + anyEncrypted = foldr (j: v: v || j.encrypted.enable) false encDevs; @@ -39,11 +53,14 @@ let type = types.nullOr types.str; description = lib.mdDoc '' Path to a keyfile used to unlock the backing encrypted - device. At the time this keyfile is accessed, the - `neededForBoot` filesystems (see - `fileSystems.<name?>.neededForBoot`) - will have been mounted under `/mnt-root`, - so the keyfile path should usually start with "/mnt-root/". + device. When systemd stage 1 is not enabled, at the time + this keyfile is accessed, the `neededForBoot` filesystems + (see `utils.fsNeededForBoot`) will have been mounted under + `/mnt-root`, so the keyfile path should usually start with + "/mnt-root/". When systemd stage 1 is enabled, + `fsNeededForBoot` file systems will be mounted as needed + under `/sysroot`, and the keyfile will not be accessed until + its requisite mounts are done. ''; }; }; @@ -62,26 +79,42 @@ in }; config = mkIf anyEncrypted { - assertions = map (dev: { - assertion = dev.encrypted.label != null; - message = '' - The filesystem for ${dev.mountPoint} has encrypted.enable set to true, but no encrypted.label set - ''; - }) encDevs; + assertions = concatMap (dev: [ + { + assertion = dev.encrypted.label != null; + message = '' + The filesystem for ${dev.mountPoint} has encrypted.enable set to true, but no encrypted.label set + ''; + } + { + assertion = + config.boot.initrd.systemd.enable -> ( + dev.encrypted.keyFile == null + || !lib.any (x: lib.hasPrefix x dev.encrypted.keyFile) ["/mnt-root" "$targetRoot"] + ); + message = '' + Bad use of '/mnt-root' or '$targetRoot` in 'keyFile'. + + When 'boot.initrd.systemd.enable' is enabled, file systems + are mounted at '/sysroot' instead of '/mnt-root'. + ''; + } + ]) encDevs; boot.initrd = { luks = { devices = builtins.listToAttrs (map (dev: { name = dev.encrypted.label; - value = { device = dev.encrypted.blkDev; }; - }) keylessEncDevs); + value = { device = dev.encrypted.blkDev; inherit (dev.encrypted) keyFile; }; + }) earlyEncDevs); forceLuksSupportInInitrd = true; }; - postMountCommands = - concatMapStrings (dev: + # TODO: systemd stage 1 + postMountCommands = lib.mkIf (!config.boot.initrd.systemd.enable) + (concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.blkDev} ${dev.encrypted.label};\n" - ) keyedEncDevs; + ) lateEncDevs); }; }; } diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 19ef188ce7833..4eadec239e67d 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -34,17 +34,43 @@ let } ''; - openCommand = name: fs: - let - # we need only unlock one device manually, and cannot pass multiple at once - # remove this adaptation when bcachefs implements mounting by filesystem uuid - # also, implement automatic waiting for the constituent devices when that happens - # bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671) - firstDevice = head (splitString ":" fs.device); - in - '' - tryUnlock ${name} ${firstDevice} + # we need only unlock one device manually, and cannot pass multiple at once + # remove this adaptation when bcachefs implements mounting by filesystem uuid + # also, implement automatic waiting for the constituent devices when that happens + # bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671) + firstDevice = fs: head (splitString ":" fs.device); + + openCommand = name: fs: '' + tryUnlock ${name} ${firstDevice fs} + ''; + + mkUnits = prefix: name: fs: let + mountUnit = "${utils.escapeSystemdPath (prefix + (lib.removeSuffix "/" fs.mountPoint))}.mount"; + device = firstDevice fs; + deviceUnit = "${utils.escapeSystemdPath device}.device"; + in { + name = "unlock-bcachefs-${utils.escapeSystemdPath fs.mountPoint}"; + value = { + description = "Unlock bcachefs for ${fs.mountPoint}"; + requiredBy = [ mountUnit ]; + before = [ mountUnit ]; + bindsTo = [ deviceUnit ]; + after = [ deviceUnit ]; + unitConfig.DefaultDependencies = false; + serviceConfig = { + Type = "oneshot"; + ExecCondition = "${pkgs.bcachefs-tools}/bin/bcachefs unlock -c \"${device}\""; + Restart = "on-failure"; + RestartMode = "direct"; + # Ideally, this service would lock the key on stop. + # As is, RemainAfterExit doesn't accomplish anything. + RemainAfterExit = true; + }; + script = '' + ${config.boot.initrd.systemd.package}/bin/systemd-ask-password --timeout=0 "enter passphrase for ${name}" | exec ${pkgs.bcachefs-tools}/bin/bcachefs unlock "${device}" ''; + }; + }; in @@ -59,6 +85,8 @@ in # use kernel package with bcachefs support until it's in mainline boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; + + systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems); } (mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { @@ -74,11 +102,13 @@ in copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/bcachefs copy_bin_and_libs ${mountCommand}/bin/mount.bcachefs ''; - boot.initrd.extraUtilsCommandsTest = '' + boot.initrd.extraUtilsCommandsTest = lib.mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/bcachefs version ''; - boot.initrd.postDeviceCommands = commonFunctions + concatStrings (mapAttrsToList openCommand bootFs); + boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (commonFunctions + concatStrings (mapAttrsToList openCommand bootFs)); + + boot.initrd.systemd.services = lib.mapAttrs' (mkUnits "/sysroot") bootFs; }) ]); } diff --git a/nixos/modules/tasks/filesystems/vfat.nix b/nixos/modules/tasks/filesystems/vfat.nix index e535e97759b22..9281b34633c25 100644 --- a/nixos/modules/tasks/filesystems/vfat.nix +++ b/nixos/modules/tasks/filesystems/vfat.nix @@ -21,7 +21,7 @@ in ln -sv dosfsck $out/bin/fsck.vfat ''; - boot.initrd.systemd.extraBin = mkIf inInitrd [ pkgs.dosfstools ]; + boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.dosfstools ]; }; } diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 082634ec9d010..4b6a5b6c12c14 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -584,17 +584,17 @@ in boot.initrd = mkIf inInitrd { kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; extraUtilsCommands = - '' + mkIf (!config.boot.initrd.systemd.enable) '' copy_bin_and_libs ${cfgZfs.package}/sbin/zfs copy_bin_and_libs ${cfgZfs.package}/sbin/zdb copy_bin_and_libs ${cfgZfs.package}/sbin/zpool ''; - extraUtilsCommandsTest = mkIf inInitrd - '' + extraUtilsCommandsTest = + mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/zfs --help >/dev/null 2>&1 $out/bin/zpool --help >/dev/null 2>&1 ''; - postDeviceCommands = concatStringsSep "\n" (['' + postDeviceCommands = mkIf (!config.boot.initrd.systemd.enable) (concatStringsSep "\n" (['' ZFS_FORCE="${optionalString cfgZfs.forceImportRoot "-f"}" ''] ++ [(importLib { # See comments at importLib definition. @@ -623,10 +623,10 @@ in else concatMapStrings (fs: '' zfs load-key -- ${escapeShellArg fs} '') (filter (x: datasetToPool x == pool) cfgZfs.requestEncryptionCredentials)} - '') rootPools)); + '') rootPools))); # Systemd in stage 1 - systemd = { + systemd = mkIf config.boot.initrd.systemd.enable { packages = [cfgZfs.package]; services = listToAttrs (map (pool: createImportService { inherit pool; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index da4aa916d655e..e1ac7f24cb320 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -28,12 +28,12 @@ let SLAVES=$(ip link | grep 'master ${i}' | awk -F: '{print $2}') for I in $SLAVES; do UPDATED=0 - ip link set "$I" nomaster + ip link set dev "$I" nomaster done [ "$UPDATED" -eq "1" ] && break done - ip link set "${i}" down 2>/dev/null || true - ip link del "${i}" 2>/dev/null || true + ip link set dev "${i}" down 2>/dev/null || true + ip link del dev "${i}" 2>/dev/null || true ''; # warn that these attributes are deprecated (2017-2-2) @@ -193,7 +193,7 @@ let state="/run/nixos/network/addresses/${i.name}" mkdir -p $(dirname "$state") - ip link set "${i.name}" up + ip link set dev "${i.name}" up ${flip concatMapStrings ips (ip: let @@ -270,7 +270,7 @@ let ip tuntap add dev "${i.name}" mode "${i.virtualType}" user "${i.virtualOwner}" ''; postStop = '' - ip link del ${i.name} || true + ip link del dev ${i.name} || true ''; }; @@ -291,15 +291,15 @@ let script = '' # Remove Dead Interfaces echo "Removing old bridge ${n}..." - ip link show dev "${n}" >/dev/null 2>&1 && ip link del "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link del dev "${n}" echo "Adding bridge ${n}..." ip link add name "${n}" type bridge # Enslave child interfaces ${flip concatMapStrings v.interfaces (i: '' - ip link set "${i}" master "${n}" - ip link set "${i}" up + ip link set dev "${i}" master "${n}" + ip link set dev "${i}" up '')} # Save list of enslaved interfaces echo "${flip concatMapStrings v.interfaces (i: '' @@ -316,7 +316,7 @@ let for uri in qemu:///system lxc:///; do for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do ${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \ - ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge,';')" | \ + ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set dev ',target/@dev,' master ',source/@bridge,';')" | \ ${pkgs.bash}/bin/bash done done @@ -328,23 +328,23 @@ let echo 2 >/sys/class/net/${n}/bridge/stp_state ''} - ip link set "${n}" up + ip link set dev "${n}" up ''; postStop = '' - ip link set "${n}" down || true - ip link del "${n}" || true + ip link set dev "${n}" down || true + ip link del dev "${n}" || true rm -f /run/${n}.interfaces ''; reload = '' # Un-enslave child interfaces (old list of interfaces) for interface in `cat /run/${n}.interfaces`; do - ip link set "$interface" nomaster up + ip link set dev "$interface" nomaster up done # Enslave child interfaces (new list of interfaces) ${flip concatMapStrings v.interfaces (i: '' - ip link set "${i}" master "${n}" - ip link set "${i}" up + ip link set dev "${i}" master "${n}" + ip link set dev "${i}" up '')} # Save list of enslaved interfaces echo "${flip concatMapStrings v.interfaces (i: '' @@ -395,7 +395,7 @@ let postStop = '' echo "Cleaning Open vSwitch ${n}" echo "Shutting down internal ${n} interface" - ip link set ${n} down || true + ip link set dev ${n} down || true echo "Deleting flows for ${n}" ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true echo "Deleting Open vSwitch ${n}" @@ -433,10 +433,10 @@ let while [ ! -d "/sys/class/net/${n}" ]; do sleep 0.1; done; # Bring up the bond and enslave the specified interfaces - ip link set "${n}" up + ip link set dev "${n}" up ${flip concatMapStrings v.interfaces (i: '' - ip link set "${i}" down - ip link set "${i}" master "${n}" + ip link set dev "${i}" down + ip link set dev "${i}" master "${n}" '')} ''; postStop = destroyBond n; @@ -457,13 +457,13 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete dev "${n}" ip link add link "${v.interface}" name "${n}" type macvlan \ ${optionalString (v.mode != null) "mode ${v.mode}"} - ip link set "${n}" up + ip link set dev "${n}" up ''; postStop = '' - ip link delete "${n}" || true + ip link delete dev "${n}" || true ''; }); @@ -515,7 +515,7 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete dev "${n}" ip link add name "${n}" type sit \ ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ ${optionalString (v.local != null) "local \"${v.local}\""} \ @@ -526,10 +526,10 @@ let optionalString (v.encapsulation.sourcePort != null) "encap-sport ${toString v.encapsulation.sourcePort}" }"} - ip link set "${n}" up + ip link set dev "${n}" up ''; postStop = '' - ip link delete "${n}" || true + ip link delete dev "${n}" || true ''; }); @@ -549,16 +549,16 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete dev "${n}" ip link add name "${n}" type ${v.type} \ ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ ${optionalString (v.local != null) "local \"${v.local}\""} \ ${optionalString (v.ttl != null) "${ttlarg} ${toString v.ttl}"} \ ${optionalString (v.dev != null) "dev \"${v.dev}\""} - ip link set "${n}" up + ip link set dev "${n}" up ''; postStop = '' - ip link delete "${n}" || true + ip link delete dev "${n}" || true ''; }); @@ -577,17 +577,17 @@ let path = [ pkgs.iproute2 ]; script = '' # Remove Dead Interfaces - ip link show dev "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link show dev "${n}" >/dev/null 2>&1 && ip link delete dev "${n}" ip link add link "${v.interface}" name "${n}" type vlan id "${toString v.id}" # We try to bring up the logical VLAN interface. If the master # interface the logical interface is dependent upon is not up yet we will # fail to immediately bring up the logical interface. The resulting logical # interface will brought up later when the master interface is up. - ip link set "${n}" up || true + ip link set dev "${n}" up || true ''; postStop = '' - ip link delete "${n}" || true + ip link delete dev "${n}" || true ''; }); diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index cee23eb244067..2009c9a7e6e28 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -442,7 +442,7 @@ in postStop = '' echo "Cleaning Open vSwitch ${n}" echo "Shutting down internal ${n} interface" - ip link set ${n} down || true + ip link set dev ${n} down || true echo "Deleting flows for ${n}" ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true echo "Deleting Open vSwitch ${n}" diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 853a2cb31432b..d976f9951bb55 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1406,18 +1406,12 @@ in val = tempaddrValues.${opt}.sysctl; in nameValuePair "net.ipv6.conf.${replaceStrings ["."] ["/"] i.name}.use_tempaddr" val)); - # Set the host and domain names in the activation script. Don't - # clear it if it's not configured in the NixOS configuration, - # since it may have been set by dhcpcd in the meantime. - system.activationScripts.hostname = let - effectiveHostname = config.boot.kernel.sysctl."kernel.hostname" or cfg.hostName; - in optionalString (effectiveHostname != "") '' - hostname "${effectiveHostname}" - ''; - system.activationScripts.domain = - optionalString (cfg.domain != null) '' - domainname "${cfg.domain}" - ''; + systemd.services.domainname = lib.mkIf (cfg.domain != null) { + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + serviceConfig.ExecStart = ''${pkgs.nettools}/bin/domainname "${cfg.domain}"''; + }; environment.etc.hostid = mkIf (cfg.hostId != null) { source = hostidFile; }; boot.initrd.systemd.contents."/etc/hostid" = mkIf (cfg.hostId != null) { source = hostidFile; }; diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index 61b3682e0f68e..249755bc0548c 100644 --- a/nixos/modules/tasks/swraid.nix +++ b/nixos/modules/tasks/swraid.nix @@ -62,13 +62,13 @@ in { cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/ ''; - extraUtilsCommands = '' + extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' # Add RAID mdadm tool. copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon ''; - extraUtilsCommandsTest = '' + extraUtilsCommandsTest = lib.mkIf (!config.boot.initrd.systemd.enable) '' $out/bin/mdadm --version ''; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index aa85665af6952..6fdb177b968b3 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -754,7 +754,7 @@ in { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql_14; - system.stateVersion = "21.05"; + system.stateVersion = "${lib.trivial.release}"; }; }; } @@ -906,4 +906,6 @@ in "tun" ]; }); + + meta.buildDocsInSandbox = false; } diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 149a924de4d09..9b4b92be6f3ac 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -97,6 +97,7 @@ in rec { (onSystems ["x86_64-linux"] "nixos.tests.installer.simpleUefiSystemdBoot") (onSystems ["x86_64-linux"] "nixos.tests.installer.simple") (onSystems ["x86_64-linux"] "nixos.tests.installer.swraid") + (onSystems ["x86_64-linux"] "nixos.tests.installer.zfsroot") (onSystems ["x86_64-linux"] "nixos.tests.nixos-rebuild-specialisations") (onFullSupported "nixos.tests.ipv6") (onFullSupported "nixos.tests.keymap.azerty") diff --git a/nixos/release.nix b/nixos/release.nix index 60f4cc94399c5..2acc5ade7848b 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -123,7 +123,7 @@ let build = configEvaled.config.system.build; kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.linux-kernel.target; in - pkgs.symlinkJoin { + configEvaled.pkgs.symlinkJoin { name = "netboot"; paths = [ build.netbootRamdisk @@ -398,7 +398,7 @@ in rec { modules = singleton ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; - system.stateVersion = mkDefault "18.03"; + system.stateVersion = mkDefault lib.trivial.release; }); }).config.system.build.toplevel; preferLocalBuild = true; diff --git a/nixos/tests/activation/nix-channel.nix b/nixos/tests/activation/nix-channel.nix new file mode 100644 index 0000000000000..8416ff0347aca --- /dev/null +++ b/nixos/tests/activation/nix-channel.nix @@ -0,0 +1,16 @@ +{ lib, ... }: + +{ + + name = "activation-nix-channel"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes.machine = { + nix.channel.enable = true; + }; + + testScript = '' + print(machine.succeed("cat /root/.nix-channels")) + ''; +} diff --git a/nixos/tests/activation/var.nix b/nixos/tests/activation/var.nix new file mode 100644 index 0000000000000..1a546a7671c54 --- /dev/null +++ b/nixos/tests/activation/var.nix @@ -0,0 +1,18 @@ +{ lib, ... }: + +{ + + name = "activation-var"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes.machine = { }; + + testScript = '' + assert machine.succeed("stat -c '%a' /var/tmp") == "1777\n" + assert machine.succeed("stat -c '%a' /var/empty") == "555\n" + assert machine.succeed("stat -c '%U' /var/empty") == "root\n" + assert machine.succeed("stat -c '%G' /var/empty") == "root\n" + assert "i" in machine.succeed("lsattr -d /var/empty") + ''; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3531930d863a8..2f6d5a8dae889 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -90,6 +90,14 @@ in { lib-extend = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nixos-test-driver/lib-extend.nix {}; node-name = runTest ./nixos-test-driver/node-name.nix; busybox = runTest ./nixos-test-driver/busybox.nix; + driver-timeout = pkgs.runCommand "ensure-timeout-induced-failure" { + failed = pkgs.testers.testBuildFailure ((runTest ./nixos-test-driver/timeout.nix).config.rawTestDerivation); + } '' + grep -F "timeout reached; test terminating" $failed/testBuildFailure.log + # The program will always be terminated by SIGTERM (143) if it waits for the deadline thread. + [[ 143 = $(cat $failed/testBuildFailure.exit) ]] + touch $out + ''; }; # NixOS vm tests and non-vm unit tests @@ -153,6 +161,7 @@ in { budgie = handleTest ./budgie.nix {}; buildbot = handleTest ./buildbot.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {}; + c2fmzq = handleTest ./c2fmzq.nix {}; caddy = handleTest ./caddy.nix {}; cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {}; cage = handleTest ./cage.nix {}; @@ -265,6 +274,8 @@ in { esphome = handleTest ./esphome.nix {}; etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; }; activation = pkgs.callPackage ../modules/system/activation/test.nix { }; + activation-var = runTest ./activation/var.nix; + activation-nix-channel = runTest ./activation/nix-channel.nix; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; etebase-server = handleTest ./etebase-server.nix {}; @@ -288,6 +299,7 @@ in { firewall-nftables = handleTest ./firewall.nix { nftables = true; }; fish = handleTest ./fish.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; + floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; }; fluentd = handleTest ./fluentd.nix {}; fluidd = handleTest ./fluidd.nix {}; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {}; @@ -327,6 +339,7 @@ in { gollum = handleTest ./gollum.nix {}; gonic = handleTest ./gonic.nix {}; google-oslogin = handleTest ./google-oslogin {}; + goss = handleTest ./goss.nix {}; gotify-server = handleTest ./gotify-server.nix {}; gotosocial = runTest ./web-apps/gotosocial.nix; grafana = handleTest ./grafana {}; @@ -577,6 +590,7 @@ in { node-red = handleTest ./node-red.nix {}; nomad = handleTest ./nomad.nix {}; non-default-filesystems = handleTest ./non-default-filesystems.nix {}; + non-switchable-system = runTest ./non-switchable-system.nix; noto-fonts = handleTest ./noto-fonts.nix {}; noto-fonts-cjk-qt-default-weight = handleTest ./noto-fonts-cjk-qt-default-weight.nix {}; novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; @@ -847,6 +861,7 @@ in { trezord = handleTest ./trezord.nix {}; trickster = handleTest ./trickster.nix {}; trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {}; + tsja = handleTest ./tsja.nix {}; tsm-client-gui = handleTest ./tsm-client-gui.nix {}; txredisapi = handleTest ./txredisapi.nix {}; tuptime = handleTest ./tuptime.nix {}; diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 11420cba9dcec..4a73fea6a09d0 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -148,7 +148,7 @@ in ) # Bring down the initial seeder. - # tracker.stop_job("transmission") + tracker.stop_job("transmission") # Now download from the second client. This can only succeed if # the first client created a NAT hole in the router. diff --git a/nixos/tests/c2fmzq.nix b/nixos/tests/c2fmzq.nix new file mode 100644 index 0000000000000..d8ec816c7d29c --- /dev/null +++ b/nixos/tests/c2fmzq.nix @@ -0,0 +1,75 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "c2FmZQ"; + meta.maintainers = with lib.maintainers; [ hmenke ]; + + nodes.machine = { + services.c2fmzq-server = { + enable = true; + port = 8080; + passphraseFile = builtins.toFile "pwfile" "hunter2"; # don't do this on real deployments + settings = { + verbose = 3; # debug + }; + }; + environment = { + sessionVariables = { + C2FMZQ_PASSPHRASE = "lol"; + C2FMZQ_API_SERVER = "http://localhost:8080"; + }; + systemPackages = [ + pkgs.c2fmzq + (pkgs.writeScriptBin "c2FmZQ-client-wrapper" '' + #!${pkgs.expect}/bin/expect -f + spawn c2FmZQ-client {*}$argv + expect { + "Enter password:" { send "$env(PASSWORD)\r" } + "Type YES to confirm:" { send "YES\r" } + timeout { exit 1 } + eof { exit 0 } + } + interact + '') + ]; + }; + }; + + testScript = { nodes, ... }: '' + machine.start() + machine.wait_for_unit("c2fmzq-server.service") + machine.wait_for_open_port(8080) + + with subtest("Create accounts for alice and bob"): + machine.succeed("PASSWORD=foobar c2FmZQ-client-wrapper -- -v 3 create-account alice@example.com") + machine.succeed("PASSWORD=fizzbuzz c2FmZQ-client-wrapper -- -v 3 create-account bob@example.com") + + with subtest("Log in as alice"): + machine.succeed("PASSWORD=foobar c2FmZQ-client-wrapper -- -v 3 login alice@example.com") + msg = machine.succeed("c2FmZQ-client -v 3 status") + assert "Logged in as alice@example.com" in msg, f"ERROR: Not logged in as alice:\n{msg}" + + with subtest("Create a new album, upload a file, and delete the uploaded file"): + machine.succeed("c2FmZQ-client -v 3 create-album 'Rarest Memes'") + machine.succeed("echo 'pls do not steal' > meme.txt") + machine.succeed("c2FmZQ-client -v 3 import meme.txt 'Rarest Memes'") + machine.succeed("c2FmZQ-client -v 3 sync") + machine.succeed("rm meme.txt") + + with subtest("Share the album with bob"): + machine.succeed("c2FmZQ-client-wrapper -- -v 3 share 'Rarest Memes' bob@example.com") + + with subtest("Log in as bob"): + machine.succeed("PASSWORD=fizzbuzz c2FmZQ-client-wrapper -- -v 3 login bob@example.com") + msg = machine.succeed("c2FmZQ-client -v 3 status") + assert "Logged in as bob@example.com" in msg, f"ERROR: Not logged in as bob:\n{msg}" + + with subtest("Download the shared file"): + machine.succeed("c2FmZQ-client -v 3 download 'shared/Rarest Memes/meme.txt'") + machine.succeed("c2FmZQ-client -v 3 export 'shared/Rarest Memes/meme.txt' .") + msg = machine.succeed("cat meme.txt") + assert "pls do not steal\n" == msg, f"File content is not the same:\n{msg}" + + with subtest("Test that PWA is served"): + msg = machine.succeed("curl -sSfL http://localhost:8080") + assert "c2FmZQ" in msg, f"Could not find 'c2FmZQ' in the output:\n{msg}" + ''; +}) diff --git a/nixos/tests/common/auto-format-root-device.nix b/nixos/tests/common/auto-format-root-device.nix index 56eecef2f4110..fef8c70049913 100644 --- a/nixos/tests/common/auto-format-root-device.nix +++ b/nixos/tests/common/auto-format-root-device.nix @@ -5,19 +5,19 @@ # `virtualisation.fileSystems."/".autoFormat = true;` # instead. -{ config, pkgs, ... }: +{ lib, config, pkgs, ... }: let rootDevice = config.virtualisation.rootDevice; in { - boot.initrd.extraUtilsCommands = '' + boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' # We need mke2fs in the initrd. copy_bin_and_libs ${pkgs.e2fsprogs}/bin/mke2fs ''; - boot.initrd.postDeviceCommands = '' + boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' # If the disk image appears to be empty, run mke2fs to # initialise. FSTYPE=$(blkid -o value -s TYPE ${rootDevice} || true) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 22b664a90e170..18bec1db78e88 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -21,9 +21,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { modules = lib.singleton { nixpkgs = { inherit (config.nixpkgs) localSystem; }; - containers.foo.config = { - system.stateVersion = "18.03"; - }; + containers.foo.config = {}; }; # The system is inherited from the host above. diff --git a/nixos/tests/goss.nix b/nixos/tests/goss.nix new file mode 100644 index 0000000000000..6b772d19215e3 --- /dev/null +++ b/nixos/tests/goss.nix @@ -0,0 +1,53 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "goss"; + meta.maintainers = [ lib.maintainers.anthonyroussel ]; + + nodes.machine = { + environment.systemPackages = [ pkgs.jq ]; + + services.goss = { + enable = true; + + environment = { + GOSS_FMT = "json"; + }; + + settings = { + addr."tcp://localhost:8080" = { + reachable = true; + local-address = "127.0.0.1"; + }; + command."check-goss-version" = { + exec = "${lib.getExe pkgs.goss} --version"; + exit-status = 0; + }; + dns.localhost.resolvable = true; + file."/nix" = { + filetype = "directory"; + exists = true; + }; + group.root.exists = true; + kernel-param."kernel.ostype".value = "Linux"; + service.goss = { + enabled = true; + running = true; + }; + user.root.exists = true; + }; + }; + }; + + testScript = '' + import json + + machine.wait_for_unit("goss.service") + machine.wait_for_open_port(8080) + + with subtest("returns health status"): + result = json.loads(machine.succeed("curl -sS http://localhost:8080/healthz")) + + assert len(result["results"]) == 10, f".results should be an array of 10 items, was {result['results']!r}" + assert result["summary"]["failed-count"] == 0, f".summary.failed-count should be zero, was {result['summary']['failed-count']}" + assert result["summary"]["test-count"] == 10, f".summary.test-count should be 10, was {result['summary']['test-count']}" + ''; +}) diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 96378452ade31..d33d16ce12099 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -22,15 +22,14 @@ let }; }; - system.activationScripts.setup-grafana = { - deps = [ "users" ]; - text = '' - mkdir -p /var/lib/grafana/dashboards - chown -R grafana:grafana /var/lib/grafana - chmod 0700 -R /var/lib/grafana/dashboards - cp ${pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json)} /var/lib/grafana/dashboards/ - ''; - }; + systemd.tmpfiles.rules = + let + dashboard = pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json); + in + [ + "d /var/lib/grafana/dashboards 0700 grafana grafana -" + "C+ /var/lib/grafana/dashboards/test.json - - - - ${dashboard}" + ]; }; extraNodeConfs = { diff --git a/nixos/tests/installer-systemd-stage-1.nix b/nixos/tests/installer-systemd-stage-1.nix index 85155a6c682b3..1b4c92b584b95 100644 --- a/nixos/tests/installer-systemd-stage-1.nix +++ b/nixos/tests/installer-systemd-stage-1.nix @@ -8,15 +8,17 @@ # them when fixed. inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; }) # bcache + bcachefsSimple + bcachefsEncrypted btrfsSimple btrfsSubvolDefault btrfsSubvolEscape btrfsSubvols - # encryptedFSWithKeyfile + encryptedFSWithKeyfile # grub1 - # luksroot - # luksroot-format1 - # luksroot-format2 + luksroot + luksroot-format1 + luksroot-format2 # lvm separateBoot separateBootFat diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 9ff1d8f5d039e..1baa4396424fb 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -515,7 +515,7 @@ let enableOCR = true; preBootCommands = '' machine.start() - machine.wait_for_text("Passphrase for") + machine.wait_for_text("[Pp]assphrase for") machine.send_chars("supersecret\n") ''; }; @@ -781,7 +781,7 @@ in { encrypted.enable = true; encrypted.blkDev = "/dev/vda3"; encrypted.label = "crypt"; - encrypted.keyFile = "/mnt-root/keyfile"; + encrypted.keyFile = "/${if systemdStage1 then "sysroot" else "mnt-root"}/keyfile"; }; ''; }; @@ -937,6 +937,10 @@ in { enableOCR = true; preBootCommands = '' machine.start() + # Enter it wrong once + machine.wait_for_text("enter passphrase for ") + machine.send_chars("wrong\n") + # Then enter it right. machine.wait_for_text("enter passphrase for ") machine.send_chars("password\n") ''; diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index c5f7294f79abc..e3438f63404e7 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -30,8 +30,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { # check if netdata can read disk ops for root owned processes. # if > 0, successful. verifies both netdata working and # apps.plugin has elevated capabilities. - url = "http://localhost:19999/api/v1/data\?chart=users.pwrites" - filter = '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0' + url = "http://localhost:19999/api/v1/data\?chart=user.root_disk_physical_io" + filter = '[.data[range(10)][2]] | add | . < 0' cmd = f"curl -s {url} | jq -e '{filter}'" netdata.wait_until_succeeds(cmd) diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index b7af6d6d73647..ab1d8353dba0b 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -37,8 +37,6 @@ in { "d /var/lib/nextcloud-data 0750 nextcloud nginx - -" ]; - system.stateVersion = "22.11"; # stateVersion >=21.11 to make sure that we use OpenSSL3 - services.nextcloud = { enable = true; datadir = "/var/lib/nextcloud-data"; diff --git a/nixos/tests/nixos-test-driver/timeout.nix b/nixos/tests/nixos-test-driver/timeout.nix new file mode 100644 index 0000000000000..29bd85d2498ea --- /dev/null +++ b/nixos/tests/nixos-test-driver/timeout.nix @@ -0,0 +1,15 @@ +{ + name = "Test that sleep of 6 seconds fails a timeout of 5 seconds"; + globalTimeout = 5; + + nodes = { + machine = ({ pkgs, ... }: { + }); + }; + + testScript = '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.succeed("sleep 6") + ''; +} diff --git a/nixos/tests/non-switchable-system.nix b/nixos/tests/non-switchable-system.nix new file mode 100644 index 0000000000000..54bede75453ba --- /dev/null +++ b/nixos/tests/non-switchable-system.nix @@ -0,0 +1,15 @@ +{ lib, ... }: + +{ + name = "non-switchable-system"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes.machine = { + system.switch.enable = false; + }; + + testScript = '' + machine.succeed("test ! -e /run/current-system/bin/switch-to-configuration") + ''; +} diff --git a/nixos/tests/opensearch.nix b/nixos/tests/opensearch.nix index c0caf950cb9c9..2887ac9677656 100644 --- a/nixos/tests/opensearch.nix +++ b/nixos/tests/opensearch.nix @@ -31,14 +31,9 @@ in services.opensearch.dataDir = "/var/opensearch_test"; services.opensearch.user = "open_search"; services.opensearch.group = "open_search"; - system.activationScripts.createDirectory = { - text = '' - mkdir -p "/var/opensearch_test" - chown open_search:open_search /var/opensearch_test - chmod 0700 /var/opensearch_test - ''; - deps = [ "users" "groups" ]; - }; + systemd.tmpfiles.rules = [ + "d /var/opensearch_test 0700 open_search open_search -" + ]; users = { groups.open_search = {}; users.open_search = { diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 88d3e54ee76cb..881eb9d7d91c5 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -82,6 +82,19 @@ in { }; }; + server_allowedusers = + { ... }: + + { + services.openssh = { enable = true; settings.AllowUsers = [ "alice" "bob" ]; }; + users.groups = { alice = { }; bob = { }; carol = { }; }; + users.users = { + alice = { isNormalUser = true; group = "alice"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; + bob = { isNormalUser = true; group = "bob"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; + carol = { isNormalUser = true; group = "carol"; openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; }; + }; + }; + client = { ... }: { }; @@ -147,5 +160,23 @@ in { with subtest("match-rules"): server_match_rule.succeed("ss -nlt | grep '127.0.0.1:22'") + + with subtest("allowed-users"): + client.succeed( + "cat ${snakeOilPrivateKey} > privkey.snakeoil" + ) + client.succeed("chmod 600 privkey.snakeoil") + client.succeed( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil alice@server_allowedusers true", + timeout=30 + ) + client.succeed( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil bob@server_allowedusers true", + timeout=30 + ) + client.fail( + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil carol@server_allowedusers true", + timeout=30 + ) ''; }) diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix index 3b9ea2f85b1ed..54fdc1d3995ca 100644 --- a/nixos/tests/restic.nix +++ b/nixos/tests/restic.nix @@ -21,7 +21,10 @@ import ./make-test-python.nix ( unpackPhase = "true"; installPhase = '' mkdir $out - touch $out/some_file + echo some_file > $out/some_file + echo some_other_file > $out/some_other_file + mkdir $out/a_dir + echo a_file > $out/a_dir/a_file ''; }; @@ -53,9 +56,13 @@ import ./make-test-python.nix ( initialize = true; }; remote-from-file-backup = { - inherit passwordFile paths exclude pruneOpts; + inherit passwordFile exclude pruneOpts; initialize = true; repositoryFile = pkgs.writeText "repositoryFile" remoteFromFileRepository; + paths = [ "/opt/a_dir" ]; + dynamicFilesFrom = '' + find /opt -mindepth 1 -maxdepth 1 ! -name a_dir # all files in /opt except for a_dir + ''; }; rclonebackup = { inherit passwordFile paths exclude pruneOpts; @@ -123,13 +130,18 @@ import ./make-test-python.nix ( "systemctl start restic-backups-remote-from-file-backup.service", 'restic-remote-from-file-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + # test that restoring that snapshot produces the same directory + "mkdir /tmp/restore-2", + "${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} restore latest -t /tmp/restore-2", + "diff -ru ${testDir} /tmp/restore-2/opt", + # test that rclonebackup produces a snapshot "systemctl start restic-backups-rclonebackup.service", 'restic-rclonebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', # test that custompackage runs both `restic backup` and `restic check` with reasonable commandlines "systemctl start restic-backups-custompackage.service", - "grep 'backup.* /opt' /root/fake-restic.log", + "grep 'backup' /root/fake-restic.log", "grep 'check.* --some-check-option' /root/fake-restic.log", # test that we can create four snapshots in remotebackup and rclonebackup diff --git a/nixos/tests/sslh.nix b/nixos/tests/sslh.nix index 17094606e8e6b..30ffd389d4422 100644 --- a/nixos/tests/sslh.nix +++ b/nixos/tests/sslh.nix @@ -10,21 +10,13 @@ import ./make-test-python.nix { prefixLength = 64; } ]; - # sslh is really slow when reverse dns does not work - networking.hosts = { - "fe00:aa:bb:cc::2" = [ "server" ]; - "fe00:aa:bb:cc::1" = [ "client" ]; - }; services.sslh = { enable = true; - transparent = true; - appendConfig = '' - protocols: - ( - { name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; }, - { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; }, - ); - ''; + settings.transparent = true; + settings.protocols = [ + { name = "ssh"; service = "ssh"; host = "localhost"; port = "22"; probe = "builtin"; } + { name = "http"; host = "localhost"; port = "80"; probe = "builtin"; } + ]; }; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keyFiles = [ ./initrd-network-ssh/id_ed25519.pub ]; diff --git a/nixos/tests/stunnel.nix b/nixos/tests/stunnel.nix index 22c087290fc7b..07fba435d4df6 100644 --- a/nixos/tests/stunnel.nix +++ b/nixos/tests/stunnel.nix @@ -17,11 +17,16 @@ let }; }; makeCert = { config, pkgs, ... }: { - system.activationScripts.create-test-cert = stringAfter [ "users" ] '' - ${pkgs.openssl}/bin/openssl req -batch -x509 -newkey rsa -nodes -out /test-cert.pem -keyout /test-key.pem -subj /CN=${config.networking.hostName} - ( umask 077; cat /test-key.pem /test-cert.pem > /test-key-and-cert.pem ) - chown stunnel /test-key.pem /test-key-and-cert.pem + systemd.services.create-test-cert = { + wantedBy = [ "sysinit.target" ]; + before = [ "sysinit.target" ]; + unitConfig.DefaultDependencies = false; + script = '' + ${pkgs.openssl}/bin/openssl req -batch -x509 -newkey rsa -nodes -out /test-cert.pem -keyout /test-key.pem -subj /CN=${config.networking.hostName} + ( umask 077; cat /test-key.pem /test-cert.pem > /test-key-and-cert.pem ) + chown stunnel /test-key.pem /test-key-and-cert.pem ''; + }; }; serverCommon = { pkgs, ... }: { networking.firewall.allowedTCPPorts = [ 443 ]; diff --git a/nixos/tests/systemd-timesyncd.nix b/nixos/tests/systemd-timesyncd.nix index 43abd36c47d97..f38d06be1516e 100644 --- a/nixos/tests/systemd-timesyncd.nix +++ b/nixos/tests/systemd-timesyncd.nix @@ -15,12 +15,13 @@ in { # create the path that should be migrated by our activation script when # upgrading to a newer nixos version system.stateVersion = "19.03"; - system.activationScripts.simulate-old-timesync-state-dir = lib.mkBefore '' - rm -f /var/lib/systemd/timesync - mkdir -p /var/lib/systemd /var/lib/private/systemd/timesync - ln -s /var/lib/private/systemd/timesync /var/lib/systemd/timesync - chown systemd-timesync: /var/lib/private/systemd/timesync - ''; + systemd.tmpfiles.rules = [ + "r /var/lib/systemd/timesync -" + "d /var/lib/systemd -" + "d /var/lib/private/systemd/timesync -" + "L /var/lib/systemd/timesync - - - - /var/lib/private/systemd/timesync" + "d /var/lib/private/systemd/timesync - systemd-timesync systemd-timesync -" + ]; }); }; diff --git a/nixos/tests/tsja.nix b/nixos/tests/tsja.nix new file mode 100644 index 0000000000000..176783088d8d5 --- /dev/null +++ b/nixos/tests/tsja.nix @@ -0,0 +1,32 @@ +import ./make-test-python.nix ({ pkgs, lib, ...} : { + name = "tsja"; + meta = { + maintainers = with lib.maintainers; [ chayleaf ]; + }; + + nodes = { + master = + { config, ... }: + + { + services.postgresql = { + enable = true; + extraPlugins = with config.services.postgresql.package.pkgs; [ + tsja + ]; + }; + }; + }; + + testScript = '' + start_all() + master.wait_for_unit("postgresql") + master.succeed("sudo -u postgres psql -f /run/current-system/sw/share/postgresql/extension/libtsja_dbinit.sql") + # make sure "日本語" is parsed as a separate lexeme + master.succeed(""" + sudo -u postgres \\ + psql -c "SELECT * FROM ts_debug('japanese', 'PostgreSQLで日本語のテキスト検索ができます。')" \\ + | grep "{日本語}" + """) + ''; +}) diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 2df1a5b6e8c35..9620e9188cbf5 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -66,6 +66,9 @@ import ./make-test-python.nix ({ pkgs, ...} : { machine.succeed("su - ${user.name} -c 'DISPLAY=:0 thunar >&2 &'") machine.wait_for_window("Thunar") machine.wait_for_text('(Pictures|Public|Templates|Videos)') + + with subtest("Check if any coredumps are found"): + machine.succeed("(coredumpctl --json=short 2>&1 || true) | grep 'No coredumps found'") machine.sleep(10) machine.screenshot("screen") ''; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index a0ca97a580ff7..6b001ce85ae62 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -14,15 +14,19 @@ , fftw , fftwSinglePrec , flac +, fluidsynth , glibc , glibmm , graphviz , gtkmm2 , harvid +, hidapi , itstool +, kissfft , libarchive , libjack2 , liblo +, libltc , libogg , libpulseaudio , librdf_raptor @@ -43,6 +47,7 @@ , perl , pkg-config , python3 +, qm-dsp , readline , rubberband , serd @@ -59,14 +64,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "8.0"; + version = "8.1"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-ZL8aTq2OsCWwLUUx5XYbH4eRN+Xz+oMAj9IS07RfTag="; + hash = "sha256-T1o1E5+974dNUwEFW/Pw0RzbGifva2FdJPrCusWMk0E="; }; bundledContent = fetchzip { @@ -116,12 +121,16 @@ stdenv.mkDerivation rec { fftw fftwSinglePrec flac + fluidsynth glibmm gtkmm2 + hidapi itstool + kissfft libarchive libjack2 liblo + libltc libogg libpulseaudio librdf_raptor @@ -140,6 +149,7 @@ stdenv.mkDerivation rec { pango perl python3 + qm-dsp readline rubberband serd @@ -159,9 +169,8 @@ stdenv.mkDerivation rec { "--ptformat" "--run-tests" "--test" + "--use-external-libs" ] ++ lib.optional optimize "--optimize"; - # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437 - # "--use-external-libs" postInstall = '' # wscript does not install these for some reason @@ -198,7 +207,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ardour.org/"; license = licenses.gpl2Plus; - mainProgram = "ardour7"; + mainProgram = "ardour8"; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu magnetophon mitchmindtree ]; }; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 9591cc6137d08..d1540fd1cea04 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.0.9"; + version = "5.0.11"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-B6s8FuNvJ3NdU7uZ+AsZkiFf9p6WcLzoZPsfzors1kk="; + sha256 = "sha256-c9bRWVWCC9hLxmko6EHgxgmghrxskJP4PQf3ld2BHoY="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix deleted file mode 100644 index a5d1a783b4124..0000000000000 --- a/pkgs/applications/audio/cadence/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ lib -, libjack2 -, fetchpatch -, fetchFromGitHub -, jack_capture -, pkg-config -, pulseaudioFull -, qtbase -, mkDerivation -, python3 -}: -#ladish missing, claudia can't work. -#pulseaudio needs fixes (patchShebangs .pa ...) -#desktop needs icons and exec fixing. - -mkDerivation rec { - version = "0.9.1"; - pname = "cadence"; - - src = fetchFromGitHub { - owner = "falkTX"; - repo = "Cadence"; - rev = "v${version}"; - sha256 = "sha256-QFC4wiVF8wphhrammxtc+VMZJpXY5OGHs6DNa21+6B8="; - }; - - patches = [ - # Fix installation without DESTDIR - (fetchpatch { - url = "https://github.com/falkTX/Cadence/commit/1fd3275e7daf4b75f59ef1f85a9e2e93bd5c0731.patch"; - sha256 = "0q791jsh8vmjg678dzhbp1ykq8xrrlxl1mbgs3g8if1ccj210vd8"; - }) - # Fix build with Qt 5.15 - (fetchpatch { - url = "https://github.com/falkTX/Cadence/commit/c167f35fbb76c4246c730b29262a59da73010412.patch"; - sha256 = "1gm9q6gx03sla5vcnisznc95pjdi2703f8b3mj2kby9rfx2pylyh"; - }) - ]; - - postPatch = '' - libjackso=$(realpath ${lib.makeLibraryPath [libjack2]}/libjack.so.0); - substituteInPlace ./src/jacklib.py --replace libjack.so.0 $libjackso - substituteInPlace ./src/cadence.py --replace "/usr/bin/pulseaudio" \ - "${lib.makeBinPath[pulseaudioFull]}/pulseaudio" - substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso - ''; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - qtbase - jack_capture - pulseaudioFull - ( - (python3.withPackages (ps: with ps; [ - pyqt5 - dbus-python - ])) - ) - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "SYSCONFDIR=${placeholder "out"}/etc" - ]; - - dontWrapQtApps = true; - - # Replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise. - preFixup = - let - outRef = placeholder "out"; - prefix = "${outRef}/share/cadence/src"; - scriptAndSource = lib.mapAttrs' - (script: source: - lib.nameValuePair ("${outRef}/bin/" + script) ("${prefix}/" + source) - ) - { - "cadence" = "cadence.py"; - "claudia" = "claudia.py"; - "catarina" = "catarina.py"; - "catia" = "catia.py"; - "cadence-jacksettings" = "jacksettings.py"; - "cadence-aloop-daemon" = "cadence_aloop_daemon.py"; - "cadence-logs" = "logs.py"; - "cadence-render" = "render.py"; - "claudia-launcher" = "claudia_launcher.py"; - "cadence-session-start" = "cadence_session_start.py"; - }; - in - lib.mapAttrsToList - (script: source: '' - rm -f ${script} - makeQtWrapper ${source} ${script} \ - --prefix PATH : "${lib.makeBinPath [ - jack_capture # cadence-render - pulseaudioFull # cadence, cadence-session-start - ]}" - '') - scriptAndSource; - - meta = { - homepage = "https://github.com/falkTX/Cadence/"; - description = "Collection of tools useful for audio production"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "cadence"; - }; -} diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index a3f859ca0ea4b..88d0931ca1045 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config +{ config, lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config , libiconv, CoreAudio, AudioUnit, VideoToolbox , alsaSupport ? stdenv.isLinux, alsa-lib ? null @@ -101,7 +101,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ha0bIh3SYMhA28YXQ//Loaz9J1lTJAzjTx8eK3AqUjM="; }; - patches = [ ./option-debugging.patch ]; + patches = [ + ./option-debugging.patch + # ffmpeg 6 fix https://github.com/cmus/cmus/pull/1254/ + (fetchpatch { url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch"; hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA="; }) + ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] diff --git a/pkgs/applications/audio/elektroid/default.nix b/pkgs/applications/audio/elektroid/default.nix new file mode 100644 index 0000000000000..c76ba7f1c6e52 --- /dev/null +++ b/pkgs/applications/audio/elektroid/default.nix @@ -0,0 +1,53 @@ +{ alsa-lib +, autoreconfHook +, fetchFromGitHub +, gtk3 +, json-glib +, lib +, libpulseaudio +, libsamplerate +, libsndfile +, libzip +, pkg-config +, stdenv +, zlib +}: + +let + version = "2.5.2"; +in +stdenv.mkDerivation { + inherit version; + + pname = "elektroid"; + + src = fetchFromGitHub { + owner = "dagargo"; + repo = "elektroid"; + rev = version; + sha256 = "sha256-wpPHcrlCX7RD/TGH2Xrth+oCg98gMm035tfTBV70P+Y="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + alsa-lib + gtk3 + json-glib + libpulseaudio + libsamplerate + libsndfile + libzip + zlib + ]; + + meta = with lib; { + description = "Sample and MIDI device manager"; + homepage = "https://github.com/dagargo/elektroid"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ camelpunch ]; + }; +} diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index b393041eeb12f..a45853ad98f32 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.13"; + version = "2.5.16"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-Tgb9UYj8mI4JsxA/PaTokm2NzQ14P8cOdKK8KCcnSIQ="; + sha256 = "sha256-O3IWx6Ht/xcb8NFxI7Biwck3dIHbxyof/zDgYDdzozY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 3033888996a19..3a650646a8ae7 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , fetchpatch , avahi @@ -50,6 +51,12 @@ stdenv.mkDerivation rec { sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg="; }; + # doesnt apply cleanly, so doing with substituteInPlace + # https://github.com/brummer10/guitarix/commit/39d7c21c4173eb0f121b1bbff439d9cf43331a00.patch + postPatch = '' + substituteInPlace wscript --replace "open(src_fname, 'rU')" "open(src_fname, 'r')" + ''; + nativeBuildInputs = [ gettext hicolor-icon-theme diff --git a/pkgs/applications/audio/mus/Cargo.lock b/pkgs/applications/audio/mus/Cargo.lock deleted file mode 100644 index c9d036eea308b..0000000000000 --- a/pkgs/applications/audio/mus/Cargo.lock +++ /dev/null @@ -1,382 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[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 = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bufstream" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "clap" -version = "4.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" -dependencies = [ - "bitflags", - "clap_derive", - "clap_lex", - "is-terminal", - "once_cell", - "strsim", - "termcolor", -] - -[[package]] -name = "clap_derive" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "io-lifetimes" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "mpd" -version = "0.1.0" -source = "git+https://github.com/kstep/rust-mpd?rev=e8b5c3d#e8b5c3d67bb602960aa21910430380d6626b3be7" -dependencies = [ - "bufstream", -] - -[[package]] -name = "mus" -version = "0.1.0" -dependencies = [ - "clap", - "colored", - "mpd", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[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", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rustix" -version = "0.36.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/pkgs/applications/audio/mus/default.nix b/pkgs/applications/audio/mus/default.nix index 402b0b70c1edb..1235486ab554e 100644 --- a/pkgs/applications/audio/mus/default.nix +++ b/pkgs/applications/audio/mus/default.nix @@ -2,21 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mus"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromSourcehut { owner = "~sfr"; repo = pname; rev = version; - hash = "sha256-s7rizOieOmzK0Stkk1SWe9h/5DoaH6MMmL/5QFeezt0="; + hash = "sha256-yvMV+lhU9Wtwrhw0RKRUNFNznvZP0zcnT6jqPaqzhUs="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "mpd-0.1.0" = "sha256-5UC6aFNJU9B5AlgJ7uPO+W7e2MHpvTu2OpktjiIXMfc="; - }; - }; + cargoHash = "sha256-K9B8y9pOHcAOrUCmCB0zW2wy81DTF3K97gPYmAiKwAM="; meta = with lib; { description = "a pretty good mpd client"; diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix index 60226952820dc..0f302bc72e5da 100644 --- a/pkgs/applications/audio/pipecontrol/default.nix +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pipecontrol"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitHub { owner = "portaloffreedom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MSm9rW41x8qvPuDermOPIYpxgblk5hlKIQsUEAvCzMo="; + sha256 = "sha256-jMP8hPv0Rv/OIVIzR/5R8LmEcyzwtcof9Ire86WtISc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index bc384f68a676e..c7a6bd89328fd 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - version = "0.9.11"; + version = "0.9.12"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally @@ -14,7 +14,7 @@ mkDerivation rec { owner = "rncbc"; repo = "qjackctl"; rev = "${pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-dZW9bZ17O/1DxBr5faYSE+YkSuz7NIJSc1vqxzOOxyg="; + sha256 = "sha256-S8fEg8joFHgk6MKWeSxPyTM8O6Ffx5NG90OabPPDs7s="; }; buildInputs = [ diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 8cf233c37f70d..f82043c8dc5b3 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "23.6"; + version = "23.8"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-3oh2kFhCYe1sl4MN336Z6pEmpluiUnlcC5aAZxn0zIE="; + sha256 = "sha256-g2+7i1+TgX17TpW1mHSdAzHKC/Gtm4NYZCmuVoPo2rg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index df05a7cdec60f..74e488e436dff 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -25,6 +25,7 @@ , boost , aubio , jack2 +, jack-example-tools , supercollider-with-sc3-plugins , parallel @@ -187,14 +188,14 @@ stdenv.mkDerivation rec { preFixup = '' # Wrap Qt GUI (distributed binary) wrapQtApp $out/bin/sonic-pi \ - --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 ]} + --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools ]} # If ImGui was built if [ -e $out/app/build/gui/imgui/sonic-pi-imgui ]; then # Wrap ImGui into bin makeWrapper $out/app/build/gui/imgui/sonic-pi-imgui $out/bin/sonic-pi-imgui \ --inherit-argv0 \ - --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 ]} + --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 jack-example-tools ]} fi # Remove runtime Erlang references diff --git a/pkgs/applications/audio/vgmstream/default.nix b/pkgs/applications/audio/vgmstream/default.nix index f696c50618641..6b5e6460172dd 100644 --- a/pkgs/applications/audio/vgmstream/default.nix +++ b/pkgs/applications/audio/vgmstream/default.nix @@ -1,21 +1,23 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config , mpg123, ffmpeg, libvorbis, libao, jansson, speex +, nix-update-script }: -let - vgmstreamVersion = "r1702-5596-00bdb165b"; -in + stdenv.mkDerivation rec { pname = "vgmstream"; - version = "unstable-2022-02-21"; + version = "1879"; src = fetchFromGitHub { owner = "vgmstream"; repo = "vgmstream"; - rev = "00bdb165ba6b55420bbd5b21f54c4f7a825d15a0"; - sha256 = "18g1yqlnf48hi2xn2z2wajnjljpdbfdqmcmi7y8hi1r964ypmfcr"; + rev = "refs/tags/r${version}"; + sha256 = "sha256-m7M9oIEym/jzuw2HAbjdF6fZsfTew1KK0g1D4SePiiE="; }; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { + attrPath = "vgmstream"; + extraArgs = [ "--version-regex" "r(.*)" ]; + }; nativeBuildInputs = [ cmake pkg-config ]; @@ -28,10 +30,6 @@ stdenv.mkDerivation rec { "-DUSE_CELT=OFF" ]; - postConfigure = '' - echo "#define VGMSTREAM_VERSION \"${vgmstreamVersion}\"" > ../version.h - ''; - meta = with lib; { description = "A library for playback of various streamed audio formats used in video games"; homepage = "https://vgmstream.org"; diff --git a/pkgs/applications/audio/vgmstream/update.sh b/pkgs/applications/audio/vgmstream/update.sh deleted file mode 100755 index 5353480dd335c..0000000000000 --- a/pkgs/applications/audio/vgmstream/update.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p gnused jq nix-prefetch-git curl cacert - -set -euo pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -if [[ ! "$(basename $ROOT)" == "vgmstream" || ! -f "$ROOT/default.nix" ]]; then - echo "ERROR: Not in the vgmstream folder" - exit 1 -fi - -if [[ ! -v GITHUB_TOKEN ]]; then - echo "ERROR: \$GITHUB_TOKEN not set" - exit 1 -fi - - -payload=$(jq -cn --rawfile query /dev/stdin '{"query": $query}' <<EOF | curl -s -H "Authorization: bearer $GITHUB_TOKEN" -d '@-' https://api.github.com/graphql -{ - repository(owner: "vgmstream", name: "vgmstream") { - branch: ref(qualifiedName: "refs/heads/master") { - target { - oid - ... on Commit { - committedDate - history { - totalCount - } - } - } - } - - tag: refs(refPrefix: "refs/tags/", first: 1, orderBy: {field: TAG_COMMIT_DATE, direction: DESC}) { - nodes { - name - } - } - } -} -EOF -) - -committed_full_date=$(jq -r .data.repository.branch.target.committedDate <<< "$payload") -committed_date=$(sed -nE 's/^([0-9]{4}-[0-9]{2}-[0-9]{2}).+$/\1/p' <<< $committed_full_date) -commit_unix=$(date --utc --date="$committed_date" +%s) -last_updated_unix=$(date --utc --date=$(sed -nE 's/^\s*version\s*=\s*\"unstable-([0-9]{4}-[0-9]{2}-[0-9]{2})\";$/\1/p' default.nix) +%s) - -commit_sha=$(jq -r .data.repository.branch.target.oid <<< "$payload") -major_ver=$(jq -r .data.repository.tag.nodes[0].name <<< "$payload" | sed 's/^v//g') -commit_count=$(jq -r .data.repository.branch.target.history.totalCount <<< "$payload") -final_ver="$major_ver-$commit_count-${commit_sha::9}" - - -echo "INFO: Latest commit is $commit_sha" -echo "INFO: Latest commit date is $committed_full_date" -echo "INFO: Latest version is $final_ver" - -## -# VGMStream has no stable releases, so only update if there's been at -# least a week between commits to reduce maintainer pressure. -## -time_diff=$(( $commit_unix - $last_updated_unix )) -if [[ $time_diff -lt 604800 ]]; then - echo "INFO: Not updating, less than a week between commits." - echo "INFO: $time_diff < 604800" - exit 0 -fi - -nix_sha256=$(nix-prefetch-git --quiet https://github.com/vgmstream/vgmstream.git "$commit_sha" | jq -r .sha256) -echo "INFO: SHA256 is $nix_sha256" - -sed -i -E \ - -e "s/vgmstreamVersion\s*=\s*\"[a-z0-9-]+\";$/vgmstreamVersion = \"${final_ver}\";/g" \ - -e "s/version\s*=\s*\"[a-z0-9-]+\";$/version = \"unstable-${committed_date}\";/g" \ - -e "s/rev\s*=\s*\"[a-z0-9]+\";$/rev = \"${commit_sha}\";/g" \ - -e "s/sha256\s*=\s*\"[a-z0-9]+\";$/sha256 = \"${nix_sha256}\";/g" \ - "$ROOT/default.nix" diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 3ebcb823acba5..18e6ba9e5c12a 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -4,6 +4,7 @@ , makeWrapper , electron_25 , python3 +, stdenv , copyDesktopItems , makeDesktopItem }: @@ -22,10 +23,11 @@ let electron = electron_25; in -buildNpmPackage rec { +buildNpmPackage { inherit pname version src; - nativeBuildInputs = [ makeWrapper python3 copyDesktopItems ]; + nativeBuildInputs = [ makeWrapper python3 ] + ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; npmDepsHash = "sha256-XGV0mTywYYxpMitojzIILB/Eu/8dfk/aCvUxIkx4SDQ="; makeCacheWritable = true; @@ -34,16 +36,24 @@ buildNpmPackage rec { ELECTRON_SKIP_BINARY_DOWNLOAD = 1; }; - postBuild = '' + postBuild = lib.optionalString stdenv.isDarwin '' + cp -R ${electron}/Applications/Electron.app Electron.app + chmod -R u+w Electron.app + '' + '' npm exec electron-builder -- \ --dir \ - -c.electronDist=${electron}/libexec/electron \ + -c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \ -c.electronVersion=${electron.version} ''; installPhase = '' runHook preInstall + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + mv pack/mac*/YouTube\ Music.app $out/Applications + makeWrapper $out/Applications/YouTube\ Music.app/Contents/MacOS/YouTube\ Music $out/bin/youtube-music + '' + lib.optionalString (!stdenv.isDarwin) '' mkdir -p "$out/share/lib/youtube-music" cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/youtube-music" @@ -52,11 +62,12 @@ buildNpmPackage rec { install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/youtube-music.png done popd + '' + '' runHook postInstall ''; - postFixup = '' + postFixup = lib.optionalString (!stdenv.isDarwin) '' makeWrapper ${electron}/bin/electron $out/bin/youtube-music \ --add-flags $out/share/lib/youtube-music/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ @@ -80,8 +91,8 @@ buildNpmPackage rec { description = "Electron wrapper around YouTube Music"; homepage = "https://th-ch.github.io/youtube-music/"; license = licenses.mit; - inherit (electron.meta) platforms; maintainers = [ maintainers.aacebedo ]; mainProgram = "youtube-music"; + platforms = platforms.all; }; } diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index 7fc27555bcfed..86c0d53fcf82e 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.50.0"; + version = "2.53.1"; in buildGoModule { inherit pname version; @@ -11,17 +11,22 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-gZ01nmxzXRK8YRwnl5qGkU6dqBYKPUkNZmbClwgsuL0="; + hash = "sha256-Gsrt/+6fhpwg3DzPtXPj9T9VPaMIaRcYBdWuFOotsbA="; fetchSubmodules = true; }; - vendorHash = "sha256-4s5dXTfYlgzYQ2h30F6kxEF626iKYFRoZlNXeFDbn8s="; + vendorHash = "sha256-zsLPqcLCZSnhlFWvNXZJwlfS+NsaTS07TmWd+x4ZPXA="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: # cc1: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] hardeningDisable = [ "format" ]; + # Fix error: 'Caught SIGILL in blst_cgo_init' + # https://github.com/bnb-chain/bsc/issues/1521 + CGO_CFLAGS = "-O -D__BLST_PORTABLE__"; + CGO_CFLAGS_ALLOW = "-O -D__BLST_PORTABLE__"; + subPackages = [ "cmd/erigon" "cmd/evm" diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 96e493131dd8b..9a03c3b4b5625 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.13.0"; + version = "1.13.4"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tomzF0jM1tcxnnBHLfNWcR1XGECxU8Q/SQAWQBRAFW8="; + sha256 = "sha256-RQlWWHoij3gtFwjJeEGsmd5YJNTGX0I84nOAQyWBx/M="; }; - vendorHash = "sha256-VX2S7yjdcconPd8wisV+Cl6FVuEUGU7smIBKfTxpUVY="; + vendorHash = "sha256-YmUgKO3JtVOE/YACqL/QBiyR1jT/jPCH+Gb0xYwkJEc="; doCheck = false; diff --git a/pkgs/applications/blockchains/lighthouse/Cargo.lock b/pkgs/applications/blockchains/lighthouse/Cargo.lock index c2484cee5c895..a7f0bd102b66b 100644 --- a/pkgs/applications/blockchains/lighthouse/Cargo.lock +++ b/pkgs/applications/blockchains/lighthouse/Cargo.lock @@ -3,6 +3,16 @@ version = 3 [[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] name = "account_manager" version = "0.3.5" dependencies = [ @@ -20,7 +30,10 @@ dependencies = [ "filesystem", "safe_arith", "sensitive_url", + "serde", + "serde_json", "slashing_protection", + "slog", "slot_clock", "tempfile", "tokio", @@ -36,7 +49,7 @@ dependencies = [ "eth2_keystore", "eth2_wallet", "filesystem", - "rand 0.8.5", + "rand", "regex", "rpassword", "serde", @@ -50,9 +63,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -71,42 +84,11 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aead" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aead" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array", - "rand_core 0.6.4", -] - -[[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.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" -dependencies = [ - "aes-soft", - "aesni", - "cipher 0.2.5", ] [[package]] @@ -118,15 +100,15 @@ dependencies = [ "cfg-if", "cipher 0.3.0", "cpufeatures", - "ctr 0.8.0", + "ctr", "opaque-debug", ] [[package]] name = "aes" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher 0.4.4", @@ -139,72 +121,61 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead 0.4.3", + "aead", "aes 0.7.5", "cipher 0.3.0", - "ctr 0.8.0", - "ghash 0.4.4", + "ctr", + "ghash", "subtle", ] [[package]] -name = "aes-gcm" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c" -dependencies = [ - "aead 0.5.2", - "aes 0.8.2", - "cipher 0.4.4", - "ctr 0.9.2", - "ghash 0.5.0", - "subtle", -] - -[[package]] -name = "aes-soft" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" -dependencies = [ - "cipher 0.2.5", - "opaque-debug", -] - -[[package]] -name = "aesni" -version = "0.10.0" +name = "ahash" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "cipher 0.2.5", - "opaque-debug", + "getrandom 0.2.10", + "once_cell", + "version_check", ] [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ - "getrandom 0.2.8", + "cfg-if", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "0f2135563fb5c609d2b2b87c1e8ce7bc41b0b45430fa9661f457981503dd5bf0" dependencies = [ "memchr", ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] name = "amcl" version = "0.3.0" -source = "git+https://github.com/sigp/milagro_bls?tag=v1.4.2#16655aa033175a90c10ef02aa144e2835de23aec" +source = "git+https://github.com/sigp/milagro_bls?tag=v1.5.1#d3fc0a40cfe8b72ccda46ba050ee6786a59ce753" + +[[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" @@ -225,15 +196,25 @@ dependencies = [ ] [[package]] +name = "anvil-rpc" +version = "0.1.0" +source = "git+https://github.com/foundry-rs/foundry?rev=b45456717ffae1af65acdc71099f8cb95e6683a0#b45456717ffae1af65acdc71099f8cb95e6683a0" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arbitrary" version = "1.3.0" -source = "git+https://github.com/michaelsproul/arbitrary?rev=f002b99989b561ddce62e4cf2887b0f8860ae991#f002b99989b561ddce62e4cf2887b0f8860ae991" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" dependencies = [ "derive_arbitrary", ] @@ -245,6 +226,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] +name = "array-init" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23589ecb866b460d3a0f1278834750268c607e8e28a1b982c907219f3178cd72" +dependencies = [ + "nodrop", +] + +[[package]] name = "arrayref" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -252,25 +242,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "asn1-rs" -version = "0.3.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" -dependencies = [ - "asn1-rs-derive 0.1.0", - "asn1-rs-impl", - "displaydoc", - "nom 7.1.3", - "num-traits", - "rusticata-macros", - "thiserror", - "time 0.3.20", -] +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asn1-rs" @@ -278,26 +252,14 @@ 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-derive", "asn1-rs-impl", "displaydoc", - "nom 7.1.3", + "nom", "num-traits", "rusticata-macros", "thiserror", - "time 0.3.20", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", + "time", ] [[package]] @@ -325,9 +287,9 @@ dependencies = [ [[package]] name = "asn1_der" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" +checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" [[package]] name = "async-io" @@ -336,14 +298,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", - "autocfg 1.1.0", + "autocfg", "cfg-if", "concurrent-queue", "futures-lite", "log", "parking", "polling", - "rustix", + "rustix 0.37.23", "slab", "socket2 0.4.9", "waker-fn", @@ -351,44 +313,44 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] [[package]] name = "async-stream" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.37", ] [[package]] @@ -399,37 +361,32 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version 0.4.0", + "rustc_version", ] [[package]] name = "asynchronous-codec" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182" +checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" dependencies = [ "bytes", "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] -name = "atomic-waker" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" - -[[package]] name = "attohttpc" -version = "0.10.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf13118df3e3dce4b5ac930641343b91b656e4e72c8f8325838b01a4b1c9d45" +checksum = "fdb8867f378f33f78a811a8eb9bf108ad99430d7aad43315dd9319c827ef6247" dependencies = [ "http", "log", "url", + "wildmatch", ] [[package]] @@ -445,9 +402,9 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8c1df849285fbacd587de7818cc7d13be6cd2cbcd47a04fb1801b0e2706e33" +checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" dependencies = [ "proc-macro-error", "proc-macro2", @@ -457,28 +414,19 @@ dependencies = [ [[package]] name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.5.17" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -489,23 +437,24 @@ dependencies = [ "memchr", "mime", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", + "rustversion", "serde", "serde_json", + "serde_path_to_error", "serde_urlencoded", "sync_wrapper", "tokio", "tower", - "tower-http", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.2.9" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", "bytes", @@ -513,15 +462,16 @@ dependencies = [ "http", "http-body", "mime", + "rustversion", "tower-layer", "tower-service", ] [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -545,6 +495,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" [[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -552,9 +508,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -565,7 +521,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beacon-api-client" version = "0.1.0" -source = "git+https://github.com/ralexstokes/beacon-api-client#30679e9e25d61731cde54e14cd8a3688a39d8e5b" +source = "git+https://github.com/ralexstokes/beacon-api-client?rev=93d7e8c#93d7e8c38fe9782c4862909663e7b57c44f805a9" dependencies = [ "ethereum-consensus", "http", @@ -584,16 +540,16 @@ dependencies = [ name = "beacon_chain" version = "0.2.0" dependencies = [ - "bitvec 0.20.4", + "bitvec 1.0.1", "bls", "derivative", "environment", "eth1", "eth2", - "eth2_hashing", - "eth2_ssz", - "eth2_ssz_derive", - "eth2_ssz_types", + "ethereum_hashing", + "ethereum_serde_utils", + "ethereum_ssz", + "ethereum_ssz_derive", "execution_layer", "exit-future", "fork_choice", @@ -612,34 +568,34 @@ dependencies = [ "operation_pool", "parking_lot 0.12.1", "proto_array", - "rand 0.8.5", + "rand", "rayon", "safe_arith", "sensitive_url", "serde", - "serde_derive", "serde_json", "slasher", "slog", "sloggers", "slot_clock", - "smallvec", + "smallvec 1.11.0", + "ssz_types", "state_processing", "store", "strum", - "superstruct 0.5.0", + "superstruct", "task_executor", "tempfile", "tokio", "tokio-stream", "tree_hash", + "tree_hash_derive", "types", - "unused_port", ] [[package]] name = "beacon_node" -version = "4.1.0" +version = "4.5.0" dependencies = [ "beacon_chain", "clap", @@ -672,6 +628,32 @@ dependencies = [ ] [[package]] +name = "beacon_processor" +version = "0.1.0" +dependencies = [ + "derivative", + "ethereum_ssz", + "fnv", + "futures", + "hex", + "itertools", + "lazy_static", + "lighthouse_metrics", + "lighthouse_network", + "logging", + "num_cpus", + "parking_lot 0.12.1", + "serde", + "slog", + "slot_clock", + "strum", + "task_executor", + "tokio", + "tokio-util 0.6.10", + "types", +] + +[[package]] name = "bincode" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -686,7 +668,7 @@ version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -706,6 +688,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "bitvec" version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -735,7 +723,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -758,16 +746,6 @@ dependencies = [ ] [[package]] -name = "block-modes" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" -dependencies = [ - "block-padding", - "cipher 0.2.5", -] - -[[package]] name = "block-padding" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -779,13 +757,13 @@ version = "0.2.0" dependencies = [ "arbitrary", "blst", - "eth2_hashing", - "eth2_serde_utils", - "eth2_ssz", "ethereum-types 0.14.1", + "ethereum_hashing", + "ethereum_serde_utils", + "ethereum_ssz", "hex", "milagro_bls", - "rand 0.7.3", + "rand", "serde", "serde_derive", "tree_hash", @@ -794,37 +772,35 @@ dependencies = [ [[package]] name = "blst" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a30d0edd9dd1c60ddb42b80341c7852f6f985279a5c1a83659dcb65899dec99" +checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b" dependencies = [ "cc", "glob", "threadpool", - "which", "zeroize", ] [[package]] name = "bollard-stubs" -version = "1.41.0" +version = "1.42.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8" +checksum = "ed59b5c00048f48d7af971b71f800fdf23e858844a6f9e4d32ca72e9399e7864" dependencies = [ - "chrono", "serde", "serde_with", ] [[package]] name = "boot_node" -version = "4.1.0" +version = "4.5.0" dependencies = [ "beacon_node", "clap", "clap_utils", "eth2_network_config", - "eth2_ssz", + "ethereum_ssz", "hex", "lighthouse_network", "log", @@ -849,13 +825,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] -name = "buf_redux" -version = "0.8.4" +name = "bs58" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" dependencies = [ - "memchr", - "safemem", + "tinyvec", ] [[package]] @@ -872,9 +847,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byte-slice-cast" @@ -890,9 +865,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" dependencies = [ "serde", ] @@ -922,38 +897,63 @@ dependencies = [ name = "cached_tree_hash" version = "0.1.0" dependencies = [ - "eth2_hashing", - "eth2_ssz", - "eth2_ssz_derive", - "eth2_ssz_types", "ethereum-types 0.14.1", + "ethereum_hashing", + "ethereum_ssz", + "ethereum_ssz_derive", "quickcheck", "quickcheck_macros", - "smallvec", + "smallvec 1.11.0", + "ssz_types", "tree_hash", ] [[package]] -name = "cast" -version = "0.3.0" +name = "camino" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] [[package]] -name = "cc" -version = "1.0.79" +name = "cargo-platform" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +dependencies = [ + "serde", +] [[package]] -name = "ccm" +name = "cargo_metadata" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cast" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "aead 0.3.2", - "cipher 0.2.5", - "subtle", + "jobserver", + "libc", ] [[package]] @@ -962,7 +962,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "nom 7.1.3", + "nom", ] [[package]] @@ -989,7 +989,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ - "aead 0.4.3", + "aead", "chacha20", "cipher 0.3.0", "poly1305", @@ -998,27 +998,14 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", - "js-sys", - "num-integer", "num-traits", - "serde", - "time 0.1.45", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "cipher" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -dependencies = [ - "generic-array", + "windows-targets 0.48.5", ] [[package]] @@ -1059,7 +1046,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap", "unicode-width", @@ -1073,8 +1060,8 @@ dependencies = [ "clap", "dirs", "eth2_network_config", - "eth2_ssz", "ethereum-types 0.14.1", + "ethereum_ssz", "hex", "serde", "serde_json", @@ -1087,6 +1074,7 @@ name = "client" version = "0.2.0" dependencies = [ "beacon_chain", + "beacon_processor", "directory", "dirs", "environment", @@ -1104,6 +1092,7 @@ dependencies = [ "logging", "monitoring_api", "network", + "num_cpus", "operation_pool", "parking_lot 0.12.1", "sensitive_url", @@ -1117,7 +1106,7 @@ dependencies = [ "state_processing", "store", "task_executor", - "time 0.3.20", + "time", "timer", "tokio", "types", @@ -1133,16 +1122,6 @@ dependencies = [ ] [[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] name = "compare_fields" version = "0.2.0" dependencies = [ @@ -1159,28 +1138,24 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] [[package]] -name = "console_error_panic_hook" -version = "0.1.7" +name = "const-oid" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] -name = "const-oid" -version = "0.9.2" +name = "constant_time_eq" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "convert_case" @@ -1215,29 +1190,14 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] -name = "crc" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" - -[[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1284,9 +1244,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1305,22 +1265,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ - "autocfg 1.1.0", + "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -1344,13 +1304,24 @@ dependencies = [ ] [[package]] +name = "crypto-bigint" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + +[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", "typenum", ] @@ -1376,9 +1347,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" +checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" dependencies = [ "csv-core", "itoa", @@ -1405,22 +1376,13 @@ dependencies = [ ] [[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher 0.4.4", -] - -[[package]] name = "ctrlc" -version = "3.2.5" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639" +checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" dependencies = [ - "nix 0.26.2", - "windows-sys 0.45.0", + "nix 0.27.1", + "windows-sys 0.48.0", ] [[package]] @@ -1438,60 +1400,30 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.2" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585" +checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" dependencies = [ "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", "fiat-crypto", - "packed_simd_2", - "platforms 3.0.2", + "platforms 3.1.2", + "rustc_version", "subtle", "zeroize", ] [[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.13", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" +name = "curve25519-dalek-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.37", ] [[package]] @@ -1500,18 +1432,8 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", + "darling_core", + "darling_macro", ] [[package]] @@ -1529,37 +1451,12 @@ dependencies = [ ] [[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] name = "darling_macro" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core 0.13.4", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core 0.14.4", + "darling_core", "quote", "syn 1.0.109", ] @@ -1586,15 +1483,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "data-encoding-macro" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca" +checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -1602,9 +1499,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" +checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" dependencies = [ "data-encoding", "syn 1.0.109", @@ -1641,19 +1538,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4355c25cbf99edcb6b4a0e906f6bdc6956eda149e84455bea49696429b2f8e8" dependencies = [ "futures", - "tokio-util 0.7.7", + "tokio-util 0.7.8", ] [[package]] name = "deposit_contract" version = "0.2.0" dependencies = [ - "eth2_ssz", "ethabi 16.0.0", + "ethereum_ssz", "hex", "reqwest", "serde_json", - "sha2 0.10.6", + "sha2 0.9.9", "tree_hash", "types", ] @@ -1665,22 +1562,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", - "pem-rfc7468", "zeroize", ] [[package]] -name = "der-parser" -version = "7.0.0" +name = "der" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ - "asn1-rs 0.3.1", - "displaydoc", - "nom 7.1.3", - "num-bigint", - "num-traits", - "rusticata-macros", + "const-oid", + "pem-rfc7468", + "zeroize", ] [[package]] @@ -1689,15 +1582,21 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "asn1-rs 0.5.2", + "asn1-rs", "displaydoc", - "nom 7.1.3", + "nom", "num-bigint", "num-traits", "rusticata-macros", ] [[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + +[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1710,43 +1609,13 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.0" -source = "git+https://github.com/michaelsproul/arbitrary?rev=f002b99989b561ddce62e4cf2887b0f8860ae991#f002b99989b561ddce62e4cf2887b0f8860ae991" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.11.2" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ - "darling 0.14.4", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] @@ -1758,17 +1627,17 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version 0.4.0", + "rustc_version", "syn 1.0.109", ] [[package]] name = "diesel" -version = "2.0.3" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4391a22b19c916e50bec4d6140f29bdda3e3bb187223fe6e3ea0b6e4d1021c04" +checksum = "d98235fdc2f355d330a8244184ab6b4b33c28679c0b4158f63138e51d6cf7e88" dependencies = [ - "bitflags", + "bitflags 2.4.0", "byteorder", "diesel_derives", "itoa", @@ -1778,21 +1647,21 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad74fdcf086be3d4fdd142f67937678fe60ed431c3b2f08599e7687269410c4" +checksum = "e054665eaf6d97d1e7125512bb2d35d07c73ac86cc6920174cb42d1ab697a554" dependencies = [ - "proc-macro-error", + "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] name = "diesel_migrations" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ae22beef5e9d6fab9225ddb073c1c6c1a7a6ded5019d5da11d1e5c5adc34e2" +checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" dependencies = [ "diesel", "migrations_internals", @@ -1800,6 +1669,15 @@ dependencies = [ ] [[package]] +name = "diesel_table_macro_syntax" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +dependencies = [ + "syn 2.0.37", +] + +[[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1810,11 +1688,12 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", + "const-oid", "crypto-common", "subtle", ] @@ -1871,32 +1750,31 @@ dependencies = [ [[package]] name = "discv5" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b009a99b85b58900df46435307fc5c4c845af7e182582b1fbf869572fa9fce69" +checksum = "98c05fa26996c6141f78ac4fafbe297a7fa69690565ba4e0d1f2e60bde5ce501" dependencies = [ "aes 0.7.5", - "aes-gcm 0.9.4", + "aes-gcm", "arrayvec", "delay_map", - "enr 0.7.0", + "enr 0.9.0", "fnv", "futures", "hashlink 0.7.0", "hex", "hkdf", "lazy_static", - "libp2p-core 0.36.0", + "libp2p-core", + "libp2p-identity", "lru 0.7.8", "more-asserts", "parking_lot 0.11.2", - "rand 0.8.5", + "rand", "rlp", - "smallvec", + "smallvec 1.11.0", "socket2 0.4.9", "tokio", - "tokio-stream", - "tokio-util 0.6.10", "tracing", "tracing-subscriber", "uint", @@ -1905,20 +1783,26 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] name = "dtoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "ecdsa" @@ -1926,32 +1810,47 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der", - "elliptic-curve", - "rfc6979", - "signature", + "der 0.6.1", + "elliptic-curve 0.12.3", + "rfc6979 0.3.1", + "signature 1.6.4", +] + +[[package]] +name = "ecdsa" +version = "0.16.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +dependencies = [ + "der 0.7.8", + "digest 0.10.7", + "elliptic-curve 0.13.5", + "rfc6979 0.4.0", + "signature 2.1.0", + "spki 0.7.2", ] [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ - "signature", + "pkcs8 0.10.2", + "signature 2.1.0", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.1.0", "ed25519", - "rand 0.7.3", + "rand_core 0.6.4", "serde", - "sha2 0.9.9", + "sha2 0.10.7", "zeroize", ] @@ -1965,9 +1864,9 @@ dependencies = [ "compare_fields", "compare_fields_derive", "derivative", - "eth2_ssz", - "eth2_ssz_derive", "ethereum-types 0.14.1", + "ethereum_ssz", + "ethereum_ssz_derive", "execution_layer", "fork_choice", "fs2", @@ -1988,9 +1887,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" @@ -1998,27 +1897,45 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ - "base16ct", - "crypto-bigint", - "der", - "digest 0.10.6", - "ff", + "base16ct 0.1.1", + "crypto-bigint 0.4.9", + "der 0.6.1", + "digest 0.10.7", + "ff 0.12.1", "generic-array", - "group", - "hkdf", + "group 0.12.1", + "pkcs8 0.9.0", + "rand_core 0.6.4", + "sec1 0.3.0", + "subtle", + "zeroize", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +dependencies = [ + "base16ct 0.2.0", + "crypto-bigint 0.5.3", + "digest 0.10.7", + "ff 0.13.0", + "generic-array", + "group 0.13.0", "pem-rfc7468", - "pkcs8", + "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1", + "sec1 0.7.3", "subtle", "zeroize", ] [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -2030,35 +1947,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26fa0a0be8915790626d5759eb51fe47435a8eac92c2f212bd2da9aa7f30ea56" dependencies = [ "base64 0.13.1", - "bs58", + "bs58 0.4.0", "bytes", "hex", - "k256", + "k256 0.11.6", "log", - "rand 0.8.5", + "rand", "rlp", "serde", - "sha3 0.10.6", + "sha3 0.10.8", "zeroize", ] [[package]] name = "enr" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "492a7e5fc2504d5fdce8e124d3e263b244a68b283cac67a69eda0cd43e0aebad" +checksum = "0be7b2ac146c1f99fe245c02d16af0696450d8e06c135db75e10eeb9e642c20d" dependencies = [ - "base64 0.13.1", - "bs58", + "base64 0.21.4", "bytes", "ed25519-dalek", "hex", - "k256", + "k256 0.13.1", "log", - "rand 0.8.5", + "rand", "rlp", "serde", - "sha3 0.10.6", + "serde-hex", + "sha3 0.10.8", "zeroize", ] @@ -2076,9 +1993,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.7.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ "log", "regex", @@ -2120,14 +2037,20 @@ dependencies = [ ] [[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] name = "errno" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2157,8 +2080,8 @@ dependencies = [ "environment", "eth1_test_rig", "eth2", - "eth2_ssz", - "eth2_ssz_derive", + "ethereum_ssz", + "ethereum_ssz_derive", "execution_layer", "futures", "hex", @@ -2174,12 +2097,11 @@ dependencies = [ "slog", "sloggers", "state_processing", - "superstruct 0.5.0", + "superstruct", "task_executor", "tokio", "tree_hash", "types", - "web3", ] [[package]] @@ -2187,11 +2109,14 @@ name = "eth1_test_rig" version = "0.2.0" dependencies = [ "deposit_contract", + "ethers-contract", + "ethers-core", + "ethers-providers", + "hex", "serde_json", "tokio", "types", "unused_port", - "web3", ] [[package]] @@ -2201,15 +2126,17 @@ dependencies = [ "account_utils", "bytes", "eth2_keystore", - "eth2_serde_utils", - "eth2_ssz", - "eth2_ssz_derive", + "ethereum_serde_utils", + "ethereum_ssz", + "ethereum_ssz_derive", "futures", "futures-util", "libsecp256k1", "lighthouse_network", + "mediatype", "mime", - "procinfo", + "pretty_reqwest_error", + "procfs", "proto_array", "psutil", "reqwest", @@ -2219,6 +2146,7 @@ dependencies = [ "serde_json", "slashing_protection", "store", + "tokio", "types", ] @@ -2231,24 +2159,12 @@ dependencies = [ ] [[package]] -name = "eth2_hashing" -version = "0.3.0" -dependencies = [ - "cpufeatures", - "lazy_static", - "ring", - "rustc-hex", - "sha2 0.10.6", - "wasm-bindgen-test", -] - -[[package]] name = "eth2_interop_keypairs" version = "0.2.0" dependencies = [ "base64 0.13.1", "bls", - "eth2_hashing", + "ethereum_hashing", "hex", "lazy_static", "num-bigint", @@ -2265,7 +2181,7 @@ dependencies = [ "hex", "num-bigint-dig", "ring", - "sha2 0.10.6", + "sha2 0.9.9", "zeroize", ] @@ -2279,7 +2195,7 @@ dependencies = [ "hex", "hmac 0.11.0", "pbkdf2 0.8.0", - "rand 0.8.5", + "rand", "scrypt", "serde", "serde_json", @@ -2287,7 +2203,7 @@ dependencies = [ "sha2 0.9.9", "tempfile", "unicode-normalization", - "uuid 0.8.2", + "uuid", "zeroize", ] @@ -2295,78 +2211,38 @@ dependencies = [ name = "eth2_network_config" version = "0.2.0" dependencies = [ + "bytes", "discv5", "eth2_config", - "eth2_ssz", + "ethereum_ssz", + "logging", + "pretty_reqwest_error", + "reqwest", + "sensitive_url", "serde_yaml", + "sha2 0.9.9", + "slog", "tempfile", + "tokio", "types", + "url", "zip", ] [[package]] -name = "eth2_serde_utils" -version = "0.1.1" -dependencies = [ - "ethereum-types 0.14.1", - "hex", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "eth2_ssz" -version = "0.4.1" -dependencies = [ - "eth2_ssz_derive", - "ethereum-types 0.14.1", - "itertools", - "smallvec", -] - -[[package]] -name = "eth2_ssz_derive" -version = "0.3.1" -dependencies = [ - "darling 0.13.4", - "eth2_ssz", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "eth2_ssz_types" -version = "0.2.2" -dependencies = [ - "arbitrary", - "derivative", - "eth2_serde_utils", - "eth2_ssz", - "serde", - "serde_derive", - "serde_json", - "smallvec", - "tree_hash", - "tree_hash_derive", - "typenum", -] - -[[package]] name = "eth2_wallet" version = "0.1.0" dependencies = [ "eth2_key_derivation", "eth2_keystore", "hex", - "rand 0.8.5", + "rand", "serde", "serde_json", "serde_repr", "tempfile", "tiny-bip39", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -2405,7 +2281,7 @@ dependencies = [ "regex", "serde", "serde_json", - "sha3 0.10.6", + "sha3 0.10.8", "thiserror", "uint", ] @@ -2441,21 +2317,22 @@ dependencies = [ [[package]] name = "ethereum-consensus" version = "0.1.1" -source = "git+https://github.com/ralexstokes//ethereum-consensus?rev=9b0ee0a8a45b968c8df5e7e64ea1c094e16f053d#9b0ee0a8a45b968c8df5e7e64ea1c094e16f053d" +source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=e380108#e380108d15fcc40349927fdf3d11c71f9edb67c2" dependencies = [ "async-stream", "blst", - "bs58", + "bs58 0.4.0", "enr 0.6.2", "hex", "integer-sqrt", "multiaddr 0.14.0", "multihash 0.16.3", - "rand 0.8.5", + "rand", "serde", "serde_json", + "serde_yaml", "sha2 0.9.9", - "ssz-rs", + "ssz_rs", "thiserror", "tokio", "tokio-stream", @@ -2492,6 +2369,113 @@ dependencies = [ ] [[package]] +name = "ethereum_hashing" +version = "1.0.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233dc6f434ce680dbabf4451ee3380cec46cb3c45d66660445a435619710dd35" +dependencies = [ + "cpufeatures", + "lazy_static", + "ring", + "sha2 0.10.7", +] + +[[package]] +name = "ethereum_serde_utils" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f8cb04ea380a33e9c269fa5f8df6f2d63dee19728235f3e639e7674e038686a" +dependencies = [ + "ethereum-types 0.14.1", + "hex", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "ethereum_ssz" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e61ffea29f26e8249d35128a82ec8d3bd4fbc80179ea5f5e5e3daafef6a80fcb" +dependencies = [ + "ethereum-types 0.14.1", + "itertools", + "smallvec 1.11.0", +] + +[[package]] +name = "ethereum_ssz_derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6085d7fd3cf84bd2b8fec150d54c8467fb491d8db9c460607c5534f653a0ee38" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ethers-contract" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9c3c3e119a89f0a9a1e539e7faecea815f74ddcf7c90d0b00d1f524db2fdc9c" +dependencies = [ + "ethers-contract-abigen", + "ethers-contract-derive", + "ethers-core", + "ethers-providers", + "futures-util", + "hex", + "once_cell", + "pin-project", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "ethers-contract-abigen" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d4e5ad46aede34901f71afdb7bb555710ed9613d88d644245c657dc371aa228" +dependencies = [ + "Inflector", + "cfg-if", + "dunce", + "ethers-core", + "eyre", + "getrandom 0.2.10", + "hex", + "proc-macro2", + "quote", + "regex", + "reqwest", + "serde", + "serde_json", + "syn 1.0.109", + "toml 0.5.11", + "url", + "walkdir", +] + +[[package]] +name = "ethers-contract-derive" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f192e8e4cf2b038318aae01e94e7644e0659a76219e94bcd3203df744341d61f" +dependencies = [ + "ethers-contract-abigen", + "ethers-core", + "hex", + "proc-macro2", + "quote", + "serde_json", + "syn 1.0.109", +] + +[[package]] name = "ethers-core" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2499,19 +2483,22 @@ checksum = "ade3e9c97727343984e1ceada4fdab11142d2ee3472d2c67027d56b1251d4f15" dependencies = [ "arrayvec", "bytes", + "cargo_metadata", "chrono", - "elliptic-curve", + "elliptic-curve 0.12.3", "ethabi 18.0.0", "generic-array", "hex", - "k256", + "k256 0.11.6", + "once_cell", "open-fastrlp", - "rand 0.8.5", + "rand", "rlp", "rlp-derive", "serde", "serde_json", "strum", + "syn 1.0.109", "thiserror", "tiny-keccak", "unicode-xid", @@ -2527,11 +2514,10 @@ dependencies = [ "auto_impl", "base64 0.13.1", "ethers-core", - "futures-channel", "futures-core", "futures-timer", "futures-util", - "getrandom 0.2.8", + "getrandom 0.2.10", "hashers", "hex", "http", @@ -2543,7 +2529,6 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tokio-tungstenite 0.17.2", "tracing", "tracing-futures", "url", @@ -2588,15 +2573,16 @@ dependencies = [ name = "execution_layer" version = "0.1.0" dependencies = [ + "arc-swap", "async-trait", + "axum", "builder_client", "bytes", "environment", "eth2", - "eth2_serde_utils", - "eth2_ssz", - "eth2_ssz_types", "ethereum-consensus", + "ethereum_serde_utils", + "ethereum_ssz", "ethers-core", "exit-future", "fork_choice", @@ -2604,6 +2590,7 @@ dependencies = [ "hash-db", "hash256-std-hasher", "hex", + "hyper", "jsonwebtoken", "keccak-hash", "lazy_static", @@ -2611,17 +2598,19 @@ dependencies = [ "lru 0.7.8", "mev-rs", "parking_lot 0.12.1", - "rand 0.8.5", + "pretty_reqwest_error", + "rand", "reqwest", "sensitive_url", "serde", "serde_json", "slog", "slot_clock", - "ssz-rs", + "ssz_rs", + "ssz_types", "state_processing", "strum", - "superstruct 0.6.0", + "superstruct", "task_executor", "tempfile", "tokio", @@ -2644,6 +2633,16 @@ dependencies = [ ] [[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2665,6 +2664,12 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] name = "ff" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2675,6 +2680,16 @@ dependencies = [ ] [[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] name = "ffi-opaque" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2682,18 +2697,18 @@ checksum = "ec54ac60a7f2ee9a97cad9946f9bf629a3bc6a7ae59e68983dc9318f5a54b81a" [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.8.0", - "rustc_version 0.4.0", + "memoffset 0.9.0", + "rustc_version", ] [[package]] @@ -2705,13 +2720,19 @@ dependencies = [ ] [[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + +[[package]] name = "fixed-hash" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] @@ -2724,22 +2745,16 @@ checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "arbitrary", "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] [[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.25" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "libz-sys", @@ -2772,8 +2787,8 @@ name = "fork_choice" version = "0.1.0" dependencies = [ "beacon_chain", - "eth2_ssz", - "eth2_ssz_derive", + "ethereum_ssz", + "ethereum_ssz_derive", "proto_array", "slog", "state_processing", @@ -2784,9 +2799,9 @@ dependencies = [ [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2864,16 +2879,16 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", "parking", - "pin-project-lite 0.2.9", + "pin-project-lite", "waker-fn", ] @@ -2885,18 +2900,17 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.37", ] [[package]] name = "futures-rustls" -version = "0.22.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" +checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28" dependencies = [ "futures-io", - "rustls 0.20.8", - "webpki 0.22.0", + "rustls", ] [[package]] @@ -2912,6 +2926,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] +name = "futures-ticker" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9763058047f713632a52e916cc7f6a4b3fc6e9fc1ff8c5b1dc49e5a89041682e" +dependencies = [ + "futures", + "futures-timer", + "instant", +] + +[[package]] name = "futures-timer" version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2930,7 +2955,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite", "pin-utils", "slab", ] @@ -2952,6 +2977,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -2961,8 +2987,8 @@ dependencies = [ "environment", "eth1", "eth1_test_rig", - "eth2_hashing", - "eth2_ssz", + "ethereum_hashing", + "ethereum_ssz", "futures", "int_to_bytes", "merkle_proof", @@ -2982,17 +3008,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -3008,24 +3032,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug", - "polyval 0.5.3", -] - -[[package]] -name = "ghash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" -dependencies = [ - "opaque-debug", - "polyval 0.6.0", + "polyval", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git-version" @@ -3061,16 +3075,27 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ - "ff", + "ff 0.12.1", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff 0.13.0", "rand_core 0.6.4", "subtle", ] [[package]] name = "h2" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -3078,10 +3103,10 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", - "tokio-util 0.7.7", + "tokio-util 0.7.8", "tracing", ] @@ -3112,7 +3137,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash", + "ahash 0.7.6", ] [[package]] @@ -3121,7 +3146,26 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", ] [[package]] @@ -3144,21 +3188,20 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.12.3", + "hashbrown 0.14.0", ] [[package]] name = "headers" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags", + "base64 0.21.4", "bytes", "headers-core", "http", @@ -3193,18 +3236,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -3253,7 +3287,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3297,27 +3331,23 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - -[[package]] name = "http_api" version = "0.1.0" dependencies = [ "beacon_chain", - "bs58", + "beacon_processor", + "bs58 0.4.0", + "bytes", "directory", "environment", "eth1", "eth2", - "eth2_serde_utils", - "eth2_ssz", + "ethereum_serde_utils", + "ethereum_ssz", "execution_layer", "futures", "genesis", @@ -3347,7 +3377,6 @@ dependencies = [ "tokio-stream", "tree_hash", "types", - "unused_port", "warp", "warp_utils", ] @@ -3381,9 +3410,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -3393,9 +3422,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.25" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -3407,7 +3436,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.9", + "pin-project-lite", "socket2 0.4.9", "tokio", "tower-service", @@ -3417,15 +3446,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", - "rustls 0.20.8", + "rustls", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", ] [[package]] @@ -3443,26 +3473,25 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.54" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.46.0", + "windows 0.48.0", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -3484,9 +3513,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3544,13 +3573,13 @@ dependencies = [ [[package]] name = "igd" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd32c880165b2f776af0b38d206d1cabaebcf46c166ac6ae004a5d45f7d48ef" +checksum = "556b5a75cd4adb7c4ea21c64af1c48cefb2ce7d43dc4352c720a1fe47c21f355" dependencies = [ "attohttpc", "log", - "rand 0.7.3", + "rand", "url", "xmltree", ] @@ -3570,7 +3599,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.4.0", + "parity-scale-codec 3.6.5", ] [[package]] @@ -3612,16 +3641,32 @@ dependencies = [ ] [[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] name = "indexmap" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.1.0", + "autocfg", "hashbrown 0.12.3", ] [[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] name = "inout" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3661,52 +3706,33 @@ dependencies = [ ] [[package]] -name = "interceptor" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" -dependencies = [ - "async-trait", - "bytes", - "log", - "rand 0.8.5", - "rtcp", - "rtp", - "thiserror", - "tokio", - "waitgroup", - "webrtc-srtp", - "webrtc-util", -] - -[[package]] name = "io-lifetimes" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "ipconfig" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.4.9", - "widestring 0.5.1", - "winapi", + "socket2 0.5.4", + "widestring 1.0.2", + "windows-sys 0.48.0", "winreg", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "itertools" @@ -3719,15 +3745,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jemalloc-ctl" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1891c671f3db85d8ea8525dd43ab147f9977041911d24a03e5a36187a7bfde9" +checksum = "7cffc705424a344c054e135d12ee591402f4539245e8bbd64e6c9eaa9458b63c" dependencies = [ "jemalloc-sys", "libc", @@ -3736,9 +3762,9 @@ dependencies = [ [[package]] name = "jemalloc-sys" -version = "0.5.3+5.3.0-patched" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bd5d616ea7ed58b571b2e209a65759664d7fb021a0819d7a790afc67e47ca1" +checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2" dependencies = [ "cc", "libc", @@ -3746,36 +3772,30 @@ dependencies = [ [[package]] name = "jemallocator" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c2514137880c52b0b4822b563fadd38257c1f380858addb74a400889696ea6" +checksum = "a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc" dependencies = [ "jemalloc-sys", "libc", ] [[package]] -name = "js-sys" -version = "0.3.61" +name = "jobserver" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ - "wasm-bindgen", + "libc", ] [[package]] -name = "jsonrpc-core" -version = "18.0.0" +name = "js-sys" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ - "futures", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", + "wasm-bindgen", ] [[package]] @@ -3784,7 +3804,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.0", + "base64 0.21.4", "pem", "ring", "serde", @@ -3799,17 +3819,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" dependencies = [ "cfg-if", - "ecdsa", - "elliptic-curve", - "sha2 0.10.6", - "sha3 0.10.6", + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", + "sha2 0.10.7", + "sha3 0.10.8", +] + +[[package]] +name = "k256" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +dependencies = [ + "cfg-if", + "ecdsa 0.16.8", + "elliptic-curve 0.13.5", + "once_cell", + "sha2 0.10.7", + "signature 2.1.0", ] [[package]] name = "keccak" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" dependencies = [ "cpufeatures", ] @@ -3841,7 +3875,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lcli" -version = "4.1.0" +version = "4.5.0" dependencies = [ "account_utils", "beacon_chain", @@ -3855,14 +3889,16 @@ dependencies = [ "eth1_test_rig", "eth2", "eth2_network_config", - "eth2_ssz", "eth2_wallet", + "ethereum_hashing", + "ethereum_ssz", "genesis", "int_to_bytes", "lighthouse_network", "lighthouse_version", "log", "malloc_utils", + "rayon", "sensitive_url", "serde", "serde_json", @@ -3873,7 +3909,6 @@ dependencies = [ "tree_hash", "types", "validator_dir", - "web3", ] [[package]] @@ -3901,15 +3936,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libflate" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", "crc32fast", @@ -3937,25 +3972,19 @@ dependencies = [ [[package]] name = "libm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" - -[[package]] -name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmdbx" version = "0.1.4" source = "git+https://github.com/sigp/libmdbx-rs?tag=v0.1.4#096da80a83d14343f8df833006483f48075cd135" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "derive_more", - "indexmap", + "indexmap 1.9.3", "libc", "mdbx-sys", "parking_lot 0.12.1", @@ -3964,112 +3993,63 @@ dependencies = [ [[package]] name = "libp2p" -version = "0.50.1" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7b0104790be871edcf97db9bd2356604984e623a08d825c3f27852290266b8" +checksum = "32d07d1502a027366d55afe187621c2d7895dc111a3df13b35fed698049681d7" dependencies = [ "bytes", "futures", "futures-timer", - "getrandom 0.2.8", + "getrandom 0.2.10", "instant", - "libp2p-core 0.38.0", + "libp2p-allow-block-list", + "libp2p-connection-limits", + "libp2p-core", "libp2p-dns", "libp2p-gossipsub", "libp2p-identify", + "libp2p-identity", "libp2p-mdns", "libp2p-metrics", - "libp2p-mplex", "libp2p-noise", "libp2p-plaintext", "libp2p-quic", "libp2p-swarm", "libp2p-tcp", - "libp2p-webrtc", - "libp2p-websocket", "libp2p-yamux", - "multiaddr 0.16.0", - "parking_lot 0.12.1", + "multiaddr 0.18.0", "pin-project", - "smallvec", ] [[package]] -name = "libp2p-core" -version = "0.36.0" +name = "libp2p-allow-block-list" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fff5bd889c82a0aec668f2045edd066f559d4e5c40354e5a4c77ac00caac38" +checksum = "55b46558c5c0bf99d3e2a1a38fd54ff5476ca66dd1737b12466a1824dd219311" dependencies = [ - "asn1_der", - "bs58", - "ed25519-dalek", - "either", - "fnv", - "futures", - "futures-timer", - "instant", - "lazy_static", - "libsecp256k1", - "log", - "multiaddr 0.14.0", - "multihash 0.16.3", - "multistream-select 0.11.0", - "p256", - "parking_lot 0.12.1", - "pin-project", - "prost", - "prost-build", - "rand 0.8.5", - "rw-stream-sink", - "sha2 0.10.6", - "smallvec", - "thiserror", - "unsigned-varint 0.7.1", + "libp2p-core", + "libp2p-identity", + "libp2p-swarm", "void", - "zeroize", ] [[package]] -name = "libp2p-core" -version = "0.38.0" +name = "libp2p-connection-limits" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" +checksum = "2f5107ad45cb20b2f6c3628c7b6014b996fcb13a88053f4569c872c6e30abf58" dependencies = [ - "asn1_der", - "bs58", - "ed25519-dalek", - "either", - "fnv", - "futures", - "futures-timer", - "instant", - "libsecp256k1", - "log", - "multiaddr 0.16.0", - "multihash 0.16.3", - "multistream-select 0.12.1", - "once_cell", - "p256", - "parking_lot 0.12.1", - "pin-project", - "prost", - "prost-build", - "rand 0.8.5", - "rw-stream-sink", - "sec1", - "sha2 0.10.6", - "smallvec", - "thiserror", - "unsigned-varint 0.7.1", + "libp2p-core", + "libp2p-identity", + "libp2p-swarm", "void", - "zeroize", ] [[package]] name = "libp2p-core" -version = "0.39.1" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7f8b7d65c070a5a1b5f8f0510648189da08f787b8963f8e21219e0710733af" +checksum = "ef7dd7b09e71aac9271c60031d0e558966cdb3253ba0308ab369bb2de80630d0" dependencies = [ "either", "fnv", @@ -4078,119 +4058,128 @@ dependencies = [ "instant", "libp2p-identity", "log", - "multiaddr 0.17.1", - "multihash 0.17.0", - "multistream-select 0.12.1", + "multiaddr 0.18.0", + "multihash 0.19.1", + "multistream-select", "once_cell", "parking_lot 0.12.1", "pin-project", "quick-protobuf", - "rand 0.8.5", + "rand", "rw-stream-sink", - "smallvec", + "smallvec 1.11.0", "thiserror", - "unsigned-varint 0.7.1", + "unsigned-varint 0.7.2", "void", ] [[package]] name = "libp2p-dns" -version = "0.38.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5" +checksum = "fd4394c81c0c06d7b4a60f3face7e8e8a9b246840f98d2c80508d0721b032147" dependencies = [ "futures", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "log", "parking_lot 0.12.1", - "smallvec", + "smallvec 1.11.0", "trust-dns-resolver", ] [[package]] name = "libp2p-gossipsub" -version = "0.43.0" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a173171c71c29bb156f98886c7c4824596de3903dadf01e2e79d2ccdcf38cd9f" +checksum = "2d157562dba6017193e5285acf6b1054759e83540bfd79f75b69d6ce774c88da" dependencies = [ "asynchronous-codec", - "base64 0.13.1", + "base64 0.21.4", "byteorder", "bytes", + "either", "fnv", "futures", + "futures-ticker", + "getrandom 0.2.10", "hex_fmt", "instant", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-swarm", "log", "prometheus-client", - "prost", - "prost-build", - "prost-codec", - "rand 0.8.5", + "quick-protobuf", + "quick-protobuf-codec", + "rand", "regex", - "sha2 0.10.6", - "smallvec", - "thiserror", - "unsigned-varint 0.7.1", - "wasm-timer", + "sha2 0.10.7", + "smallvec 1.11.0", + "unsigned-varint 0.7.2", + "void", ] [[package]] name = "libp2p-identify" -version = "0.41.1" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf" +checksum = "6a29675a32dbcc87790db6cf599709e64308f1ae9d5ecea2d259155889982db8" dependencies = [ "asynchronous-codec", + "either", "futures", "futures-timer", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-swarm", "log", - "lru 0.8.1", - "prost", - "prost-build", - "prost-codec", - "smallvec", + "lru 0.10.1", + "quick-protobuf", + "quick-protobuf-codec", + "smallvec 1.11.0", "thiserror", "void", ] [[package]] name = "libp2p-identity" -version = "0.1.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8ea433ae0cea7e3315354305237b9897afe45278b2118a7a57ca744e70fd27" +checksum = "686e73aff5e23efbb99bc85340ea6fd8686986aa7b283a881ba182cfca535ca9" dependencies = [ - "bs58", + "asn1_der", + "bs58 0.5.0", "ed25519-dalek", + "libsecp256k1", "log", - "multiaddr 0.17.1", - "multihash 0.17.0", - "prost", + "multihash 0.19.1", + "p256", "quick-protobuf", - "rand 0.8.5", + "rand", + "sec1 0.7.3", + "sha2 0.10.7", "thiserror", + "void", "zeroize", ] [[package]] name = "libp2p-mdns" -version = "0.42.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b" +checksum = "42a2567c305232f5ef54185e9604579a894fd0674819402bb0ac0246da82f52a" dependencies = [ "data-encoding", "futures", "if-watch", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-swarm", "log", - "rand 0.8.5", - "smallvec", - "socket2 0.4.9", + "rand", + "smallvec 1.11.0", + "socket2 0.5.4", "tokio", "trust-dns-proto", "void", @@ -4198,224 +4187,184 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.11.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55" +checksum = "239ba7d28f8d0b5d77760dc6619c05c7e88e74ec8fbbe97f856f20a56745e620" dependencies = [ - "libp2p-core 0.38.0", + "instant", + "libp2p-core", "libp2p-gossipsub", "libp2p-identify", + "libp2p-identity", "libp2p-swarm", + "once_cell", "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.38.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace" +checksum = "93959ed08b6caf9810e067655e25f1362098797fef7c44d3103e63dcb6f0fabe" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.8.5", - "smallvec", - "unsigned-varint 0.7.1", + "rand", + "smallvec 1.11.0", + "unsigned-varint 0.7.2", ] [[package]] name = "libp2p-noise" -version = "0.41.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e" +checksum = "71ce70757f2c0d82e9a3ef738fb10ea0723d16cec37f078f719e2c247704c1bb" dependencies = [ "bytes", - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.1.0", "futures", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "log", + "multiaddr 0.18.0", + "multihash 0.19.1", "once_cell", - "prost", - "prost-build", - "rand 0.8.5", - "sha2 0.10.6", + "quick-protobuf", + "rand", + "sha2 0.10.7", "snow", "static_assertions", "thiserror", - "x25519-dalek 1.1.1", + "x25519-dalek", "zeroize", ] [[package]] name = "libp2p-plaintext" -version = "0.38.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c43ab37fb4102682ae9a248dc2e6a8e7b941ec75cf24aed103060a788e0fd15" +checksum = "37266c683a757df713f7dcda0cdcb5ad4681355ffa1b37b77c113c176a531195" dependencies = [ "asynchronous-codec", "bytes", "futures", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "log", - "prost", - "prost-build", - "unsigned-varint 0.7.1", - "void", + "quick-protobuf", + "unsigned-varint 0.7.2", ] [[package]] name = "libp2p-quic" -version = "0.7.0-alpha" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59" +checksum = "4cb763e88f9a043546bfebd3575f340e7dd3d6c1b2cf2629600ec8965360c63a" dependencies = [ "bytes", "futures", "futures-timer", "if-watch", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-tls", "log", "parking_lot 0.12.1", - "quinn-proto", - "rand 0.8.5", - "rustls 0.20.8", + "quinn", + "rand", + "rustls", + "socket2 0.5.4", "thiserror", "tokio", ] [[package]] name = "libp2p-swarm" -version = "0.41.1" +version = "0.43.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0" +checksum = "28016944851bd73526d3c146aabf0fa9bbe27c558f080f9e5447da3a1772c01a" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-swarm-derive", "log", - "pin-project", - "rand 0.8.5", - "smallvec", - "thiserror", + "multistream-select", + "once_cell", + "rand", + "smallvec 1.11.0", "tokio", "void", ] [[package]] name = "libp2p-swarm-derive" -version = "0.31.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" +checksum = "c4d5ec2a3df00c7836d7696c136274c9c59705bac69133253696a6c932cd1d74" dependencies = [ "heck", + "proc-macro-warning", + "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] name = "libp2p-tcp" -version = "0.38.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d" +checksum = "09bfdfb6f945c5c014b87872a0bdb6e0aef90e92f380ef57cd9013f118f9289d" dependencies = [ "futures", "futures-timer", "if-watch", "libc", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "log", - "socket2 0.4.9", + "socket2 0.5.4", "tokio", ] [[package]] name = "libp2p-tls" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" +checksum = "8218d1d5482b122ccae396bbf38abdcb283ecc96fa54760e1dfd251f0546ac61" dependencies = [ "futures", "futures-rustls", - "libp2p-core 0.39.1", + "libp2p-core", "libp2p-identity", - "rcgen 0.10.0", + "rcgen", "ring", - "rustls 0.20.8", + "rustls", + "rustls-webpki", "thiserror", - "webpki 0.22.0", - "x509-parser 0.14.0", + "x509-parser", "yasna", ] [[package]] -name = "libp2p-webrtc" -version = "0.4.0-alpha" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a" -dependencies = [ - "async-trait", - "asynchronous-codec", - "bytes", - "futures", - "futures-timer", - "hex", - "if-watch", - "libp2p-core 0.38.0", - "libp2p-noise", - "log", - "multihash 0.16.3", - "prost", - "prost-build", - "prost-codec", - "rand 0.8.5", - "rcgen 0.9.3", - "serde", - "stun", - "thiserror", - "tinytemplate", - "tokio", - "tokio-util 0.7.7", - "webrtc", -] - -[[package]] -name = "libp2p-websocket" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54" -dependencies = [ - "either", - "futures", - "futures-rustls", - "libp2p-core 0.38.0", - "log", - "parking_lot 0.12.1", - "quicksink", - "rw-stream-sink", - "soketto", - "url", - "webpki-roots", -] - -[[package]] name = "libp2p-yamux" -version = "0.42.0" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29" +checksum = "8eedcb62824c4300efb9cfd4e2a6edaf3ca097b9e68b36dabe45a44469fd6a85" dependencies = [ "futures", - "libp2p-core 0.38.0", + "libp2p-core", "log", - "parking_lot 0.12.1", "thiserror", "yamux", ] @@ -4433,7 +4382,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.5", + "rand", "serde", "sha2 0.9.9", "typenum", @@ -4480,9 +4429,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "pkg-config", @@ -4491,11 +4440,12 @@ dependencies = [ [[package]] name = "lighthouse" -version = "4.1.0" +version = "4.5.0" dependencies = [ "account_manager", "account_utils", "beacon_node", + "beacon_processor", "bls", "boot_node", "clap", @@ -4505,8 +4455,9 @@ dependencies = [ "env_logger 0.9.3", "environment", "eth1", - "eth2_hashing", + "eth2", "eth2_network_config", + "ethereum_hashing", "futures", "lazy_static", "lighthouse_metrics", @@ -4527,6 +4478,7 @@ dependencies = [ "unused_port", "validator_client", "validator_dir", + "validator_manager", ] [[package]] @@ -4546,15 +4498,16 @@ dependencies = [ "dirs", "discv5", "error-chain", - "eth2_ssz", - "eth2_ssz_derive", - "eth2_ssz_types", + "ethereum_ssz", + "ethereum_ssz_derive", "exit-future", "fnv", "futures", "hex", "lazy_static", "libp2p", + "libp2p-mplex", + "libp2p-quic", "lighthouse_metrics", "lighthouse_version", "lru 0.7.8", @@ -4563,18 +4516,19 @@ dependencies = [ "prometheus-client", "quickcheck", "quickcheck_macros", - "rand 0.8.5", + "rand", "regex", "serde", "serde_derive", - "sha2 0.10.6", + "sha2 0.9.9", "slog", "slog-async", "slog-term", - "smallvec", + "smallvec 1.11.0", "snap", + "ssz_types", "strum", - "superstruct 0.5.0", + "superstruct", "task_executor", "tempfile", "tiny-keccak", @@ -4599,15 +4553,6 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] name = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4615,16 +4560,28 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[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.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lmdb-rkv" version = "0.14.0" source = "git+https://github.com/sigp/lmdb-rs?rev=f33845c6469b94265319aac0ed5085597862c27e#f33845c6469b94265319aac0ed5085597862c27e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "lmdb-rkv-sys", @@ -4642,11 +4599,11 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ - "autocfg 1.1.0", + "autocfg", "scopeguard", ] @@ -4660,22 +4617,26 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "logging" version = "0.2.0" dependencies = [ + "chrono", "lazy_static", "lighthouse_metrics", + "parking_lot 0.12.1", + "serde", + "serde_json", "slog", + "slog-async", "slog-term", "sloggers", + "take_mut", + "tokio", ] [[package]] @@ -4689,11 +4650,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.8.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ - "hashbrown 0.12.3", + "hashbrown 0.13.2", ] [[package]] @@ -4751,7 +4712,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -4762,9 +4723,15 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.5.0" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" + +[[package]] +name = "maybe-uninit" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "md-5" @@ -4772,7 +4739,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -4787,10 +4754,16 @@ dependencies = [ ] [[package]] +name = "mediatype" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c408dc227d302f1496c84d9dc68c00fec6f56f9228a18f3023f976f3ca7c945" + +[[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" @@ -4798,24 +4771,24 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] name = "merkle_proof" version = "0.2.0" dependencies = [ - "eth2_hashing", "ethereum-types 0.14.1", + "ethereum_hashing", "lazy_static", "quickcheck", "quickcheck_macros", @@ -4824,39 +4797,43 @@ dependencies = [ [[package]] name = "metastruct" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "734788dec2091fe9afa39530ca2ea7994f4a2c9aff3dbfebb63f2c1945c6f10b" +checksum = "ccfbb8826226b09b05bb62a0937cf6abb16f1f7d4b746eb95a83db14aec60f06" dependencies = [ "metastruct_macro", ] [[package]] name = "metastruct_macro" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ded15e7570c2a507a23e6c3a1c8d74507b779476e43afe93ddfc261d44173d" +checksum = "37cb4045d5677b7da537f8cb5d0730d5b6414e3cc81c61e4b50e1f0cbdc73909" dependencies = [ - "darling 0.13.4", + "darling", "itertools", "proc-macro2", "quote", - "smallvec", + "smallvec 1.11.0", "syn 1.0.109", ] [[package]] name = "mev-rs" -version = "0.2.1" -source = "git+https://github.com/ralexstokes//mev-rs?rev=7813d4a4a564e0754e9aaab2d95520ba437c3889#7813d4a4a564e0754e9aaab2d95520ba437c3889" +version = "0.3.0" +source = "git+https://github.com/ralexstokes/mev-rs?rev=216657016d5c0889b505857c89ae42c7aa2764af#216657016d5c0889b505857c89ae42c7aa2764af" dependencies = [ + "anvil-rpc", "async-trait", "axum", "beacon-api-client", "ethereum-consensus", "hyper", + "parking_lot 0.12.1", + "reqwest", "serde", - "ssz-rs", + "serde_json", + "ssz_rs", "thiserror", "tokio", "tracing", @@ -4864,19 +4841,19 @@ dependencies = [ [[package]] name = "migrations_internals" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c493c09323068c01e54c685f7da41a9ccf9219735c3766fbfd6099806ea08fbc" +checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" dependencies = [ "serde", - "toml", + "toml 0.7.8", ] [[package]] name = "migrations_macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8ff27a350511de30cdabb77147501c36ef02e0451d957abea2f30caffb2b58" +checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" dependencies = [ "migrations_internals", "proc-macro2", @@ -4885,13 +4862,13 @@ dependencies = [ [[package]] name = "milagro_bls" -version = "1.4.2" -source = "git+https://github.com/sigp/milagro_bls?tag=v1.4.2#16655aa033175a90c10ef02aa144e2835de23aec" +version = "1.5.1" +source = "git+https://github.com/sigp/milagro_bls?tag=v1.5.1#d3fc0a40cfe8b72ccda46ba050ee6786a59ce753" dependencies = [ "amcl", "hex", "lazy_static", - "rand 0.7.3", + "rand", "zeroize", ] @@ -4919,23 +4896,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -4971,51 +4947,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" dependencies = [ "arrayref", - "bs58", + "bs58 0.4.0", "byteorder", "data-encoding", "multihash 0.16.3", "percent-encoding", "serde", "static_assertions", - "unsigned-varint 0.7.1", + "unsigned-varint 0.7.2", "url", ] [[package]] name = "multiaddr" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e" -dependencies = [ - "arrayref", - "byteorder", - "data-encoding", - "multibase", - "multihash 0.16.3", - "percent-encoding", - "serde", - "static_assertions", - "unsigned-varint 0.7.1", - "url", -] - -[[package]] -name = "multiaddr" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd" +checksum = "92a651988b3ed3ad1bc8c87d016bb92f6f395b84ed1db9b926b32b1fc5a2c8b5" dependencies = [ "arrayref", "byteorder", "data-encoding", - "log", + "libp2p-identity", "multibase", - "multihash 0.17.0", + "multihash 0.19.1", "percent-encoding", "serde", "static_assertions", - "unsigned-varint 0.7.1", + "unsigned-varint 0.7.2", "url", ] @@ -5037,23 +4995,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" dependencies = [ "core2", - "digest 0.10.6", + "digest 0.10.7", "multihash-derive", - "sha2 0.10.6", - "unsigned-varint 0.7.1", + "sha2 0.10.7", + "unsigned-varint 0.7.2", ] [[package]] name = "multihash" -version = "0.17.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" +checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" dependencies = [ "core2", - "digest 0.10.6", - "multihash-derive", - "sha2 0.10.6", - "unsigned-varint 0.7.1", + "unsigned-varint 0.7.2", ] [[package]] @@ -5071,55 +5026,17 @@ dependencies = [ ] [[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "multipart" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" -dependencies = [ - "buf_redux", - "httparse", - "log", - "mime", - "mime_guess", - "quick-error", - "rand 0.8.5", - "safemem", - "tempfile", - "twoway", -] - -[[package]] name = "multistream-select" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" -dependencies = [ - "bytes", - "futures", - "log", - "pin-project", - "smallvec", - "unsigned-varint 0.7.1", -] - -[[package]] -name = "multistream-select" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" +checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19" dependencies = [ "bytes", "futures", "log", "pin-project", - "smallvec", - "unsigned-varint 0.7.1", + "smallvec 1.11.0", + "unsigned-varint 0.7.2", ] [[package]] @@ -5159,7 +5076,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "netlink-packet-core", @@ -5211,13 +5128,13 @@ name = "network" version = "0.2.0" dependencies = [ "beacon_chain", + "beacon_processor", "delay_map", "derivative", "environment", "error-chain", - "eth2_ssz", - "eth2_ssz_types", "ethereum-types 0.14.1", + "ethereum_ssz", "execution_layer", "exit-future", "fnv", @@ -5235,14 +5152,16 @@ dependencies = [ "matches", "num_cpus", "operation_pool", - "rand 0.8.5", + "parking_lot 0.12.1", + "rand", "rlp", "slog", "slog-async", "slog-term", "sloggers", "slot_clock", - "smallvec", + "smallvec 1.11.0", + "ssz_types", "store", "strum", "task_executor", @@ -5258,7 +5177,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if", "libc", @@ -5271,22 +5190,20 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.5", ] [[package]] name = "nix" -version = "0.26.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cfg-if", "libc", - "static_assertions", ] [[package]] @@ -5299,22 +5216,23 @@ dependencies = [ "execution_layer", "sensitive_url", "tempfile", + "tokio", "types", "validator_client", "validator_dir", ] [[package]] -name = "nohash-hasher" -version = "0.2.0" +name = "nodrop" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] -name = "nom" -version = "2.2.1" +name = "nohash-hasher" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf51a729ecf40266a2368ad335a5fdde43471f545a967109cd62146ecf8b66ff" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" @@ -5328,9 +5246,9 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ "winapi", ] @@ -5347,31 +5265,30 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-bigint-dig" -version = "0.6.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d51546d704f52ef14b3c962b5776e53d5b862e5790e40a350d366c209bd7f7a" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" dependencies = [ - "autocfg 0.1.8", "byteorder", "lazy_static", - "libm 0.2.6", + "libm", "num-integer", "num-iter", "num-traits", - "rand 0.7.3", + "rand", "serde", - "smallvec", + "smallvec 1.11.0", "zeroize", ] @@ -5381,7 +5298,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-traits", ] @@ -5391,27 +5308,27 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] @@ -5426,36 +5343,27 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "oid-registry" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" -dependencies = [ - "asn1-rs 0.3.1", -] - -[[package]] -name = "oid-registry" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "asn1-rs 0.5.2", + "asn1-rs", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "oneshot_broadcast" @@ -5503,11 +5411,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.49" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -5524,7 +5432,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.37", ] [[package]] @@ -5535,18 +5443,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.2+1.1.1t" +version = "300.1.3+3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431" +checksum = "cd2c101a165fff9935e34def4669595ab1c7847943c42be86e21503e482be107" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.84" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -5562,14 +5470,14 @@ dependencies = [ "beacon_chain", "bitvec 1.0.1", "derivative", - "eth2_ssz", - "eth2_ssz_derive", + "ethereum_ssz", + "ethereum_ssz_derive", "itertools", "lazy_static", "lighthouse_metrics", "maplit", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "rayon", "serde", "serde_derive", @@ -5587,34 +5495,14 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "p256" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" -dependencies = [ - "ecdsa", - "elliptic-curve", - "sha2 0.10.6", -] - -[[package]] -name = "p384" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" -dependencies = [ - "ecdsa", - "elliptic-curve", - "sha2 0.10.6", -] - -[[package]] -name = "packed_simd_2" -version = "0.3.8" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ - "cfg-if", - "libm 0.1.4", + "ecdsa 0.16.8", + "elliptic-curve 0.13.5", + "primeorder", + "sha2 0.10.7", ] [[package]] @@ -5633,15 +5521,15 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.4.0" +version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac" +checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" dependencies = [ "arrayvec", "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.1.4", + "parity-scale-codec-derive 3.6.5", "serde", ] @@ -5659,9 +5547,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.4" +version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b" +checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5671,9 +5559,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -5693,7 +5581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", + "parking_lot_core 0.9.8", ] [[package]] @@ -5706,45 +5594,59 @@ dependencies = [ "instant", "libc", "redox_syscall 0.2.16", - "smallvec", + "smallvec 1.11.0", "winapi", ] [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", - "smallvec", - "windows-sys 0.45.0", + "redox_syscall 0.3.5", + "smallvec 1.11.0", + "windows-targets 0.48.5", +] + +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", ] [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "crypto-mac 0.8.0", + "crypto-mac 0.11.1", ] [[package]] name = "pbkdf2" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "crypto-mac 0.11.1", + "digest 0.10.7", + "hmac 0.12.1", + "password-hash", + "sha2 0.10.7", ] [[package]] @@ -5764,28 +5666,18 @@ dependencies = [ [[package]] name = "pem-rfc7468" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" dependencies = [ "base64ct", ] [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "petgraph" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" -dependencies = [ - "fixedbitset", - "indexmap", -] +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pharos" @@ -5794,58 +5686,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version 0.4.0", + "rustc_version", ] [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_shared", ] [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -5859,15 +5745,25 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der", - "spki", + "der 0.6.1", + "spki 0.6.0", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der 0.7.8", + "spki 0.7.2", ] [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" @@ -5877,15 +5773,15 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "platforms" -version = "3.0.2" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" [[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -5896,33 +5792,33 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] [[package]] name = "polling" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ - "autocfg 1.1.0", - "bitflags", + "autocfg", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.9", - "windows-sys 0.45.0", + "pin-project-lite", + "windows-sys 0.48.0", ] [[package]] @@ -5933,7 +5829,7 @@ checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ "cpufeatures", "opaque-debug", - "universal-hash 0.4.1", + "universal-hash", ] [[package]] @@ -5945,44 +5841,32 @@ dependencies = [ "cfg-if", "cpufeatures", "opaque-debug", - "universal-hash 0.4.1", -] - -[[package]] -name = "polyval" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash 0.5.0", + "universal-hash", ] [[package]] name = "postgres-protocol" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b7fa9f396f51dffd61546fd8573ee20592287996568e6175ceb0f8699ad75d" +checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.0", + "base64 0.21.4", "byteorder", "bytes", "fallible-iterator", "hmac 0.12.1", "md-5", "memchr", - "rand 0.8.5", - "sha2 0.10.6", + "rand", + "sha2 0.10.7", "stringprep", ] [[package]] name = "postgres-types" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f028f05971fe20f512bcc679e2c10227e57809a3af86a7606304435bc8896cd6" +checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" dependencies = [ "bytes", "fallible-iterator", @@ -5997,21 +5881,28 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pq-sys" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b845d6d8ec554f972a2c5298aad68953fd64e7441e846075450b44656a016d1" +checksum = "31c0052426df997c0cbd30789eb44ca097e3541717a7b8fa36b1c464ee7edebd" dependencies = [ "vcpkg", ] [[package]] -name = "prettyplease" -version = "0.1.25" +name = "pretty_reqwest_error" +version = "0.1.0" +dependencies = [ + "reqwest", + "sensitive_url", +] + +[[package]] +name = "primeorder" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" dependencies = [ - "proc-macro2", - "syn 1.0.109", + "elliptic-curve 0.13.5", ] [[package]] @@ -6048,7 +5939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", - "toml", + "toml 0.5.11", ] [[package]] @@ -6082,24 +5973,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] +name = "proc-macro-warning" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + +[[package]] name = "proc-macro2" -version = "1.0.55" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] [[package]] -name = "procinfo" -version = "0.4.2" +name = "procfs" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab1427f3d2635891f842892dda177883dca0639e05fe66796a62c9d2f23b49c" +checksum = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f" dependencies = [ + "bitflags 1.3.2", "byteorder", - "libc", - "nom 2.2.1", - "rustc_version 0.2.3", + "chrono", + "flate2", + "hex", + "lazy_static", + "rustix 0.36.15", ] [[package]] @@ -6119,104 +6024,38 @@ dependencies = [ [[package]] name = "prometheus-client" -version = "0.18.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" +checksum = "3c99afa9a01501019ac3a14d71d9f94050346f55ca471ce90c799a15c58f61e2" dependencies = [ "dtoa", "itoa", "parking_lot 0.12.1", - "prometheus-client-derive-text-encode", -] - -[[package]] -name = "prometheus-client-derive-text-encode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12" -dependencies = [ - "bytes", - "heck", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", + "prometheus-client-derive-encode", ] [[package]] -name = "prost-codec" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0" -dependencies = [ - "asynchronous-codec", - "bytes", - "prost", - "thiserror", - "unsigned-varint 0.7.1", -] - -[[package]] -name = "prost-derive" -version = "0.11.8" +name = "prometheus-client-derive-encode" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b" +checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ - "anyhow", - "itertools", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-types" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" -dependencies = [ - "prost", + "syn 2.0.37", ] [[package]] name = "proto_array" version = "0.2.0" dependencies = [ - "eth2_ssz", - "eth2_ssz_derive", + "ethereum_ssz", + "ethereum_ssz_derive", "safe_arith", "serde", "serde_derive", "serde_yaml", + "superstruct", "types", ] @@ -6261,22 +6100,34 @@ dependencies = [ ] [[package]] +name = "quick-protobuf-codec" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98" +dependencies = [ + "asynchronous-codec", + "bytes", + "quick-protobuf", + "thiserror", + "unsigned-varint 0.7.2", +] + +[[package]] name = "quickcheck" -version = "0.9.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ - "env_logger 0.7.1", + "env_logger 0.8.4", "log", - "rand 0.7.3", - "rand_core 0.5.1", + "rand", ] [[package]] name = "quickcheck_macros" -version = "0.9.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608c156fd8e97febc07dc9c2e2c80bf74cfc6ef26893eae3daf8bc2bc94a4b7f" +checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ "proc-macro2", "quote", @@ -6284,39 +6135,58 @@ dependencies = [ ] [[package]] -name = "quicksink" -version = "0.1.2" +name = "quinn" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ - "futures-core", - "futures-sink", - "pin-project-lite 0.1.12", + "bytes", + "futures-io", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", ] [[package]] name = "quinn-proto" -version = "0.9.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" +checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" dependencies = [ "bytes", - "rand 0.8.5", + "rand", "ring", "rustc-hash", - "rustls 0.20.8", + "rustls", "slab", "thiserror", "tinyvec", "tracing", - "webpki 0.22.0", +] + +[[package]] +name = "quinn-udp" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +dependencies = [ + "bytes", + "libc", + "socket2 0.5.4", + "tracing", + "windows-sys 0.48.0", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -6356,40 +6226,17 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", + "rand_chacha", "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", -] - -[[package]] -name = "rand_chacha" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" @@ -6413,16 +6260,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom 0.2.10", ] [[package]] @@ -6458,26 +6296,13 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" -dependencies = [ - "pem", - "ring", - "time 0.3.20", - "x509-parser 0.13.2", - "yasna", -] - -[[package]] -name = "rcgen" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.20", + "time", "yasna", ] @@ -6487,7 +6312,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -6496,7 +6321,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -6505,20 +6330,21 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata 0.3.8", + "regex-syntax 0.7.5", ] [[package]] @@ -6527,7 +6353,18 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", ] [[package]] @@ -6537,12 +6374,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.0", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -6560,16 +6403,16 @@ dependencies = [ "native-tls", "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", - "rustls 0.20.8", + "pin-project-lite", + "rustls", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-rustls 0.23.4", - "tokio-util 0.7.7", + "tokio-rustls", + "tokio-util 0.7.8", "tower-service", "url", "wasm-bindgen", @@ -6596,12 +6439,22 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ - "crypto-bigint", + "crypto-bigint 0.4.9", "hmac 0.12.1", "zeroize", ] [[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac 0.12.1", + "subtle", +] + +[[package]] name = "ring" version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6654,17 +6507,6 @@ dependencies = [ ] [[package]] -name = "rtcp" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" -dependencies = [ - "bytes", - "thiserror", - "webrtc-util", -] - -[[package]] name = "rtnetlink" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6680,38 +6522,24 @@ dependencies = [ ] [[package]] -name = "rtp" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80" -dependencies = [ - "async-trait", - "bytes", - "rand 0.8.5", - "serde", - "thiserror", - "webrtc-util", -] - -[[package]] name = "rusqlite" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "fallible-iterator", "fallible-streaming-iterator", - "hashlink 0.8.1", + "hashlink 0.8.4", "libsqlite3-sys", - "smallvec", + "smallvec 1.11.0", ] [[package]] name = "rustc-demangle" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -6727,20 +6555,11 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.17", + "semver", ] [[package]] @@ -6749,68 +6568,92 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" dependencies = [ - "nom 7.1.3", + "nom", ] [[package]] name = "rustix" -version = "0.37.6" +version = "0.36.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" +checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.1.4", "windows-sys 0.45.0", ] [[package]] -name = "rustls" -version = "0.19.1" +name = "rustix" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "base64 0.13.1", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", + "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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.7", + "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.0", + "rustls-webpki", + "sct", ] [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.0", + "base64 0.21.4", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +dependencies = [ + "ring", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rw-stream-sink" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" +checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1" dependencies = [ "futures", "pin-project", @@ -6819,21 +6662,15 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe_arith" version = "0.1.0" [[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] name = "salsa20" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6853,21 +6690,21 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.5.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cfdffd972d76b22f3d7f81c8be34b2296afd3a25e0a547bd9abe340a4dbbe97" +checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782" dependencies = [ "cfg-if", "derive_more", - "parity-scale-codec 3.4.0", + "parity-scale-codec 3.6.5", "scale-info-derive", ] [[package]] name = "scale-info-derive" -version = "2.5.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61fa974aea2d63dd18a4ec3a49d59af9f34178c73a4f56d2f18205628d00681e" +checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6877,11 +6714,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -6901,15 +6738,9 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypt" @@ -6925,16 +6756,6 @@ dependencies = [ [[package]] name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sct" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" @@ -6944,56 +6765,40 @@ dependencies = [ ] [[package]] -name = "sdp" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13" -dependencies = [ - "rand 0.8.5", - "substring", - "thiserror", - "url", -] - -[[package]] name = "sec1" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ - "base16ct", - "der", + "base16ct 0.1.1", + "der 0.6.1", "generic-array", - "pkcs8", + "pkcs8 0.9.0", "subtle", "zeroize", ] [[package]] -name = "secp256k1" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" -dependencies = [ - "secp256k1-sys", -] - -[[package]] -name = "secp256k1-sys" -version = "0.4.2" +name = "sec1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ - "cc", + "base16ct 0.2.0", + "der 0.7.8", + "generic-array", + "pkcs8 0.10.2", + "subtle", + "zeroize", ] [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -7002,9 +6807,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -7012,26 +6817,14 @@ dependencies = [ [[package]] name = "semver" -version = "0.9.0" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ - "semver-parser", + "serde", ] [[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] name = "send_wrapper" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7047,14 +6840,25 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.159" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] +name = "serde-hex" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca37e3e4d1b39afd7ff11ee4e947efae85adfddf4841787bfa47c470e96dc26d" +dependencies = [ + "array-init", + "serde", + "smallvec 0.6.14", +] + +[[package]] name = "serde_array_query" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7076,20 +6880,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.37", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -7097,14 +6901,33 @@ dependencies = [ ] [[package]] +name = "serde_path_to_error" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +dependencies = [ + "itoa", + "serde", +] + +[[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.37", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", ] [[package]] @@ -7135,7 +6958,7 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ - "darling 0.13.4", + "darling", "proc-macro2", "quote", "syn 1.0.109", @@ -7147,37 +6970,13 @@ version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "ryu", "serde", "yaml-rust", ] [[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.6", -] - -[[package]] name = "sha1" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7185,7 +6984,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -7203,13 +7002,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -7226,11 +7025,11 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -7245,9 +7044,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook-registry" @@ -7264,7 +7063,17 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", + "rand_core 0.6.4", +] + +[[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest 0.10.7", "rand_core 0.6.4", ] @@ -7277,7 +7086,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.20", + "time", ] [[package]] @@ -7300,17 +7109,17 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -7319,8 +7128,8 @@ version = "0.1.0" dependencies = [ "bincode", "byteorder", - "eth2_ssz", - "eth2_ssz_derive", + "ethereum_ssz", + "ethereum_ssz_derive", "filesystem", "flate2", "lazy_static", @@ -7332,7 +7141,7 @@ dependencies = [ "lru 0.7.8", "maplit", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "rayon", "safe_arith", "serde", @@ -7368,7 +7177,7 @@ name = "slashing_protection" version = "0.1.0" dependencies = [ "arbitrary", - "eth2_serde_utils", + "ethereum_serde_utils", "filesystem", "lazy_static", "r2d2", @@ -7390,9 +7199,9 @@ checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" [[package]] name = "slog-async" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "766c59b252e62a34651412870ff55d8c4e6d04df19b43eecb2703e417b097ffe" +checksum = "72c8038f898a2c79507940990f05386455b3a317d8f18d4caea7cbc3d5096b84" dependencies = [ "crossbeam-channel", "slog", @@ -7409,7 +7218,7 @@ dependencies = [ "serde", "serde_json", "slog", - "time 0.3.20", + "time", ] [[package]] @@ -7454,14 +7263,14 @@ dependencies = [ "slog", "term", "thread_local", - "time 0.3.20", + "time", ] [[package]] name = "sloggers" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e20d36cb80da75a9c5511872f15247ddad14ead8c1dd97a86b56d1be9f5d4a0e" +checksum = "7a0a4d8569a69ee56f277bffc2f6eee637b98ed468448e8a5a84fa63efe4de9d" dependencies = [ "chrono", "libc", @@ -7493,9 +7302,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +dependencies = [ + "maybe-uninit", +] + +[[package]] +name = "smallvec" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "snap" @@ -7505,18 +7323,18 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" +checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155" dependencies = [ - "aes-gcm 0.9.4", + "aes-gcm", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-rc.2", + "curve25519-dalek 4.1.0", "rand_core 0.6.4", "ring", - "rustc_version 0.4.0", - "sha2 0.10.6", + "rustc_version", + "sha2 0.10.7", "subtle", ] @@ -7532,28 +7350,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc8d618c6641ae355025c449427f9e96b98abf99a772be3cef6708d15c77147a" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "soketto" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" -dependencies = [ - "base64 0.13.1", - "bytes", - "flate2", - "futures", - "httparse", - "log", - "rand 0.8.5", - "sha-1 0.9.8", + "windows-sys 0.48.0", ] [[package]] @@ -7569,27 +7371,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der", + "der 0.6.1", ] [[package]] -name = "ssz-rs" -version = "0.8.0" -source = "git+https://github.com/ralexstokes//ssz-rs?rev=adf1a0b14cef90b9536f28ef89da1fab316465e1#adf1a0b14cef90b9536f28ef89da1fab316465e1" +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der 0.7.8", +] + +[[package]] +name = "ssz_rs" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "057291e5631f280978fa9c8009390663ca4613359fc1318e36a8c24c392f6d1f" dependencies = [ "bitvec 1.0.1", "hex", "num-bigint", "serde", "sha2 0.9.9", - "ssz-rs-derive", - "thiserror", + "ssz_rs_derive", ] [[package]] -name = "ssz-rs-derive" -version = "0.8.0" -source = "git+https://github.com/ralexstokes//ssz-rs?rev=adf1a0b14cef90b9536f28ef89da1fab316465e1#adf1a0b14cef90b9536f28ef89da1fab316465e1" +name = "ssz_rs_derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f07d54c4d01a1713eb363b55ba51595da15f6f1211435b71466460da022aa140" dependencies = [ "proc-macro2", "quote", @@ -7597,6 +7410,24 @@ dependencies = [ ] [[package]] +name = "ssz_types" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382939886cb24ee8ac885d09116a60f6262d827c7a9e36012b4f6d3d0116d0b3" +dependencies = [ + "arbitrary", + "derivative", + "ethereum_serde_utils", + "ethereum_ssz", + "itertools", + "serde", + "serde_derive", + "smallvec 1.11.0", + "tree_hash", + "typenum", +] + +[[package]] name = "state_processing" version = "0.2.0" dependencies = [ @@ -7605,10 +7436,9 @@ dependencies = [ "bls", "derivative", "env_logger 0.9.3", - "eth2_hashing", - "eth2_ssz", - "eth2_ssz_derive", - "eth2_ssz_types", + "ethereum_hashing", + "ethereum_ssz", + "ethereum_ssz_derive", "int_to_bytes", "integer-sqrt", "itertools", @@ -7617,7 +7447,8 @@ dependencies = [ "merkle_proof", "rayon", "safe_arith", - "smallvec", + "smallvec 1.11.0", + "ssz_types", "tokio", "tree_hash", "types", @@ -7628,7 +7459,7 @@ name = "state_transition_vectors" version = "0.1.0" dependencies = [ "beacon_chain", - "eth2_ssz", + "ethereum_ssz", "lazy_static", "state_processing", "tokio", @@ -7648,8 +7479,8 @@ dependencies = [ "beacon_chain", "db-key", "directory", - "eth2_ssz", - "eth2_ssz_derive", + "ethereum_ssz", + "ethereum_ssz_derive", "itertools", "lazy_static", "leveldb", @@ -7668,10 +7499,11 @@ dependencies = [ [[package]] name = "stringprep" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" dependencies = [ + "finl_unicode", "unicode-bidi", "unicode-normalization", ] @@ -7711,34 +7543,6 @@ dependencies = [ ] [[package]] -name = "stun" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" -dependencies = [ - "base64 0.13.1", - "crc", - "lazy_static", - "md-5", - "rand 0.8.5", - "ring", - "subtle", - "thiserror", - "tokio", - "url", - "webrtc-util", -] - -[[package]] -name = "substring" -version = "1.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] name = "subtle" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7746,29 +7550,15 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "superstruct" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a99807a055ff4ff5d249bb84c80d9eabb55ca3c452187daae43fd5b51ef695" -dependencies = [ - "darling 0.13.4", - "itertools", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "superstruct" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b9e5728aa1a87141cefd4e7509903fc01fa0dcb108022b1e841a67c5159fc5" dependencies = [ - "darling 0.13.4", + "darling", "itertools", "proc-macro2", "quote", - "smallvec", + "smallvec 1.11.0", "syn 1.0.109", ] @@ -7777,8 +7567,8 @@ name = "swap_or_not_shuffle" version = "0.2.0" dependencies = [ "criterion", - "eth2_hashing", "ethereum-types 0.14.1", + "ethereum_hashing", ] [[package]] @@ -7794,9 +7584,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" dependencies = [ "proc-macro2", "quote", @@ -7838,11 +7628,11 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] @@ -7910,15 +7700,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "rustix 0.38.13", + "windows-sys 0.48.0", ] [[package]] @@ -7960,18 +7750,17 @@ dependencies = [ [[package]] name = "testcontainers" version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e2b1567ca8a2b819ea7b28c92be35d9f76fb9edb214321dcc86eb96023d1f87" +source = "git+https://github.com/testcontainers/testcontainers-rs/?rev=0f2c9851#0f2c985160e51a200cfc847097c15b8d85ed7df1" dependencies = [ "bollard-stubs", "futures", "hex", "hmac 0.12.1", "log", - "rand 0.8.5", + "rand", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", ] [[package]] @@ -7985,22 +7774,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.37", ] [[package]] @@ -8024,21 +7813,11 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.20" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ + "deranged", "itoa", "libc", "num_threads", @@ -8049,15 +7828,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -8075,17 +7854,17 @@ dependencies = [ [[package]] name = "tiny-bip39" -version = "0.8.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" dependencies = [ "anyhow", - "hmac 0.8.1", + "hmac 0.12.1", "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", + "pbkdf2 0.11.0", + "rand", "rustc-hash", - "sha2 0.9.9", + "sha2 0.10.7", "thiserror", "unicode-normalization", "wasm-bindgen", @@ -8128,21 +7907,21 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg 1.1.0", + "backtrace", "bytes", "libc", "mio", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite 0.2.9", + "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.4", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -8151,19 +7930,19 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ - "pin-project-lite 0.2.9", + "pin-project-lite", "tokio", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.37", ] [[package]] @@ -8178,9 +7957,9 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e89f6234aa8fd43779746012fcf53603cdb91fdd8399aa0de868c2d56b6dde1" +checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" dependencies = [ "async-trait", "byteorder", @@ -8192,75 +7971,36 @@ dependencies = [ "parking_lot 0.12.1", "percent-encoding", "phf", - "pin-project-lite 0.2.9", + "pin-project-lite", "postgres-protocol", "postgres-types", - "socket2 0.5.1", + "rand", + "socket2 0.5.4", "tokio", - "tokio-util 0.7.7", + "tokio-util 0.7.8", + "whoami", ] [[package]] name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki 0.21.4", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.20.8", + "rustls", "tokio", - "webpki 0.22.0", ] [[package]] name = "tokio-stream" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", + "pin-project-lite", "tokio", - "tokio-util 0.7.7", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8" -dependencies = [ - "futures-util", - "log", - "pin-project", - "tokio", - "tungstenite 0.14.0", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" -dependencies = [ - "futures-util", - "log", - "rustls 0.20.8", - "tokio", - "tokio-rustls 0.23.4", - "tungstenite 0.17.3", - "webpki 0.22.0", - "webpki-roots", + "tokio-util 0.7.8", ] [[package]] @@ -8274,22 +8014,21 @@ dependencies = [ "futures-io", "futures-sink", "log", - "pin-project-lite 0.2.9", + "pin-project-lite", "slab", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", - "futures-io", "futures-sink", - "pin-project-lite 0.2.9", + "pin-project-lite", "slab", "tokio", "tracing", @@ -8305,6 +8044,40 @@ dependencies = [ ] [[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] name = "tower" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8313,7 +8086,7 @@ dependencies = [ "futures-core", "futures-util", "pin-project", - "pin-project-lite 0.2.9", + "pin-project-lite", "tokio", "tower-layer", "tower-service", @@ -8321,25 +8094,6 @@ dependencies = [ ] [[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite 0.2.9", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] name = "tower-layer" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8359,27 +8113,27 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", - "pin-project-lite 0.2.9", + "pin-project-lite", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -8408,16 +8162,16 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", "once_cell", "regex", "sharded-slab", - "smallvec", + "smallvec 1.11.0", "thread_local", "tracing", "tracing-core", @@ -8426,9 +8180,9 @@ dependencies = [ [[package]] name = "trackable" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017e2a1a93718e4e8386d037cfb8add78f1d690467f4350fb582f55af1203167" +checksum = "b15bd114abb99ef8cee977e517c8f37aee63f184f2d08e3e6ceca092373369ae" dependencies = [ "trackable_derive", ] @@ -8445,24 +8199,22 @@ dependencies = [ [[package]] name = "tree_hash" -version = "0.4.1" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c998ac5fe2b07c025444bdd522e6258110b63861c6698eedc610c071980238d" dependencies = [ - "beacon_chain", - "eth2_hashing", - "eth2_ssz", - "eth2_ssz_derive", "ethereum-types 0.14.1", - "rand 0.8.5", - "smallvec", - "tree_hash_derive", - "types", + "ethereum_hashing", + "smallvec 1.11.0", ] [[package]] name = "tree_hash_derive" -version = "0.4.0" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84303a9c7cda5f085a3ed9cd241d1e95e04d88aab1d679b02f212e653537ba86" dependencies = [ - "darling 0.13.4", + "darling", "quote", "syn 1.0.109", ] @@ -8493,8 +8245,8 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "rand 0.8.5", - "smallvec", + "rand", + "smallvec 1.11.0", "socket2 0.4.9", "thiserror", "tinyvec", @@ -8516,7 +8268,7 @@ dependencies = [ "lru-cache", "parking_lot 0.12.1", "resolv-conf", - "smallvec", + "smallvec 1.11.0", "thiserror", "tokio", "tracing", @@ -8530,78 +8282,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] -name = "tungstenite" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http", - "httparse", - "log", - "rand 0.8.5", - "sha-1 0.9.8", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "tungstenite" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http", - "httparse", - "log", - "rand 0.8.5", - "rustls 0.20.8", - "sha-1 0.10.1", - "thiserror", - "url", - "utf-8", - "webpki 0.22.0", -] - -[[package]] -name = "turn" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" -dependencies = [ - "async-trait", - "base64 0.13.1", - "futures", - "log", - "md-5", - "rand 0.8.5", - "ring", - "stun", - "thiserror", - "tokio", - "webrtc-util", -] - -[[package]] -name = "twoway" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" -dependencies = [ - "memchr", -] - -[[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 = "types" @@ -8615,13 +8299,12 @@ dependencies = [ "compare_fields_derive", "criterion", "derivative", - "eth2_hashing", "eth2_interop_keypairs", - "eth2_serde_utils", - "eth2_ssz", - "eth2_ssz_derive", - "eth2_ssz_types", "ethereum-types 0.14.1", + "ethereum_hashing", + "ethereum_serde_utils", + "ethereum_ssz", + "ethereum_ssz_derive", "hex", "int_to_bytes", "itertools", @@ -8631,7 +8314,8 @@ dependencies = [ "merkle_proof", "metastruct", "parking_lot 0.12.1", - "rand 0.8.5", + "paste", + "rand", "rand_xorshift", "rayon", "regex", @@ -8643,9 +8327,11 @@ dependencies = [ "serde_with", "serde_yaml", "slog", - "smallvec", + "smallvec 1.11.0", + "ssz_types", "state_processing", - "superstruct 0.6.0", + "strum", + "superstruct", "swap_or_not_shuffle", "tempfile", "test_random_derive", @@ -8675,9 +8361,9 @@ checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -8690,9 +8376,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -8726,16 +8412,6 @@ dependencies = [ ] [[package]] -name = "universal-hash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" -dependencies = [ - "crypto-common", - "subtle", -] - -[[package]] name = "unsigned-varint" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8747,9 +8423,9 @@ dependencies = [ [[package]] name = "unsigned-varint" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" +checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" dependencies = [ "asynchronous-codec", "bytes", @@ -8772,41 +8448,26 @@ dependencies = [ [[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna 0.4.0", "percent-encoding", ] [[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] name = "uuid" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "serde", ] [[package]] -name = "uuid" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] name = "validator_client" version = "0.3.5" dependencies = [ @@ -8821,7 +8482,7 @@ dependencies = [ "environment", "eth2", "eth2_keystore", - "eth2_serde_utils", + "ethereum_serde_utils", "exit-future", "filesystem", "futures", @@ -8837,7 +8498,7 @@ dependencies = [ "malloc_utils", "monitoring_api", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "reqwest", "ring", "safe_arith", @@ -8853,6 +8514,7 @@ dependencies = [ "task_executor", "tempfile", "tokio", + "tokio-stream", "tree_hash", "types", "url", @@ -8868,14 +8530,40 @@ dependencies = [ "bls", "deposit_contract", "derivative", + "directory", "eth2_keystore", "filesystem", "hex", "lockfile", - "rand 0.8.5", + "rand", + "tempfile", + "tree_hash", + "types", +] + +[[package]] +name = "validator_manager" +version = "0.1.0" +dependencies = [ + "account_utils", + "bls", + "clap", + "clap_utils", + "environment", + "eth2", + "eth2_keystore", + "eth2_network_config", + "eth2_wallet", + "ethereum_serde_utils", + "hex", + "regex", + "serde", + "serde_json", "tempfile", + "tokio", "tree_hash", "types", + "validator_client", ] [[package]] @@ -8909,15 +8597,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] -name = "waitgroup" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" -dependencies = [ - "atomic-waker", -] - -[[package]] name = "waker-fn" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8925,9 +8604,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -8935,18 +8614,17 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] [[package]] name = "warp" -version = "0.3.2" -source = "git+https://github.com/macladson/warp?rev=7e75acc368229a46a236a8c991bf251fe7fe50ef#7e75acc368229a46a236a8c991bf251fe7fe50ef" +version = "0.3.5" +source = "git+https://github.com/seanmonstar/warp.git#5ad8a9cb155f6485d13d591a564d8c70053a388a" dependencies = [ "bytes", "futures-channel", @@ -8957,18 +8635,17 @@ dependencies = [ "log", "mime", "mime_guess", - "multipart", "percent-encoding", "pin-project", + "rustls-pemfile", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls 0.22.0", + "tokio-rustls", "tokio-stream", - "tokio-tungstenite 0.15.0", - "tokio-util 0.6.10", + "tokio-util 0.7.8", "tower-service", "tracing", ] @@ -8999,21 +8676,15 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -9021,24 +8692,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -9048,9 +8719,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -9058,52 +8729,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.37", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "wasm-bindgen-test" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9" -dependencies = [ - "proc-macro2", - "quote", -] +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -9145,13 +8792,15 @@ dependencies = [ "http_api", "hyper", "log", + "logging", "network", "r2d2", - "rand 0.7.3", + "rand", "reqwest", "serde", "serde_json", "serde_yaml", + "task_executor", "testcontainers", "tokio", "tokio-postgres", @@ -9162,62 +8811,15 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "web3" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f258e254752d210b84fe117b31f1e3cc9cbf04c0d747eb7f8cf7cf5e370f6d" -dependencies = [ - "arrayvec", - "base64 0.13.1", - "bytes", - "derive_more", - "ethabi 16.0.0", - "ethereum-types 0.12.1", - "futures", - "futures-timer", - "headers", - "hex", - "idna 0.2.3", - "jsonrpc-core", - "log", - "once_cell", - "parking_lot 0.12.1", - "pin-project", - "reqwest", - "rlp", - "secp256k1", - "serde", - "serde_json", - "soketto", - "tiny-keccak", - "tokio", - "tokio-util 0.6.10", - "url", - "web3-async-native-tls", -] - -[[package]] -name = "web3-async-native-tls" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6d8d1636b2627fe63518d5a9b38a569405d9c9bc665c43c9c341de57227ebb" -dependencies = [ - "native-tls", - "thiserror", - "tokio", - "url", -] - -[[package]] name = "web3signer_tests" version = "0.1.0" dependencies = [ @@ -9231,7 +8833,6 @@ dependencies = [ "parking_lot 0.12.1", "reqwest", "serde", - "serde_derive", "serde_json", "serde_yaml", "slot_clock", @@ -9245,255 +8846,19 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki 0.22.0", -] - -[[package]] -name = "webrtc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "hex", - "interceptor", - "lazy_static", - "log", - "rand 0.8.5", - "rcgen 0.9.3", - "regex", - "ring", - "rtcp", - "rtp", - "rustls 0.19.1", - "sdp", - "serde", - "serde_json", - "sha2 0.10.6", - "stun", - "thiserror", - "time 0.3.20", - "tokio", - "turn", - "url", - "waitgroup", - "webrtc-data", - "webrtc-dtls", - "webrtc-ice", - "webrtc-mdns", - "webrtc-media", - "webrtc-sctp", - "webrtc-srtp", - "webrtc-util", -] - -[[package]] -name = "webrtc-data" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100" -dependencies = [ - "bytes", - "derive_builder", - "log", - "thiserror", - "tokio", - "webrtc-sctp", - "webrtc-util", -] - -[[package]] -name = "webrtc-dtls" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05" -dependencies = [ - "aes 0.6.0", - "aes-gcm 0.10.1", - "async-trait", - "bincode", - "block-modes", - "byteorder", - "ccm", - "curve25519-dalek 3.2.0", - "der-parser 8.2.0", - "elliptic-curve", - "hkdf", - "hmac 0.12.1", - "log", - "oid-registry 0.6.1", - "p256", - "p384", - "rand 0.8.5", - "rand_core 0.6.4", - "rcgen 0.9.3", - "ring", - "rustls 0.19.1", - "sec1", - "serde", - "sha1", - "sha2 0.10.6", - "signature", - "subtle", - "thiserror", - "tokio", - "webpki 0.21.4", - "webrtc-util", - "x25519-dalek 2.0.0-rc.2", - "x509-parser 0.13.2", -] - -[[package]] -name = "webrtc-ice" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" -dependencies = [ - "arc-swap", - "async-trait", - "crc", - "log", - "rand 0.8.5", - "serde", - "serde_json", - "stun", - "thiserror", - "tokio", - "turn", - "url", - "uuid 1.3.0", - "waitgroup", - "webrtc-mdns", - "webrtc-util", -] - -[[package]] -name = "webrtc-mdns" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" -dependencies = [ - "log", - "socket2 0.4.9", - "thiserror", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-media" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7" -dependencies = [ - "byteorder", - "bytes", - "derive_builder", - "displaydoc", - "rand 0.8.5", - "rtp", - "thiserror", - "webrtc-util", -] - -[[package]] -name = "webrtc-sctp" -version = "0.7.0" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "crc", - "log", - "rand 0.8.5", - "thiserror", - "tokio", - "webrtc-util", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] -name = "webrtc-srtp" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5" -dependencies = [ - "aead 0.4.3", - "aes 0.7.5", - "aes-gcm 0.9.4", - "async-trait", - "byteorder", - "bytes", - "ctr 0.8.0", - "hmac 0.11.0", - "log", - "rtcp", - "rtp", - "sha-1 0.9.8", - "subtle", - "thiserror", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-util" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" -dependencies = [ - "async-trait", - "bitflags", - "bytes", - "cc", - "ipnet", - "lazy_static", - "libc", - "log", - "nix 0.24.3", - "rand 0.8.5", - "thiserror", - "tokio", - "winapi", -] - -[[package]] -name = "which" -version = "4.4.0" +name = "whoami" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" dependencies = [ - "either", - "libc", - "once_cell", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -9504,9 +8869,15 @@ checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" [[package]] name = "widestring" -version = "0.5.1" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "wildmatch" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a" [[package]] name = "winapi" @@ -9554,11 +8925,11 @@ dependencies = [ [[package]] name = "windows" -version = "0.46.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -9575,26 +8946,20 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_gnullvm", - "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", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.42.2", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -9603,22 +8968,43 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", + "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", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] [[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] name = "windows_aarch64_msvc" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9631,6 +9017,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] name = "windows_i686_gnu" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9643,6 +9035,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] name = "windows_i686_msvc" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9655,6 +9053,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] name = "windows_x86_64_gnu" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9667,12 +9071,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] name = "windows_x86_64_msvc" version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9685,12 +9101,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +dependencies = [ + "memchr", +] + +[[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] @@ -9704,7 +9136,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version 0.4.0", + "rustc_version", "send_wrapper", "thiserror", "wasm-bindgen", @@ -9739,59 +9171,27 @@ dependencies = [ ] [[package]] -name = "x25519-dalek" -version = "2.0.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabd6e16dd08033932fc3265ad4510cc2eab24656058a6dcb107ffe274abcc95" -dependencies = [ - "curve25519-dalek 4.0.0-rc.2", - "rand_core 0.6.4", - "serde", - "zeroize", -] - -[[package]] name = "x509-parser" -version = "0.13.2" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" dependencies = [ - "asn1-rs 0.3.1", - "base64 0.13.1", + "asn1-rs", "data-encoding", - "der-parser 7.0.0", + "der-parser", "lazy_static", - "nom 7.1.3", - "oid-registry 0.4.0", - "ring", + "nom", + "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.20", -] - -[[package]] -name = "x509-parser" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" -dependencies = [ - "asn1-rs 0.5.2", - "base64 0.13.1", - "data-encoding", - "der-parser 8.2.0", - "lazy_static", - "nom 7.1.3", - "oid-registry 0.6.1", - "rusticata-macros", - "thiserror", - "time 0.3.20", + "time", ] [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a" [[package]] name = "xmltree" @@ -9813,25 +9213,26 @@ dependencies = [ [[package]] name = "yamux" -version = "0.10.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d9ba232399af1783a58d8eb26f6b5006fbefe2dc9ef36bd283324792d03ea5" +checksum = "0329ef377816896f014435162bb3711ea7a07729c23d0960e6f8048b21b8fe91" dependencies = [ "futures", "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.8.5", + "pin-project", + "rand", "static_assertions", ] [[package]] name = "yasna" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.20", + "time", ] [[package]] @@ -9851,19 +9252,55 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.37", ] [[package]] name = "zip" -version = "0.5.13" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ + "aes 0.8.3", "byteorder", "bzip2", + "constant_time_eq", "crc32fast", + "crossbeam-utils", "flate2", - "thiserror", - "time 0.1.45", + "hmac 0.12.1", + "pbkdf2 0.11.0", + "sha1", + "time", + "zstd", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.8+zstd.1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +dependencies = [ + "cc", + "libc", + "pkg-config", ] diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 44cbb147bd206..2500ec5c28571 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "4.1.0"; + version = "4.5.0"; # lighthouse/common/deposit_contract/build.rs depositContractSpecVersion = "0.12.1"; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { owner = "sigp"; repo = "lighthouse"; rev = "v${version}"; - hash = "sha256-QVAFzV9sao8+eegI7bLfm+pPHyvDFhnADS80+nqqgtE="; + hash = "sha256-UUOvTxOQXT1zfhDYEL/J6moHAyejZn7GyGS/XBmXxRQ="; }; patches = [ @@ -47,15 +47,15 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "amcl-0.3.0" = "sha256-Mj4dXTlGVSleFfuTKgVDQ7S3jANMsdtVE5L90WGxA4U="; - "arbitrary-1.3.0" = "sha256-BMxcBfxBRf+Kb0Tz55jtFbwokSeD2GPtB+KV8Wbne0g="; - "beacon-api-client-0.1.0" = "sha256-fI8qST6HZrchg7yr/nVtRNrsW3f5ONSX+mGRYW+iiqA="; - "ethereum-consensus-0.1.1" = "sha256-aBrZ786Me0BWpnncxQc5MT3r+O0yLQhqGKFBiNTdqSA="; + "amcl-0.3.0" = "sha256-kc8k/ls4W0TwFBsRcyyotyz8ZBEjsZXHeJnJtsnW/LM="; + "anvil-rpc-0.1.0" = "sha256-L38OioxnWEn94g3GJT4j3U1cJZ8jQDHp8d1QOHaVEuU="; + "beacon-api-client-0.1.0" = "sha256-Z0CoPxZzl2bjb8vgmHWxq2orMawhMMs7beKGopilKjE="; + "ethereum-consensus-0.1.1" = "sha256-biTrw3yMJUo9+56QK5RGWXLCoPPZEWp18SCs+Y9QWg4="; "libmdbx-0.1.4" = "sha256-NMsR/Wl1JIj+YFPyeMMkrJFfoS07iEAKEQawO89a+/Q="; "lmdb-rkv-0.14.0" = "sha256-sxmguwqqcyOlfXOZogVz1OLxfJPo+Q0+UjkROkbbOCk="; - "mev-rs-0.2.1" = "sha256-n3ns1oynw5fKQtp/CQHER41+C1EmLCVEBqggkHc3or4="; - "ssz-rs-0.8.0" = "sha256-k1JLu+jZrSqUyHou76gbJeA5CDWwdL0fPkek3Vzl4Gs="; - "warp-0.3.2" = "sha256-m9lkEgeSs0yEc+6N6DG7IfQY/evkUMoNyst2hMUR//c="; + "mev-rs-0.3.0" = "sha256-LCO0GTvWTLcbPt7qaSlLwlKmAjt3CIHVYTT/JRXpMEo="; + "testcontainers-0.14.0" = "sha256-mSsp21G7MLEtFROWy88Et5s07PO0tjezovCGIMh+/oQ="; + "warp-0.3.5" = "sha256-d5e6ASdL7+Dl3KsTNOb9B5RHpStrupOKsbGWsdu9Jfk="; }; }; @@ -103,8 +103,8 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = [ "--workspace" "--exclude beacon_node" - "--exclude http_api" "--exclude beacon_chain" + "--exclude http_api" "--exclude lighthouse" "--exclude lighthouse_network" "--exclude slashing_protection" @@ -114,10 +114,21 @@ rustPlatform.buildRustPackage rec { # All of these tests require network access checkFlags = [ + "--skip basic" + "--skip deposit_tree::cache_consistency" + "--skip deposit_tree::double_update" + "--skip deposit_tree::updating" + "--skip eth1_cache::big_skip" + "--skip eth1_cache::double_update" + "--skip eth1_cache::pruning" + "--skip eth1_cache::simple_scenario" + "--skip fast::deposit_cache_query" + "--skip http::incrementing_deposits" + "--skip persist::test_persist_caches" "--skip service::tests::tests::test_dht_persistence" "--skip time::test::test_reinsertion_updates_timeout" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart" "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch" "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" ]; diff --git a/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch b/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch index b72e3062d2f31..9980b22c85251 100644 --- a/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch +++ b/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch @@ -1,26 +1,13 @@ -diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml -index 46b88af66..c8c909234 100644 ---- a/consensus/types/Cargo.toml -+++ b/consensus/types/Cargo.toml -@@ -37,7 +37,7 @@ cached_tree_hash = { path = "../cached_tree_hash" } - serde_yaml = "0.8.13" - tempfile = "3.1.0" - derivative = "2.1.1" --rusqlite = { version = "0.28.0", features = ["bundled"], optional = true } -+rusqlite = { version = "0.28.0", optional = true } - # The arbitrary dependency is enabled by default since Capella to avoid complexity introduced by - # `AbstractExecPayload` - arbitrary = { version = "1.0", features = ["derive"] } -diff --git a/validator_client/slashing_protection/Cargo.toml b/validator_client/slashing_protection/Cargo.toml -index 631e54dc4..dec95156b 100644 ---- a/validator_client/slashing_protection/Cargo.toml -+++ b/validator_client/slashing_protection/Cargo.toml -@@ -12,7 +12,7 @@ path = "tests/main.rs" - [dependencies] - tempfile = "3.1.0" - types = { path = "../../consensus/types" } --rusqlite = { version = "0.28.0", features = ["bundled"] } -+rusqlite = { version = "0.28.0" } - r2d2 = "0.8.9" - r2d2_sqlite = "0.21.0" - serde = "1.0.116" +diff --git a/Cargo.toml b/Cargo.toml +index 62c0e7bd2..a089e3c5b 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -138,7 +138,7 @@ rayon = "1.7" + regex = "1" + reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "stream", "rustls-tls"] } + ring = "0.16" +-rusqlite = { version = "0.28", features = ["bundled"] } ++rusqlite = { version = "0.28" } + serde = { version = "1", features = ["derive"] } + serde_json = "1" + serde_repr = "0.1" diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index a6c446ba5e462..29e2c2d85f495 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -4,7 +4,9 @@ lib.makeScope pkgs.newScope (self: let gconf = pkgs.gnome2.GConf; inherit (self) callPackage; - stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; + stdenv = if pkgs.stdenv.isDarwin + then pkgs.darwin.apple_sdk_11_0.stdenv + else pkgs.stdenv; inheritedArgs = { inherit gconf; inherit stdenv; @@ -16,7 +18,10 @@ lib.makeScope pkgs.newScope (self: Quartz QuartzCore UniformTypeIdentifiers WebKit; gnutls = if pkgs.stdenv.isDarwin - then pkgs.gnutls.override { inherit stdenv; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; } + then pkgs.gnutls.override { + inherit stdenv; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; + } else pkgs.gnutls; }; in { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 467d51df9d427..eba4586a107ab 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -43,10 +43,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "8.0.5.0.20230208.70712"; + version = "8.1.0.0.20231018.91522"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ada-mode-8.0.5.0.20230208.70712.tar"; - sha256 = "1957w6fynk345iwhgc4iq7zlda3fi211r7vi5420g761568wp4ca"; + url = "https://elpa.gnu.org/devel/ada-mode-8.1.0.0.20231018.91522.tar"; + sha256 = "00ywqyvqvynrskyg0wh2acl6a68f0s2r83w3cmsgxd569phlsrqp"; }; packageRequires = [ emacs gnat-compiler uniquify-files wisi ]; meta = { @@ -427,10 +427,10 @@ elpaBuild { pname = "bbdb"; ename = "bbdb"; - version = "3.2.2.2.0.20220705.233849"; + version = "3.2.2.4.0.20231023.5901"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bbdb-3.2.2.2.0.20220705.233849.tar"; - sha256 = "1041nqxs8sp34zvpahn6x603hx8i2zc65jp6ygd611z7rb2mwd5x"; + url = "https://elpa.gnu.org/devel/bbdb-3.2.2.4.0.20231023.5901.tar"; + sha256 = "1hvhrbnnhc5hy4szkhsl5fvqlm13kzn5cx4l5sm5pr75xnmcvm08"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -453,17 +453,14 @@ license = lib.licenses.free; }; }) {}; - beframe = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "beframe"; ename = "beframe"; - version = "0.3.0.0.20231017.145435"; + version = "0.3.0.0.20231027.55708"; src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-0.3.0.0.20231017.145435.tar"; - sha256 = "1fnflpbnnjzfyccq6jcpwsq9byn7jda8mjhjynjk3l27jmzqd2g2"; + url = "https://elpa.gnu.org/devel/beframe-0.3.0.0.20231027.55708.tar"; + sha256 = "0hmls2l6wy14hv3sghdha7h9gmqrany77cfiam5j2hqjhy0g6vns"; }; packageRequires = [ emacs ]; meta = { @@ -546,10 +543,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.1.3.0.20230408.95238"; + version = "1.1.3.0.20231024.113314"; src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-1.1.3.0.20230408.95238.tar"; - sha256 = "0hzfrbc20qn9ld51ivkvclphsvc2qqq4ir056d2d9bjxq56zndl6"; + url = "https://elpa.gnu.org/devel/boxy-1.1.3.0.20231024.113314.tar"; + sha256 = "1b5dkjic7spzbkj78m03z00gh8a9f8yv1kkyhnr4gks81jdr1gsn"; }; packageRequires = [ emacs ]; meta = { @@ -566,10 +563,10 @@ elpaBuild { pname = "boxy-headings"; ename = "boxy-headings"; - version = "2.1.4.0.20221114.84552"; + version = "2.1.4.0.20231024.114002"; src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-headings-2.1.4.0.20221114.84552.tar"; - sha256 = "1ximn07ri3wga73alglzlfmqly52v2dbr3y1hp6syv5m3mxk248f"; + url = "https://elpa.gnu.org/devel/boxy-headings-2.1.4.0.20231024.114002.tar"; + sha256 = "1fan3pdslmwxkdc8lj7svcjllzjqhnhsma1yjpfhi99dv4b8fyns"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -713,10 +710,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.17.0.20230930.53703"; + version = "0.17.0.20231022.115714"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-0.17.0.20230930.53703.tar"; - sha256 = "1jfba9fm075bj9si4mn5c63yzc15a6qm5c4swm6bvz1rlcmyq7cz"; + url = "https://elpa.gnu.org/devel/cape-0.17.0.20231022.115714.tar"; + sha256 = "0bvmrxjd054f14qap6w5052900k4pn33vb7cbc87rvrgdyhh5ixa"; }; packageRequires = [ compat emacs ]; meta = { @@ -915,10 +912,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.10.2.0.20231016.232437"; + version = "0.10.2.0.20231023.103313"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231016.232437.tar"; - sha256 = "16q3wlc1df8rlg67yihn33sshhg0c7lyvsajawf9xq92wqf2f5ik"; + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231023.103313.tar"; + sha256 = "1zcap5mv6cn9a2j8axg4yw4iprxkwwyjmw7qahijlk02ycwmwwfn"; }; packageRequires = [ emacs ]; meta = { @@ -1006,10 +1003,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.35.0.20231020.193229"; + version = "0.35.0.20231023.154305"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-0.35.0.20231020.193229.tar"; - sha256 = "1k96wpiyyylcmyd7hyi8yv0s5qrzipnkz9jpdwh0j53vy6yd7a7i"; + url = "https://elpa.gnu.org/devel/consult-0.35.0.20231023.154305.tar"; + sha256 = "1cx8m0llk76z1kawkqg9dq7aws2i2bsgnhr3xvw7chdwvjywghs6"; }; packageRequires = [ compat emacs ]; meta = { @@ -1093,10 +1090,10 @@ elpaBuild { pname = "counsel"; ename = "counsel"; - version = "0.14.0.0.20230619.162538"; + version = "0.14.2.0.20231025.232958"; src = fetchurl { - url = "https://elpa.gnu.org/devel/counsel-0.14.0.0.20230619.162538.tar"; - sha256 = "0lirnz10p9zyvdhwwqgvc7wasm31syifb2khxdwi4bqqgrmpqvix"; + url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20231025.232958.tar"; + sha256 = "0y1lxhsmjazml41sg0if7y9jv1i90ad13grafil6pb4mg4m15v70"; }; packageRequires = [ emacs ivy swiper ]; meta = { @@ -1323,10 +1320,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.0.0.0.20231020.121249"; + version = "2.0.0.0.20231027.53913"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231020.121249.tar"; - sha256 = "130k9ixw0n20zvhyj1b0k1363p8wa7q2klw9g8m9p4b6sslh7w5f"; + url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231027.53913.tar"; + sha256 = "044r77y0b7b3svwjin926xkp8xcwkxjpixi0x8nrfzh2krzkkakx"; }; packageRequires = [ emacs ]; meta = { @@ -1566,10 +1563,10 @@ elpaBuild { pname = "do-at-point"; ename = "do-at-point"; - version = "0.1.1.0.20231002.131946"; + version = "0.1.1.0.20231027.63811"; src = fetchurl { - url = "https://elpa.gnu.org/devel/do-at-point-0.1.1.0.20231002.131946.tar"; - sha256 = "1bqbfb2cj4qb46lximqz3nymdyq6lc5df74cvwksng09226nk9nj"; + url = "https://elpa.gnu.org/devel/do-at-point-0.1.1.0.20231027.63811.tar"; + sha256 = "0k490g70lv89l87bn79m4bphnkv6vk578qgv1vk64z403wdgvxbv"; }; packageRequires = [ emacs ]; meta = { @@ -1662,10 +1659,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.18.0.20231021.161113"; + version = "0.8.18.0.20231023.175242"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ebdb-0.8.18.0.20231021.161113.tar"; - sha256 = "0p6n69qzl3cpnhpyvfzn0pqmh0wjw2mrd4q4dnj4w4p9103g1z62"; + url = "https://elpa.gnu.org/devel/ebdb-0.8.18.0.20231023.175242.tar"; + sha256 = "0lxb9isbg6whwcfi8gjmggi4aa4ri6b4mx4xiljzwkmrcv3y5q76"; }; packageRequires = [ emacs seq ]; meta = { @@ -1748,10 +1745,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.3.0.0.20231014.41130"; + version = "1.4.0.0.20231026.80318"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.3.0.0.20231014.41130.tar"; - sha256 = "0sgyjwwna91mfj1knirx34hc27101lhpsnfw9ncb63790yw4sidd"; + url = "https://elpa.gnu.org/devel/ef-themes-1.4.0.0.20231026.80318.tar"; + sha256 = "02nx6p5m54gyyw2rjb0msvh3cijnqpm0p5i9l71gykg54rbabwnr"; }; packageRequires = [ emacs ]; meta = { @@ -1884,10 +1881,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.23.0.20231007.130222"; + version = "0.23.0.20231026.124244"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-0.23.0.20231007.130222.tar"; - sha256 = "0q15m0zccz3h9w88y3pbdy7g09yn317pyhf880gqpiwpbprd831b"; + url = "https://elpa.gnu.org/devel/embark-0.23.0.20231026.124244.tar"; + sha256 = "0d73fpxqv243pbj36299nfb4j6w2aqabpn4l3z1gvcpx2x2abbrd"; }; packageRequires = [ compat emacs ]; meta = { @@ -1904,10 +1901,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.8.0.20231007.130222"; + version = "0.8.0.20231026.124244"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231007.130222.tar"; - sha256 = "11c5r7j7hi5f91pn4dcx8z3i7p3lhrhqpj8jd6g36mwn3scb9m1b"; + url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231026.124244.tar"; + sha256 = "0wd3pdkh0y5x2bd8q6q7bc543s5ks7d8zlxrflk5ywlqaz8xi9g4"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -2027,10 +2024,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20231020.152406"; + version = "5.6snapshot0.20231027.130929"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231020.152406.tar"; - sha256 = "18h6jkp051mmixrnfgqnkh0c21qfnpaxzhjnsxxaknp3v17rvm5d"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231027.130929.tar"; + sha256 = "1v1r86cpl4jnnds9ljwr71g3xc96b2gvjbcpcvkhjfbf8g58ky40"; }; packageRequires = [ compat emacs ]; meta = { @@ -2260,14 +2257,19 @@ license = lib.licenses.free; }; }) {}; - flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib, project }: + flymake = callPackage ({ eldoc + , elpaBuild + , emacs + , fetchurl + , lib + , project }: elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.6.0.20230924.80727"; + version = "1.3.7.0.20231026.132104"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.3.6.0.20230924.80727.tar"; - sha256 = "0ldy6idm6kvrpx3d08wgalrv17s5vpwxqh339mq8ijv9qz7i39w4"; + url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20231026.132104.tar"; + sha256 = "0xk42bz63156vnkwxk743ln1w0zjs7yjayy9l2a97mynnzwa0knh"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -2300,10 +2302,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "1.0.0.0.20230929.155942"; + version = "1.0.0.0.20231026.83630"; src = fetchurl { - url = "https://elpa.gnu.org/devel/fontaine-1.0.0.0.20230929.155942.tar"; - sha256 = "1xznn6w38p6riccwbnlqnqysaapssz18kwx0f9j4h07aam8d7kkg"; + url = "https://elpa.gnu.org/devel/fontaine-1.0.0.0.20231026.83630.tar"; + sha256 = "0y02wj5m1xj7ja57rj42jhdjvzy7rsdk3vkdmaay7y4bh4dd7vnl"; }; packageRequires = [ emacs ]; meta = { @@ -2446,10 +2448,10 @@ elpaBuild { pname = "gnat-compiler"; ename = "gnat-compiler"; - version = "1.0.2.0.20230124.51334"; + version = "1.0.3.0.20230915.165808"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gnat-compiler-1.0.2.0.20230124.51334.tar"; - sha256 = "0kqzqw2dbsmcmrqkb5rsjmkpznfj1licnbfjbp1ifs0kaf2cigqy"; + url = "https://elpa.gnu.org/devel/gnat-compiler-1.0.3.0.20230915.165808.tar"; + sha256 = "1za3ihjbramms85r35kz1d3gyyr3kyimd5m7xsmqnrpj3wsrjika"; }; packageRequires = [ emacs wisi ]; meta = { @@ -2585,10 +2587,10 @@ elpaBuild { pname = "gpr-mode"; ename = "gpr-mode"; - version = "1.0.3.0.20230119.135149"; + version = "1.0.4.0.20231015.114428"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gpr-mode-1.0.3.0.20230119.135149.tar"; - sha256 = "1qd4wdmjlhj325q5qjhdx2l4z1bqpv4giwvsgd29s9k3sh7n8m2h"; + url = "https://elpa.gnu.org/devel/gpr-mode-1.0.4.0.20231015.114428.tar"; + sha256 = "1y3571ymlrgiq5jxbwlyw43pmfxgq776pajb9hlvyz9l3w195c8g"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -2605,10 +2607,10 @@ elpaBuild { pname = "gpr-query"; ename = "gpr-query"; - version = "1.0.3.0.20230128.112055"; + version = "1.0.4.0.20231018.92052"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gpr-query-1.0.3.0.20230128.112055.tar"; - sha256 = "0fnq3zdzlcfc54m5ix01ix78drfmzvfiicjp9cvsw78s0sd05p9x"; + url = "https://elpa.gnu.org/devel/gpr-query-1.0.4.0.20231018.92052.tar"; + sha256 = "1pk14d88vy0ylgcdymp9pclygpn06n25yhy0hsjs0lrd8zr56a49"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -2631,17 +2633,14 @@ license = lib.licenses.free; }; }) {}; - greader = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + greader = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "greader"; ename = "greader"; - version = "0.5.0.0.20230927.204955"; + version = "0.5.0.0.20231026.5322"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.5.0.0.20230927.204955.tar"; - sha256 = "02kq8r2grdg8y2bjcw01d5wm5mkv4wir4yggs41cmgcwnk3gm1d1"; + url = "https://elpa.gnu.org/devel/greader-0.5.0.0.20231026.5322.tar"; + sha256 = "0m4d1cr637jsy75ax6y2aqhzjwax7qkidm25k4qiqa69lzbkckid"; }; packageRequires = [ emacs ]; meta = { @@ -2824,10 +2823,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "8.0.1pre0.20231009.215811"; + version = "8.0.1pre0.20231022.151646"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20231009.215811.tar"; - sha256 = "0dhrjdk3llxv5s5xfd849vqwr6f1fk411klgjn44szkgi9anbqdv"; + url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20231022.151646.tar"; + sha256 = "1kr6ayfnq9ah8n8b6k4lxh5napghb90y5sz0g3fs5qjbszcbvxc9"; }; packageRequires = [ emacs ]; meta = { @@ -2923,10 +2922,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.14.0.0.20230714.75746"; + version = "0.14.2.0.20231025.231958"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-0.14.0.0.20230714.75746.tar"; - sha256 = "166nysfapnz1b15dmag9hlfx26j0k882k5wmx7fpbm4mdj20y6q0"; + url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20231025.231958.tar"; + sha256 = "0r6dyq350djn5vprk0cvj7vh3l0j2vadsxaiq35yv9gjqh20ca88"; }; packageRequires = [ emacs ]; meta = { @@ -2943,10 +2942,10 @@ elpaBuild { pname = "ivy-avy"; ename = "ivy-avy"; - version = "0.14.0.0.20230410.182616"; + version = "0.14.2.0.20231025.232243"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-avy-0.14.0.0.20230410.182616.tar"; - sha256 = "1s749025jyd5qy5yhxnnd71bj1qcwa6ah0ddl2cs16h9mdbf87qy"; + url = "https://elpa.gnu.org/devel/ivy-avy-0.14.2.0.20231025.232243.tar"; + sha256 = "1y9v3iv7zj7zc526k336rjq04vlisx8giyax5h0as97r8zc4rpzc"; }; packageRequires = [ avy emacs ivy ]; meta = { @@ -2982,10 +2981,10 @@ elpaBuild { pname = "ivy-hydra"; ename = "ivy-hydra"; - version = "0.14.0.0.20230410.182324"; + version = "0.14.2.0.20231025.232457"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-hydra-0.14.0.0.20230410.182324.tar"; - sha256 = "10sd554k3qb81am3jvg7l084i031c133a24cgh0g44vjj2s76nra"; + url = "https://elpa.gnu.org/devel/ivy-hydra-0.14.2.0.20231025.232457.tar"; + sha256 = "15az95s0bv0wc33kqh2h5n92hhn54mhy4lx9m2mm2x83jggdw4yy"; }; packageRequires = [ emacs hydra ivy ]; meta = { @@ -3068,10 +3067,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "0.9.0.20231019.170830"; + version = "0.9.0.20231026.154650"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231019.170830.tar"; - sha256 = "13wd7xaa3grslycvykx4yglh669fqrrfpqz6715zifkd3mnl0ik3"; + url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231026.154650.tar"; + sha256 = "1fck948ay9n64mxqmx7j6fn6hzfn858l0s0gw544in2y617niyh6"; }; packageRequires = [ compat emacs ]; meta = { @@ -3316,10 +3315,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.4.0.0.20231018.234129"; + version = "0.5.0.0.20231026.5843"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.4.0.0.20231018.234129.tar"; - sha256 = "1zfqyqga38j319hy85pq7fqmma1x2p716z6zvydrnn0npnfnggry"; + url = "https://elpa.gnu.org/devel/llm-0.5.0.0.20231026.5843.tar"; + sha256 = "0ywmfbis4jrqjg2gc3khgwc9kdbhjh99syag2bk1vzjmwfd2cq89"; }; packageRequires = [ emacs ]; meta = { @@ -3477,10 +3476,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.3.0.20230925.162757"; + version = "1.3.0.20231026.181335"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20230925.162757.tar"; - sha256 = "0g0ccxd2ks2av5lxbz5c3hi86jf10dizvm8ziday1v34lbp4f6hw"; + url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20231026.181335.tar"; + sha256 = "1q7dbzrdzjwiyq09zbq8wbj673vaj5ss3xyrz3y226wb6jpmzr74"; }; packageRequires = [ compat emacs ]; meta = { @@ -4094,10 +4093,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.0.0.20230919.235319"; + version = "1.0.0.20231025.204425"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.0.0.20230919.235319.tar"; - sha256 = "0j26253q0f6h016xpgxx6jy36mdi9sm5bvyki7i2374hmcp5lxd8"; + url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231025.204425.tar"; + sha256 = "1lsfa62hpq6zmk49mnf1434lqv3p472la3aky003xplkvl0xbw7l"; }; packageRequires = [ emacs ]; meta = { @@ -4109,10 +4108,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20231021.130825"; + version = "9.7pre0.20231027.91944"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20231021.130825.tar"; - sha256 = "1vfgzgd7zwcnv55n7v542zn90irwjwsgn7z8kmxqg5cpyw0r2x06"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20231027.91944.tar"; + sha256 = "0af65mm22bl6c38abqn39s5rz6i67pbcmhfq6n2hn0a8jgmmppwc"; }; packageRequires = [ emacs ]; meta = { @@ -4205,10 +4204,10 @@ elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.6.0.20221114.84409"; + version = "1.0.7.0.20231024.111108"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-real-1.0.6.0.20221114.84409.tar"; - sha256 = "1xmix5ldxxkh249fgyqlp31yndl14gz3ylpcsh6l9hmwqagzg20x"; + url = "https://elpa.gnu.org/devel/org-real-1.0.7.0.20231024.111108.tar"; + sha256 = "199900lvg5jxfspp1papx0aj88vm6addlyv7zhp8bc2f5a9igg21"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -5072,10 +5071,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.24.0.20231005.122642"; + version = "1.24.0.20231026.84057"; src = fetchurl { - url = "https://elpa.gnu.org/devel/relint-1.24.0.20231005.122642.tar"; - sha256 = "0xlb4i0zj225q8l4a9riagc7qv795bigygmqrlm81ypxqvbm3r5n"; + url = "https://elpa.gnu.org/devel/relint-1.24.0.20231026.84057.tar"; + sha256 = "0s0gz6w6b04sif8yf83hb7y61jmjvksmslznmzlf8x3rq9p7kwyd"; }; packageRequires = [ emacs xr ]; meta = { @@ -5814,10 +5813,10 @@ elpaBuild { pname = "swiper"; ename = "swiper"; - version = "0.14.0.0.20230410.182739"; + version = "0.14.2.0.20231025.232825"; src = fetchurl { - url = "https://elpa.gnu.org/devel/swiper-0.14.0.0.20230410.182739.tar"; - sha256 = "10vqxmqdzvr7rg6wg5whzl4w9y4j47m330fx7qgvzi5zw28b69f3"; + url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20231025.232825.tar"; + sha256 = "13jvr9xv1i44ky906m4awkakvhrmpxg7x5f9hzbwnfz52wcxx8ix"; }; packageRequires = [ emacs ivy ]; meta = { @@ -6165,16 +6164,17 @@ , elpaBuild , emacs , fetchurl - , lib }: + , lib + , seq }: elpaBuild { pname = "transient"; ename = "transient"; - version = "0.4.3.0.20230919.214625"; + version = "0.4.3.0.20231024.181508"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20230919.214625.tar"; - sha256 = "1b4dlgk6x22mpacd4wiinlh5sjgprhabha7wq7dfcsgv7mqhk5z2"; + url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231024.181508.tar"; + sha256 = "0b092m462gndqlyv8lvfikkdqmly2w5dkbbkn405rbmki2r4bggk"; }; - packageRequires = [ compat emacs ]; + packageRequires = [ compat emacs seq ]; meta = { homepage = "https://elpa.gnu.org/packages/transient.html"; license = lib.licenses.free; @@ -6347,10 +6347,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.3.0snapshot0.20230831.195518"; + version = "0.3.0snapshot0.20231026.224925"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20230831.195518.tar"; - sha256 = "1qhvspbzbnl1jcqhixfbrqg9jxmc495gv95vhiadm3dpqhxfcn81"; + url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231026.224925.tar"; + sha256 = "07akrg4z177xjway75bl7281ic78j8sl818jd52nmxhx4wxys9mv"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6367,10 +6367,10 @@ elpaBuild { pname = "url-http-ntlm"; ename = "url-http-ntlm"; - version = "2.0.4.0.20231015.130736"; + version = "2.0.5.0.20231024.31412"; src = fetchurl { - url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.4.0.20231015.130736.tar"; - sha256 = "0gpkr7m2kwnz7pmj6y4xn41175jy9vaxsj5f7glzd3w1xklr4hg0"; + url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.5.0.20231024.31412.tar"; + sha256 = "0vr04yr4ywxvh7c6s447bsa5v148ny3lvx54bpd60qf5cp92z1zw"; }; packageRequires = [ cl-lib nadvice ntlm ]; meta = { @@ -6418,10 +6418,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.5.0.20231022.75512"; + version = "2.4.5.0.20231026.114632"; src = fetchurl { - url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20231022.75512.tar"; - sha256 = "0cvsqrbamg9nxcjxqiq6avjyk027dxxzskgnvv0drrlsgcvb3yai"; + url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20231026.114632.tar"; + sha256 = "0sfs6030s6zngxgsv9wj181brsk6f8avfvl53vr0yspry53z2vpz"; }; packageRequires = [ bind-key emacs ]; meta = { @@ -6855,10 +6855,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "4.2.2.0.20230126.2042"; + version = "4.3.2.0.20231026.105332"; src = fetchurl { - url = "https://elpa.gnu.org/devel/wisi-4.2.2.0.20230126.2042.tar"; - sha256 = "0b70yipm6wmz5034f5l7f78c2bgscm2c8lph75jgd5x1qwzngw47"; + url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20231026.105332.tar"; + sha256 = "1jlqvimnjsdvaylfj2hq9k9bllvl74j1g4pd8w4kf3c30n7jyiql"; }; packageRequires = [ emacs seq ]; meta = { @@ -6875,10 +6875,10 @@ elpaBuild { pname = "wisitoken-grammar-mode"; ename = "wisitoken-grammar-mode"; - version = "1.3.0.0.20230125.102656"; + version = "1.3.0.0.20231023.83923"; src = fetchurl { - url = "https://elpa.gnu.org/devel/wisitoken-grammar-mode-1.3.0.0.20230125.102656.tar"; - sha256 = "1h5pnghxg01f0hgxw7284b4rm5c43r48nbsxj19dcypxrzz3w1qw"; + url = "https://elpa.gnu.org/devel/wisitoken-grammar-mode-1.3.0.0.20231023.83923.tar"; + sha256 = "17kgrwm1jr1dxaprgay60jmgg5bfhmyrngzy0qfia6zs7w43bscx"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { @@ -6982,10 +6982,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.25.0.20231005.122612"; + version = "1.25.0.20231026.84432"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xr-1.25.0.20231005.122612.tar"; - sha256 = "0sj2cyxdfykk3gfw3v9d93mzssxiassj5vhzl76sm8dy59z93z4y"; + url = "https://elpa.gnu.org/devel/xr-1.25.0.20231026.84432.tar"; + sha256 = "0kvkz24z0cb32igj1hv09j0cg2xhwrkafi7zhfb85vwj4kgcd6pj"; }; packageRequires = [ emacs ]; meta = { @@ -6997,10 +6997,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.6.3.0.20231009.180303"; + version = "1.6.3.0.20231023.205120"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20231009.180303.tar"; - sha256 = "146bvnaxzfqjbpib8cm7mlq4j2695wh9czwi9lfbx5k8npakjrih"; + url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20231023.205120.tar"; + sha256 = "1qszzbnn3pdpy7q7i9ir04dnp15rgkm7xnl73pp3wpvbqjwwgmd3"; }; packageRequires = [ emacs ]; meta = { @@ -7028,17 +7028,18 @@ }) {}; yasnippet = callPackage ({ cl-lib ? null , elpaBuild + , emacs , fetchurl , lib }: elpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "0.14.0.0.20230912.111325"; + version = "0.14.0.0.20230914.100037"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yasnippet-0.14.0.0.20230912.111325.tar"; - sha256 = "0k9h33dgxhg20cg2wwxmhxl5yzyh2g4kims15l0rgs2ag496qn5a"; + url = "https://elpa.gnu.org/devel/yasnippet-0.14.0.0.20230914.100037.tar"; + sha256 = "0kqv0scxkxxczxc1fxmpv0lgddp92j600s972xwb681a0vq2ssz6"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/yasnippet.html"; license = lib.licenses.free; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 2e3016f1a73fc..6116f851fbfff 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -40,10 +40,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "8.0.5"; + version = "8.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-8.0.5.tar"; - sha256 = "00baypl9bv2z42d6z2k531ai25yw2aj1dcv4pi1jhcp19c9kjg4l"; + url = "https://elpa.gnu.org/packages/ada-mode-8.1.0.tar"; + sha256 = "1nfqm173gbk6483xgdkmxp5nb8biihq1623058gbl0dfwn0p9njh"; }; packageRequires = [ emacs gnat-compiler uniquify-files wisi ]; meta = { @@ -370,10 +370,10 @@ elpaBuild { pname = "bbdb"; ename = "bbdb"; - version = "3.2.2.2"; + version = "3.2.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bbdb-3.2.2.2.tar"; - sha256 = "0bf20r5xhxln6z4qp8zrlln0303dkci2ydsr74pxcj08aqgk5xxf"; + url = "https://elpa.gnu.org/packages/bbdb-3.2.2.4.tar"; + sha256 = "13i8ggknc29sny16rq126q0ssz26m3fam0zpdhlsm05pa8dydd7p"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -952,10 +952,10 @@ elpaBuild { pname = "counsel"; ename = "counsel"; - version = "0.14.0"; + version = "0.14.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/counsel-0.14.0.tar"; - sha256 = "03n1qk66dcbh9xlnlzpwkb441c2xdpfc7bzx4i2szw0xh4a6g5sj"; + url = "https://elpa.gnu.org/packages/counsel-0.14.2.tar"; + sha256 = "13119alyzr2xipk3jra3iawplqkqgvv0gdcm4yd527z592b0s7f0"; }; packageRequires = [ emacs ivy swiper ]; meta = { @@ -1543,10 +1543,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-1.3.0.tar"; - sha256 = "1cchc1cfp2y32d736r4523gjzvg4rd1nqddxsjsk5kialz06alms"; + url = "https://elpa.gnu.org/packages/ef-themes-1.4.0.tar"; + sha256 = "0pp72bi9s7vyxyyy7dc0vql4k6hqzd1gg3a2i4wi09awdak85gi6"; }; packageRequires = [ emacs ]; meta = { @@ -2011,10 +2011,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.3.6.tar"; - sha256 = "1ihv8gh77849rrdc6qpbpjdw7ikr4biaibw6aggv3hzjf508dzi8"; + url = "https://elpa.gnu.org/packages/flymake-1.3.7.tar"; + sha256 = "07n72y77q1vqvz1rv36jq1cxdp1brp572plvsi2g6mizif5y531z"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -2176,10 +2176,10 @@ elpaBuild { pname = "gnat-compiler"; ename = "gnat-compiler"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.2.tar"; - sha256 = "1cwjv1ziw5hjnk493vwwg25bnvy98wcryy0c4gknl1xp5qr2qxdg"; + url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.3.tar"; + sha256 = "1l5j3br5yrhp3ic0va666ar636hywfd8vssxma3gc858zb9qbzw2"; }; packageRequires = [ emacs wisi ]; meta = { @@ -2308,10 +2308,10 @@ elpaBuild { pname = "gpr-mode"; ename = "gpr-mode"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gpr-mode-1.0.3.tar"; - sha256 = "0m93szqyh9dd73z2pygvacg42n3siiy8pji3yzg1ynji859bc3b8"; + url = "https://elpa.gnu.org/packages/gpr-mode-1.0.4.tar"; + sha256 = "1c97m28i6lym07kb05jgssjxj6p9v3v56qrn48xwv55sriqrha4l"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -2328,10 +2328,10 @@ elpaBuild { pname = "gpr-query"; ename = "gpr-query"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gpr-query-1.0.3.tar"; - sha256 = "13h8hl2g55mbaz95k9jfcvz718rv4vli9wccr3rr7cb7yfvn4c5j"; + url = "https://elpa.gnu.org/packages/gpr-query-1.0.4.tar"; + sha256 = "0a6wrkjqszqq4d0a1amrp7yx4w2hwjbyy7qxd40k9n1vdp7jbzri"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -2620,10 +2620,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.14.0"; + version = "0.14.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.14.0.tar"; - sha256 = "1fzl7xcmxjg005g4676ac3jcshgmcmdr81ywmxvjcs8wj71v56jv"; + url = "https://elpa.gnu.org/packages/ivy-0.14.2.tar"; + sha256 = "1zjksh0jvxyqhzgwmh9i26gaip6c04q400xckh730r2gjs287pjj"; }; packageRequires = [ emacs ]; meta = { @@ -2635,10 +2635,10 @@ elpaBuild { pname = "ivy-avy"; ename = "ivy-avy"; - version = "0.14.0"; + version = "0.14.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-avy-0.14.0.tar"; - sha256 = "0gjpvjahhkxsakqrcni78v71fsrh3f0jrs55a4kqc5hv6qyn8hk9"; + url = "https://elpa.gnu.org/packages/ivy-avy-0.14.2.tar"; + sha256 = "0vdrfn2i078567lklhxfhzq2cjplfpawyq2rzpdpww0fzz6fi426"; }; packageRequires = [ avy emacs ivy ]; meta = { @@ -2665,10 +2665,10 @@ elpaBuild { pname = "ivy-hydra"; ename = "ivy-hydra"; - version = "0.14.0"; + version = "0.14.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-hydra-0.14.0.tar"; - sha256 = "1gsjr2yny9qcj56cb4xy47la11z0lszq0f2qws0yzyh02ng30k1n"; + url = "https://elpa.gnu.org/packages/ivy-hydra-0.14.2.tar"; + sha256 = "10qav0rvgc5bnlazjiwnv9dlk6hivl4acif0zq2f0qqgld9nh528"; }; packageRequires = [ emacs hydra ivy ]; meta = { @@ -2975,10 +2975,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.4.0.tar"; - sha256 = "0jq1q9gmm3nbdsycca2qkjpf04qpp9j615z6l41plmfv7bc0p0x6"; + url = "https://elpa.gnu.org/packages/llm-0.5.0.tar"; + sha256 = "07n32hfzyjzj7vjy5l7rxaldpa4hyjwharkizs2gzz66lg83wix8"; }; packageRequires = [ emacs ]; meta = { @@ -3779,10 +3779,10 @@ elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-real-1.0.6.tar"; - sha256 = "1qfzmmv3c1yc14v502x0438pxh2bcwli1r3xmcxibhb7h6p9mr3k"; + url = "https://elpa.gnu.org/packages/org-real-1.0.7.tar"; + sha256 = "16isfsaxmgxiqfqx4lcsqlxazxjgxakr0k9pgpam13bqqqkq3cmp"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -5169,10 +5169,10 @@ elpaBuild { pname = "swiper"; ename = "swiper"; - version = "0.14.0"; + version = "0.14.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/swiper-0.14.0.tar"; - sha256 = "1p2qil6gj4y8y3ydqs8pbxn8j16q9r42nnc2f61c30hws504pkms"; + url = "https://elpa.gnu.org/packages/swiper-0.14.2.tar"; + sha256 = "1x6jnc0nrk68kww12gq6w8nss6ny76xz0fgxf57550bbipx9pa8m"; }; packageRequires = [ emacs ivy ]; meta = { @@ -5643,16 +5643,17 @@ , elpaBuild , fetchurl , lib + , nadvice , ntlm ? null }: elpaBuild { pname = "url-http-ntlm"; ename = "url-http-ntlm"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.4.el"; - sha256 = "1cakq2ykraci7d1gl8rnpv4f2f5ffyaidhqb1282g7i72adwmb98"; + url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.5.tar"; + sha256 = "0bpjif0c4yzz75v59wsv7hilkpj2gv4kyc0rdk8h3d9hvmlq7791"; }; - packageRequires = [ cl-lib ntlm ]; + packageRequires = [ cl-lib nadvice ntlm ]; meta = { homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html"; license = lib.licenses.free; @@ -6097,10 +6098,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "4.2.2"; + version = "4.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-4.2.2.tar"; - sha256 = "041np2xssm4iv75wmwds25fwx0p2y3j6ph0j0pxmgcj9p028mbka"; + url = "https://elpa.gnu.org/packages/wisi-4.3.2.tar"; + sha256 = "0y3wh0wvxqw7ig2bfrha4zs03993aqcpdp9pald20nady6sqri37"; }; packageRequires = [ emacs seq ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 063e4cac1f561..d0499184b785c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -361,10 +361,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.8.3"; + version = "1.9.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.8.3.tar"; - sha256 = "0c77rlpyda4x05fj3d10cpww0pkbsjcbrvwcwy4gh74c9m9xmq1d"; + url = "https://elpa.nongnu.org/nongnu/cider-1.9.0.tar"; + sha256 = "08vc1v4gzh1njvqhg10c07wq28r2s9qq3y7i4b5clrzgy9l872cw"; }; packageRequires = [ clojure-mode @@ -3001,10 +3001,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.25.5"; + version = "0.26.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.25.5.tar"; - sha256 = "1gxy68a26h65rzf8815iifcnr67rpw69ll14d4cbq9qsxvrmy50h"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.26.0.tar"; + sha256 = "0pgxz3ckw3qjzqyn6vr8k8y1gdiybsm47ik8j62ybsnqs7ivs208"; }; packageRequires = [ compat emacs ]; meta = { @@ -3307,10 +3307,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.3.14"; + version = "17.3.15"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.14.tar"; - sha256 = "1a13lra62vqcxr31ivx1r68wj1d59hkbrfxxmy8f7afm1v4aqbz2"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.15.tar"; + sha256 = "028p034793pkkwgaqgc3zw23ji39ss5gma5g8fhml6v8pc4ri2w8"; }; packageRequires = [ emacs ]; meta = { @@ -3470,10 +3470,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "24.13.20231009115302"; + version = "24.13.20231025112537"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.13.20231009115302.tar"; - sha256 = "0k530ihjjwcvl24f815nk9jqfnbhzb95xlfm8721dlsbrsmsaiwc"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.13.20231025112537.tar"; + sha256 = "1h7z9g3307w0cg361md8mbhsia2534ncqihdfsasg5qhw9184sib"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 955c3a07519cb..dfdd517b600d8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -2803,15 +2803,15 @@ "repo": "mohkale/all-the-icons-nerd-fonts", "unstable": { "version": [ - 20230904, - 1718 + 20231022, + 1956 ], "deps": [ "all-the-icons", "nerd-icons" ], - "commit": "db513dafaa8b73b5abcf9737939863d0e5b2f03d", - "sha256": "0rrghm38brj209imi221lvclxf7fda7vzla0xmdipz2zbvcvcr66" + "commit": "9ac476b1a82199cfa770f214b6d53776cd276bd9", + "sha256": "0f76l7g1gwji3wy3gxir989b8p3lmfn9q5m5p76p0qfvi9c8gz62" } }, { @@ -5472,14 +5472,14 @@ "repo": "elp-revive/auto-highlight-symbol", "unstable": { "version": [ - 20221231, - 1631 + 20231027, + 715 ], "deps": [ "ht" ], - "commit": "ece5e2c722efa5c9ea32a809b484afc222ebebe5", - "sha256": "13v21zmcvnrc5a7ig08xs6nf2irdkah3nwgfjk4933ym8rff4sy9" + "commit": "1c79083b9b6af70b0eba3d4c00cafafeb6154845", + "sha256": "1szb4namrl0415adji9042cxbh28kw8kxk756b3z45y18bscns14" }, "stable": { "version": [ @@ -6195,11 +6195,11 @@ "repo": "nverno/awk-ts-mode", "unstable": { "version": [ - 20231001, - 2221 + 20231022, + 1757 ], - "commit": "d142f0ab61da89d3bf311194f69b655b0b7855a9", - "sha256": "0d6wwx47c1z7vs2ql1497041fawya1xpbgzys5n4j2vqhl07lali" + "commit": "a32d83a2c8714c5f2fdb8cc8cb6733a2eb1a4e87", + "sha256": "1k3nyp4h9iqz6cx90g469jf2j7kvr4q8mqn2i0han2a406izk9n5" } }, { @@ -6951,14 +6951,14 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20220706, - 433 + 20231023, + 544 ], "deps": [ "cl-lib" ], - "commit": "1b121e94871f5d931c75793257db732ba82fdddb", - "sha256": "1mak78xg46hz5l00xqy5g8d6mrfs5z36nb0arjmpam2gvi6mzcz2" + "commit": "14ed4d1048c41c813f601bbf0f4c8d0d5b9489d8", + "sha256": "00qjrzfn0lmj5dr54s6sm10kfjqs815ak2hhgi875rhv5p30smh7" }, "stable": { "version": [ @@ -7983,20 +7983,20 @@ "repo": "liuyinz/binky.el", "unstable": { "version": [ - 20231020, - 2113 + 20231023, + 2145 ], - "commit": "0078a4b0bab190e27cf011b6d1f685ae953fcc82", - "sha256": "0nnn17rjnmzkryckahzpsicy11shbzbrdjwgwnqxigy7bp39smd2" + "commit": "bf9bd87c44cd5ca5ede0f080fa510240d948a644", + "sha256": "0m0xzcrb0yiddbr2vvnnv0vz4wb6smb3lmk4hij2hdhawf22vm1h" }, "stable": { "version": [ 1, 4, - 0 + 1 ], - "commit": "4285ecaf03f821892a83c2deebb9bc2ecad2995f", - "sha256": "0iy5xq5jyjcgqj6slklv0ywpqb4b5ln11xv5q1gj757ach2nmfiy" + "commit": "38e26cb3408a38d749645ee3f2ea9fc1a3cf2a3e", + "sha256": "0d6wyvmbqvzsasldzfv9fwb7iwxdh214xjzq7jqy5xc5k25p0x60" } }, { @@ -9668,8 +9668,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20230925, - 118 + 20231027, + 1517 ], "deps": [ "burly", @@ -9679,8 +9679,8 @@ "map", "pretty-hydra" ], - "commit": "8bfbcd54127f01f812d6e13fa11f55566034fa19", - "sha256": "0p6b6wjcsg2ls7jwgyf8k04jz57y6sw85hz1cky1v7hl2kdl5371" + "commit": "d8d52767b3e0afe00a5166f00897c6d7baea1f90", + "sha256": "0xgw4bhp3gd9acjwd1f00g84hj7wlsvh8m2ll1cc2gjhsywl5kxh" }, "stable": { "version": [ @@ -10756,14 +10756,14 @@ "repo": "minad/cape", "unstable": { "version": [ - 20230930, - 537 + 20231022, + 1157 ], "deps": [ "compat" ], - "commit": "116063b9ee912cbaa7318dbe6597ade4a62b3f59", - "sha256": "0p6waivxyg6mdr6xikv41j19ybbjwn7pmvbjxf309q42qgsvb4jp" + "commit": "bee13e568d42ffec9010fbf795e8f942973da174", + "sha256": "1hxlb2rbbjvfaq858v9cia7msmmpzm3nl5vygaxc1rqyyw6b7wn4" }, "stable": { "version": [ @@ -11931,14 +11931,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230911, - 2017 + 20231027, + 1804 ], "deps": [ "shell-maker" ], - "commit": "8da666560551d6f8bd2f871c48e84b552836a023", - "sha256": "0xfzzqh7dyzk43jfxfn50r8pykaxprs1qnw290s0g22ka0mj64gi" + "commit": "7f11d4a8d979473ea7390cfcbed1ba1ab0fb6732", + "sha256": "0p5lf0r8ldqq8khcarih7msz3pwlzsmzgs2im4dp4akskjqqzbqq" } }, { @@ -12555,8 +12555,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20231021, - 1221 + 20231025, + 508 ], "deps": [ "clojure-mode", @@ -12567,14 +12567,14 @@ "spinner", "transient" ], - "commit": "4c99c02b5762c107cdf771a771a1216b040ba53e", - "sha256": "1nyrlbkqbn7bqj39xdzk6mgrhl4bg3ddhna4f3kggk2rhjlv7yx7" + "commit": "6437f8fe053ada1f5839ff749c3d1b3cfcfd4edd", + "sha256": "072qw9gk11nmgpzgccq01pc32figb547kgw1lxq0m0fkwl1al2k9" }, "stable": { "version": [ 1, - 8, - 3 + 9, + 0 ], "deps": [ "clojure-mode", @@ -12585,8 +12585,8 @@ "spinner", "transient" ], - "commit": "944d6773ac254d9fcac55c05489bff3d91d91402", - "sha256": "12505hbyiqlf4m0mhnkf5r1yaa11rqw4786qxzw56641msv8fxfi" + "commit": "65ab78c7321f1084922653c33b5085ba6633a100", + "sha256": "0sjscbi3qgwn3wcpq5lz7k4gam69h0svh8wbhxcbskr9ys1rmysp" } }, { @@ -12765,11 +12765,11 @@ "repo": "guidoschmidt/circadian.el", "unstable": { "version": [ - 20221223, - 1734 + 20231027, + 744 ], - "commit": "9959e4b9d2ed9920b668fc229aab1f5fa5bd8584", - "sha256": "1hydxhmcchaprfmp08xr6nlksz6y97jbf4mswj69bgdfjfbf22km" + "commit": "b3bb94040080ac18aab04b010752d4984feee37b", + "sha256": "062mci931fwaf12cyw0kidavasdkfcd415iiwizdvlb2dmr3qmsk" }, "stable": { "version": [ @@ -15250,11 +15250,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20231016, - 2324 + 20231023, + 1033 ], - "commit": "a0c7c1775ab15d5d7df57a2126b6b9699049b7f0", - "sha256": "09m5y7n8lvfyrvhlnx3yjqlaw28lsdxljald1kqj4r0pvb1kqwk6" + "commit": "66201465a962ac003f320a1df612641b2b276ab5", + "sha256": "0cia8xic3a1z83mwqnjsfa3nz396zzjwpp8vb0784kk3n7964is6" }, "stable": { "version": [ @@ -16591,15 +16591,15 @@ "repo": "company-mode/company-quickhelp", "unstable": { "version": [ - 20221212, - 534 + 20231026, + 1714 ], "deps": [ "company", "pos-tip" ], - "commit": "9505fb09d064581da142d75c139d48b5cf695bd5", - "sha256": "14sm431636k72pc9iz2kmxxrk0q0ijbwy4gnl0qxqh41p9pqm148" + "commit": "5bda859577582cc42d16fc0eaf5f7c8bedfd9e69", + "sha256": "1i3qysgmyzw66hgw9w9yzvdrx9rbis88byi3aidswnxdj3lvrfgk" }, "stable": { "version": [ @@ -17384,6 +17384,25 @@ } }, { + "ename": "conan", + "commit": "7eebc91812072c0f65c95ab9829f31505f880331", + "sha256": "0n829m79pr85s2c7h582bpv040bx9n9pqwni8ascxdnn8rlm8dzf", + "fetcher": "github", + "repo": "carl2/conan-elisp", + "unstable": { + "version": [ + 20231016, + 830 + ], + "deps": [ + "f", + "s" + ], + "commit": "80d17373cb6c3dc7952c538efd9f94a7f564ffec", + "sha256": "1zn9jvdnrs6brgrsmzkmnmlcvvsdyf1in2jrrx6yzz953i7dnz11" + } + }, + { "ename": "concurrent", "commit": "8bc29a8d518ce7a584277089bd4654f52ac0f358", "sha256": "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf", @@ -17585,14 +17604,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20231020, - 1932 + 20231023, + 1543 ], "deps": [ "compat" ], - "commit": "8f22fbce8d645b9ed45c9ca62c4151644f338a22", - "sha256": "0s6gb6j7y1i1kv8gbhswqbys4pgs2b6g0maspa8dd8f9v96rgh2h" + "commit": "fa249d5dd7212e5ae1fa51c086d8f1197d738ef4", + "sha256": "12h79lc9r5rgmivr2v8ilk4fw9lw8yh0jv4hc7jksc9dgriwxx9k" }, "stable": { "version": [ @@ -17988,16 +18007,16 @@ "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20230706, - 2018 + 20231027, + 1436 ], "deps": [ "consult", "dash", "s" ], - "commit": "4d905df3b74a5a46ebf27ce601846e3adc6b8144", - "sha256": "17lz4bsp8vv9ksfg4a8d3kz2lz7qdpi81gfc0y4jvd9zllcafhnb" + "commit": "eb4c59b8a43c5b74250f92cf8eb05c659efb04d0", + "sha256": "01cs1w126r0czqszwrmfjx31drzq9rlmgfqi5swwvvsz1jcgp2pm" } }, { @@ -18156,14 +18175,14 @@ "repo": "titus.pinta/consult-tex", "unstable": { "version": [ - 20231012, - 1121 + 20231027, + 1150 ], "deps": [ "consult" ], - "commit": "81cf7d7e2ef52c01c291c4ec7215020cbce29085", - "sha256": "1wb8sfmx0y5xwk2yx5alqspm9ddq9mzxfwwcccw8267kqkm3gs3j" + "commit": "a799f1a548e71151b5c0f625c9a532b670c07eb9", + "sha256": "143ihhan50nyfqznw6b331ms5776hq187q3k2i0ha8fcqasycxic" }, "stable": { "version": [ @@ -18179,6 +18198,38 @@ } }, { + "ename": "consult-todo", + "commit": "8445e8dae6f552ea479e2f64961a8e776104570e", + "sha256": "1izplpc6mmn0r9yrfngmwnhprq7lpwdg2dabhlj4170y5xp9y03i", + "fetcher": "github", + "repo": "liuyinz/consult-todo", + "unstable": { + "version": [ + 20231022, + 2059 + ], + "deps": [ + "consult", + "hl-todo" + ], + "commit": "84f3c9876a285f733d75053076a97cc30f7d8eb9", + "sha256": "0v336l9dary68i910yvpk9c24b9vrc1cx615hiv9dz8zi1khz8rr" + }, + "stable": { + "version": [ + 0, + 4, + 1 + ], + "deps": [ + "consult", + "hl-todo" + ], + "commit": "84f3c9876a285f733d75053076a97cc30f7d8eb9", + "sha256": "0v336l9dary68i910yvpk9c24b9vrc1cx615hiv9dz8zi1khz8rr" + } + }, + { "ename": "consult-yasnippet", "commit": "da399d9149261f6fded5a465ba1b6f2353abfa5a", "sha256": "08piq6zfj8ixp8shyc69hmmxqqci0xp5mmg51ajddvz8k0sndgn1", @@ -18324,11 +18375,11 @@ "repo": "nverno/cool-mode", "unstable": { "version": [ - 20220612, - 1904 + 20231026, + 456 ], - "commit": "961e66956412a1dd63f79473a8273da8853f7179", - "sha256": "07dbw0yvk3ijibhghzgaik3cfrv56dr8ax7dyy0kryvjairmhwjc" + "commit": "46b6a38a99a954c5e77e90506eafec4092690692", + "sha256": "1vf4rr97y326lq76q57i2f7j3s264gqz36dnhaav0ivrzx8zwnyl" } }, { @@ -18639,28 +18690,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20230619, - 1623 + 20231025, + 2311 ], "deps": [ "ivy", "swiper" ], - "commit": "aa18c1f4861cef2ddcf0c70b6fd7edd93ae9c627", - "sha256": "11c8874amlgfch2m993qyn4lrj05z3ij4dk2a4wvhj93x8hr0dr8" + "commit": "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d", + "sha256": "1iqj27pc2iivmwfh329v0d9g0z1y0whlnamrl7g2bi374h41m368" }, "stable": { "version": [ 0, 14, - 0 + 2 ], "deps": [ "ivy", "swiper" ], - "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479", - "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v" + "commit": "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d", + "sha256": "1iqj27pc2iivmwfh329v0d9g0z1y0whlnamrl7g2bi374h41m368" } }, { @@ -19895,8 +19946,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20230825, - 946 + 20231024, + 1442 ], "deps": [ "dash", @@ -19904,8 +19955,8 @@ "multi", "shut-up" ], - "commit": "21b2841696fed1b3d8103ad58202d5604326fcc1", - "sha256": "1kwn0hrcl23icq5phz5h6y9likpcnm54mkqrwcvsnzwvdz0jl5xd" + "commit": "2c9107a78048f16c4e274390eb3021e974372d64", + "sha256": "1sfmvqmgvvff56s39jb51sp9b5sz308y99b0xp4galw51s0vm4vq" }, "stable": { "version": [ @@ -21464,14 +21515,14 @@ "repo": "doublep/datetime", "unstable": { "version": [ - 20230925, - 2038 + 20231025, + 1805 ], "deps": [ "extmap" ], - "commit": "3def4bf0d1ed58cdd424980dd01a4b2e056a86ad", - "sha256": "0q4w76b5ay21k011kmsmqcqgibn79j26a593kyj2bqs9fwvsxc5g" + "commit": "0ec8ecf25e857638ead944eeb3e7d68c6f16f2de", + "sha256": "1n10qyhhyxh4g5pizrj2hlffqd0zx5ym8wsbvwk3z3s6949rjniy" }, "stable": { "version": [ @@ -21682,16 +21733,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20230914, - 206 + 20231028, + 506 ], "deps": [ "dash", "s", "spinner" ], - "commit": "415b69394960677a8a013d32a3cf67cb9956eef6", - "sha256": "07360pdbsj5dzwwfdbj4yfxpakmmyy17373wh79z0k954wnj5knc" + "commit": "960b61f4d9bcf75fa0f19c3abb447c63c7d886cf", + "sha256": "1791i7jxpmqvs3xmyk0c12dmx1cjni6gk6z6f0s4h0fhp6g99zas" }, "stable": { "version": [ @@ -25392,16 +25443,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20230930, - 2212 + 20231027, + 619 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "d739ab51d58b76c1d9cc29e7a0e4abe9c30370dc", - "sha256": "0l6w019gngrqb0scign188pyx06yvfiqanjvvl64yjgl5fryr1k2" + "commit": "1df1a7e49015004a7fb54f7baa8fb1767b3960ec", + "sha256": "0zgwdryws6817pj4jldxas9khfzc57hp0cc0vmgbr8izsqqkidhr" }, "stable": { "version": [ @@ -26280,11 +26331,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20231010, - 2046 + 20231024, + 1346 ], - "commit": "1f865701105de5bbc62d88071a05381c14026732", - "sha256": "17gb87av3zflgi9nzm2igfcgby9m9s9lay16w6j2hx6kbwzqdngf" + "commit": "19be1c2f3792c95f04fd369cb931a52f7df9cfd5", + "sha256": "0fc43n3958b5ix304zigsyz5d5i0gx35lq58lfg40qmc9lhm5hym" } }, { @@ -27045,11 +27096,11 @@ "repo": "nverno/ebnf-mode", "unstable": { "version": [ - 20220606, - 1846 + 20231022, + 1759 ], - "commit": "9bc7242557dcef797afdcb4a50c70bf153aa221d", - "sha256": "1zzn9zivg242m5k5hk94fnp0d1vvbhx00jpf14hb7mr0n7qfdgan" + "commit": "61486b1c9d4746249640410e58087e318f801ed8", + "sha256": "17dmi5gpbp4m4c9xbppar3gc67q6s4p4w9q4phzr1ng4xblwkcjj" } }, { @@ -28768,11 +28819,11 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20231011, - 1840 + 20231027, + 1758 ], - "commit": "ed9828d074f53a135c62e989b90c3320642ded5a", - "sha256": "0b6mxz5r830gd14j4jbyifg3k8cqhdl97xxfbgplgj4xxirmpn96" + "commit": "108bccfab4e566c72d16401a675a5fee7ebbb3d8", + "sha256": "16f5ynyvphp58g1fgzqdicd7cj0xc12mx7mi3wzhr6gy9ll510mz" }, "stable": { "version": [ @@ -29388,15 +29439,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20231021, - 605 + 20231022, + 1733 ], "deps": [ "aio", "elfeed" ], - "commit": "1e61ba02afa7e4258e63b5243e2efebe93f28ae4", - "sha256": "1h5841lkcf9029q4zb6cr4z5zgn1x7n17r0jdddd00dwcf5pclrf" + "commit": "0291038a00c17d780aded05b1e90860a2d586546", + "sha256": "0pza83vfih4gmqmf3mvpp9nxvhd9rsvszh71r9vfmdafzwqkc31p" }, "stable": { "version": [ @@ -29560,11 +29611,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20230929, - 17 + 20231026, + 2028 ], - "commit": "9263ed12f653872c70dfef537848e4b3e4a1c4a6", - "sha256": "00l52q82xg3rpbyylbnv8kaynsm7i0z6r9db1css7vzqlk7nbzlf" + "commit": "d5d6010a1bc1b1f5a2422474f701d4573a95aa5b", + "sha256": "055k3za0c5jpa5lgqic9749zsf7vrfzfhcinhhpkrw95amyhpy76" } }, { @@ -29826,14 +29877,14 @@ "repo": "wkirschbaum/elixir-ts-mode", "unstable": { "version": [ - 20231007, - 1031 + 20231025, + 640 ], "deps": [ "heex-ts-mode" ], - "commit": "411ab0a8594040573a2b6bc30f35fa4eea02ba02", - "sha256": "0ws6l9pz3l1wzn71nb49prav5ffskv9c4q6mcgn8y8pkiczir1pj" + "commit": "cb536ff3e70b70004687bbf583757f6929ce0238", + "sha256": "1x55zig1jj8qiarhv6hzmam96jzafwlnsanjq3jqnl5rybr8nsxy" } }, { @@ -29874,14 +29925,15 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20231019, - 905 + 20231027, + 1759 ], "deps": [ + "llm", "spinner" ], - "commit": "f9e0de5af6a48659dc39914e61964231fe75ca69", - "sha256": "1826m9nhyn67dsj8gmvff3nps1d4ldxrcdr3kxhdb88wmnwm7z7b" + "commit": "2e5219afbef9ae0c9adc288d3d13b21e49c847d1", + "sha256": "1l551x979914nznczi2n697ykwcpcr40w61c0ivq46fnvzg9sdl8" } }, { @@ -30988,14 +31040,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20231007, - 1902 + 20231026, + 1842 ], "deps": [ "compat" ], - "commit": "b22bcc42c70e75e5c7cb479eb830ecebda0b8cc3", - "sha256": "16vgg0xfv1xpkkwizcim1xp3ns9dzs4cln2d2lir4lyid8hp4x2p" + "commit": "99cb35d7d228f57ce8e096f0c3afbf4335aa307b", + "sha256": "0r9y6c0hgd8qsv05w21g8h575b7m8hn4xi8zhmjhs1vswxgwidmx" }, "stable": { "version": [ @@ -31104,15 +31156,15 @@ "repo": "cute-jumper/embrace.el", "unstable": { "version": [ - 20171031, - 1833 + 20231027, + 419 ], "deps": [ "cl-lib", "expand-region" ], - "commit": "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2", - "sha256": "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc" + "commit": "c7e748603151d7d91c237fd2d9cdf56e9f3b1ea8", + "sha256": "1c6fbkw1hl9bhdy62g782js8i9kgjr0pr132mpga12jd4cwf8mmz" }, "stable": { "version": [ @@ -31193,16 +31245,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20231017, - 1937 + 20231027, + 2131 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "b1c1c2ef579b1737a86b9d9550261c77afb93992", - "sha256": "0d9frqn01hnqq4gr7i158mh5nlx94myqb2js9xbzncaavxja1r5d" + "commit": "cdea73e122e07c39678606bf876be925589a51f9", + "sha256": "0k8c2c2aaa7byzf8bm5iayfz1h58igsy2mic7ibbm180m69yl1rm" }, "stable": { "version": [ @@ -31873,15 +31925,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20230831, - 1730 + 20231023, + 1521 ], "deps": [ "inheritenv", "seq" ], - "commit": "7effcda0c9870247da72e7bc56bcac2ca12fcbde", - "sha256": "09azbskv3k2dmfk5xq1rrxxjc47h2sdkn3hbqj7icsz2gfynbn6s" + "commit": "4f9ae5d4d1fcb32c844b50ccda34305884d68be3", + "sha256": "1jsxdyl5sjwc2rwwg2j6ggxs7bvgsifsclqylv1lj3hjl8nhrjzj" }, "stable": { "version": [ @@ -32699,28 +32751,30 @@ "repo": "positron-solutions/elisp-repo-kit", "unstable": { "version": [ - 20230511, - 251 + 20231025, + 252 ], "deps": [ "auto-compile", - "dash" + "dash", + "license-templates" ], - "commit": "f6cca4647538c4dc659f07669938f7e795dba4ee", - "sha256": "10827cn3gxlwxdx7a00ayxjhgmfm184v24fidmdz0z17r6sfccjs" + "commit": "f664196ad5736ec03ff04b4566a363309b8ceda4", + "sha256": "01hx2s9x4zz1d33br6hxc2x9wdf09fcn0rq09fmy96gq74cbjf5n" }, "stable": { "version": [ 0, - 3, - 2 + 4, + 0 ], "deps": [ "auto-compile", - "dash" + "dash", + "license-templates" ], - "commit": "008494af28ef37ecc60571e7b2212e44767db862", - "sha256": "0z5h709w01sss69g97608hrjf5zkqvijqafgq8v2p6a9nf6k3ymc" + "commit": "6e5eaa8b6317d596d0721a3d7656bfb89ff2f847", + "sha256": "09gy3p94cpb2ray4jvpxf1cyjzylvxczhn7m76wx8ppfsg221say" } }, { @@ -36049,11 +36103,11 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20231013, - 1706 + 20231026, + 1357 ], - "commit": "db6ab405980dc350b7db411cc25e4bba1be0c092", - "sha256": "1xgzcv6bhnw4dl5c21f54lrhpsl12g9bn18mhjknfyh2cqsaypva" + "commit": "b98c1c6d0b08317c9094bb222739ee037afbe7cd", + "sha256": "05y2sy9kbxk81pg6s45n9d1pymfm7zd0bz5zp6b240hyqc5qx8m8" } }, { @@ -36918,16 +36972,16 @@ "repo": "walseb/exwm-firefox-evil", "unstable": { "version": [ - 20231002, - 1316 + 20231026, + 309 ], "deps": [ "evil", "exwm", "exwm-firefox-core" ], - "commit": "fe1e30029b7e44eae2a2b0bbab8719dd8a9457db", - "sha256": "1kyyf2g0ichi9y6hza3wam91x43bz1aj6njfnlk2kz90dg5kbpiq" + "commit": "ec9e14eca25aea9b7c7169be23843898f46696e7", + "sha256": "1fbxll1ylkrkk6jm4mwcdvpix23dxvfsgl2zs10lr823ndydk1b6" } }, { @@ -37895,11 +37949,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20230904, - 1952 + 20231022, + 1926 ], - "commit": "ec4b0cf13fd374d5de8992eca6adc4db69dbb5ba", - "sha256": "15098ljnanbwfi3va99xy1asagg7df3q0d8kdhx47frld3wlmvcc" + "commit": "5965c8fc693a49e65237a087e693690cf8c9fcb3", + "sha256": "1qxrhrnnxjmw6a1q0v12h2ix5l3d5rp2knf4ppg808mx8b8dcm5w" } }, { @@ -39029,11 +39083,11 @@ "repo": "crmsnbleyd/flexoki-emacs-theme", "unstable": { "version": [ - 20231020, - 623 + 20231026, + 905 ], - "commit": "262db9e912c9cde370f1981121778e9f3bf2beee", - "sha256": "0czcy6v5fsvkbx4hc2ssbhi029jl8dzxi1jfw73pa17779x92a8h" + "commit": "149d00ee4cd17ab465db004910b67456db142802", + "sha256": "056hzf4r8bzzmmhlrgh6f0pppsr3spbrpiwb2kpkdbg1fwi9bjkf" } }, { @@ -40145,6 +40199,36 @@ } }, { + "ename": "flycheck-eask", + "commit": "0ba6c82245d1faaa1280385fe90f8a3144a1c968", + "sha256": "0czmvcb3xg9k9501zr9vym6qg90d89f16pjgkrdfqzdn9v8gpml6", + "fetcher": "github", + "repo": "flycheck/flycheck-eask", + "unstable": { + "version": [ + 20230212, + 1748 + ], + "deps": [ + "flycheck" + ], + "commit": "93cf80d60a8d7080f380e16443e0882ac4656ff1", + "sha256": "0q45h7yyqldj8kxzqb51x7zq98v4f9izwcj1hhgifk8ni1xzr1x5" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "flycheck" + ], + "commit": "ca1de9d55c99c91971857f0c37abfb3da90dd012", + "sha256": "11minw60sp2jg4p3k25cndx5m8ikl44m11ksnhcvqr891z1r8ny4" + } + }, + { "ename": "flycheck-eglot", "commit": "ead6dfff6183385b6792bae4637bcaec76d87428", "sha256": "0awm312r8my2fy7b2zchhfsf12mv7ad24d4wx85f9p5dalgi2340", @@ -44425,14 +44509,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20231021, - 1102 + 20231027, + 359 ], "deps": [ "seq" ], - "commit": "0717a12ef3a1c5b847f961a4ae944cd0198805c6", - "sha256": "1jnb0l4sc9w0yh0mf1z4jz3lvpj7rpfq1m2am3ddipfj9zyipv59" + "commit": "a9c521590e720ab151ed601baf924928bce40bd7", + "sha256": "1ja13x0pqwni367y2vzjl2py4q8v0q5a2f8m5ngps6fppn6hbxjz" }, "stable": { "version": [ @@ -45641,11 +45725,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20230527, - 2344 + 20231024, + 1150 ], - "commit": "3e2ae19f036fedc4cc1c1382cd6bb4f12b1aeb76", - "sha256": "0pj9jc0kvbyk5hpila79ipxqyq1zh1w96qyaks4i0530iqci41y8" + "commit": "8a28276daaa23f10e986367b80dc751c5d26829e", + "sha256": "1hwagkbfrrd5bgwykl6hq56jmg0264hd6iz1nljl3n06k1gm3p90" }, "stable": { "version": [ @@ -46545,16 +46629,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20231012, - 2152 + 20231026, + 1306 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "636a46327384780dc2e4f5ab081bf6046a29af87", - "sha256": "0i2p12ff55wx8pkm44yhfgkggwrj67l113zla2l2sz1vdlzvjs24" + "commit": "0d7c81eee3ba0c6e029605e545173721c39947d7", + "sha256": "1mz4kkrs8b3n7gra3j5gy74awbwnk91nph33r2wql7a7zpz3qizc" }, "stable": { "version": [ @@ -46880,14 +46964,14 @@ "repo": "liuyinz/git-cliff.el", "unstable": { "version": [ - 20231016, - 915 + 20231020, + 1845 ], "deps": [ "transient" ], - "commit": "60db3f5a9350865ec78c652ef53a1335c6534239", - "sha256": "0jislk9rnnx0zbx5jik9w8hqrb3i3pd3rmhvk1i7rjfps0rxf7ps" + "commit": "d675d2ec3f6fb10a07fc3632bb7034a74f92cf8b", + "sha256": "0c07hv3ca8pch9cxqr97m4szksk6m21ipy0a0kimqnavivcgwii5" }, "stable": { "version": [ @@ -46943,16 +47027,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20231015, - 2008 + 20231027, + 2058 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "dd14e0c3c6604f97a447967f0c1ace9947a09e66", - "sha256": "1mfhqgk8ag6pwnim9xvw1jpqd3jndqckhf7zix2j3qjj1qhyjzqw" + "commit": "16ddcd7cc8eced7c242389a8ec51ce52f3b28425", + "sha256": "0c7zsya1v7hkbn316zkky4j9nzkrfavr9xspwrm40mv6z9vdan69" }, "stable": { "version": [ @@ -49385,11 +49469,20 @@ "repo": "M1ndo/gofmt-tag", "unstable": { "version": [ - 20231008, - 2315 + 20231024, + 2333 + ], + "commit": "93d746bda753f892c547d4c366d175c5b972fdd2", + "sha256": "1q0whcp1r3lrkim6dnllxdw59qlqz47rkgsmvwh9dq2jaqiid0pd" + }, + "stable": { + "version": [ + 1, + 0, + 1 ], - "commit": "45295db2106140cde6099b15847de79076468405", - "sha256": "0hdkrj9g8is58l2afb7v11mj911ns6mj3yal7rlganggbb6zkk0v" + "commit": "17db364ebf76548b37222b3a0e38c7cb4b5c95fb", + "sha256": "1rkr3bwwsv35bm65j468pf7dmdz0n8glz83wly8q3rpxliyrw4v7" } }, { @@ -49918,7 +50011,7 @@ "stable": { "version": [ 0, - 32, + 33, 0 ], "deps": [ @@ -49927,8 +50020,8 @@ "magit-popup", "s" ], - "commit": "a8d705a003ec4a4316a38af03bcca56e5e4eedd1", - "sha256": "04x73r6dnzagf67vixxd5c36rykj6s4kqh6lzsa13iwrvs01cwqs" + "commit": "f3c1fca929db8a8289c27533de1fdffaf72cfba3", + "sha256": "098f5rj6x6w6pdl2jz0yabrsq7gyhrncz676j5clik7sn97fp3v1" } }, { @@ -50082,14 +50175,14 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20231003, - 2147 + 20231024, + 2326 ], "deps": [ "transient" ], - "commit": "648fa228a1ccb3ba399a511db8d154fa9fa95b4b", - "sha256": "0g0ryxb2z72f7mwwannqan3w388rcxvkaq0sbnp8inmpdfbd7ki9" + "commit": "644fc1de2f1934f2db1e448de1edae065e848b77", + "sha256": "1jr65afr7nk3qmc7qjb4xslaz3438j46vl4wavx8is3n41621sd3" }, "stable": { "version": [ @@ -50803,11 +50896,11 @@ "repo": "rexim/gruber-darker-theme", "unstable": { "version": [ - 20221122, - 1143 + 20231026, + 2031 ], - "commit": "6de7a37d7b18cf3f0ec51db799f4f2aa6e3e89ff", - "sha256": "1bqjn67s0kcnf86qjxz0ayaash4rbwfwqsppqyy7p9qfc00cjix2" + "commit": "2e9f99c41fe8ef0557e9ea0f3b94ef50c68b5557", + "sha256": "07076fwxqi04ri8hmxjpf348lc4ms2lgjdzk8009sliixhh0mdzl" }, "stable": { "version": [ @@ -51421,11 +51514,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20230918, - 1541 + 20231028, + 643 ], - "commit": "3726a2884fa02fdb83c8a4f43acd11d4b0883c1d", - "sha256": "0fpzfgbi3kybz649x2mzfbx6sqqz1y6672244q0xd4iz28zqln4p" + "commit": "6badf26c40463155d15d196ebb1ee8d69e6b384b", + "sha256": "0bgbb8s26ll1qmvfvkaj1cxynpxljkbr4wm4hfnvmkbby7c0356j" } }, { @@ -51888,11 +51981,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20231010, - 819 + 20231026, + 1602 ], - "commit": "167421abf1db7dd4d297392b58b89bd72e2a9a63", - "sha256": "14196d4jbfwa44z0xhfdgzpga5v6n3c1b366cf7vn1c3qcxk1wmp" + "commit": "ef3fe51f7c207db3c55b9a3a720b3af665d2e606", + "sha256": "15d4wkpv35bbzskiwia0jzl9m5pvs5pl70qs6np6yz7hwq4c524r" }, "stable": { "version": [ @@ -52215,16 +52308,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20231017, - 449 + 20231027, + 1921 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "372167f13f496242263c7014a555e40db12627fb", - "sha256": "1gi1bx64lskmk0b9n2qmcva9005cjxv21fvqs4p4h8scb51l3bj2" + "commit": "4ea8631540ceed540c6242309c5778b3b976d12a", + "sha256": "0w2ynkm256sw25m8yzj5zgqjhhfa1zaqj7a47c81isjdqxfbv7v6" }, "stable": { "version": [ @@ -53108,14 +53201,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20231017, - 449 + 20231022, + 1046 ], "deps": [ "async" ], - "commit": "372167f13f496242263c7014a555e40db12627fb", - "sha256": "1gi1bx64lskmk0b9n2qmcva9005cjxv21fvqs4p4h8scb51l3bj2" + "commit": "a4380caef3a9e4b1e8d11458852ab67ba9b4cf58", + "sha256": "1q6v5zf5wfvg6krj8xfc4g33ja68r8abw5ymy3cmbyvnmxj9dwyb" }, "stable": { "version": [ @@ -54399,16 +54492,16 @@ "repo": "yyoncho/helm-icons", "unstable": { "version": [ - 20230506, - 432 + 20231027, + 616 ], "deps": [ "dash", "f", "treemacs" ], - "commit": "dfefdb41c63217a1d6f57d4c8761b68f3def1a31", - "sha256": "0xd81q5xv05kgh85ah66409nr79ivkib7ff5ygj7h05g1b59lnvk" + "commit": "0d113719ee72cb7b6bb7db29f7200d667bd86607", + "sha256": "1rnw3vkxrsx8xvvi43anvmljw22av072wyda9jlxflk8agbhpdw6" } }, { @@ -55127,14 +55220,14 @@ "repo": "emacs-helm/helm-org", "unstable": { "version": [ - 20210324, - 1927 + 20231022, + 620 ], "deps": [ "helm" ], - "commit": "d67186d3a64e610c03a5f3d583488f018fb032e4", - "sha256": "07wsz9hbv83m3k03cxvlr2hxd2lkxx9qpphn9j6axmysi9i5bc8q" + "commit": "c80e53315ce6b096e2d0e630702df924bf00bf6a", + "sha256": "1nlqlaxxs5zk2ara3k2986jjfsj1zbknwx40jliqq39dky0ksblh" }, "stable": { "version": [ @@ -55193,8 +55286,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20230927, - 521 + 20231023, + 2352 ], "deps": [ "dash", @@ -55202,14 +55295,14 @@ "org-ql", "s" ], - "commit": "f9d4f6241546166f98b5b3b74db4f4532620235a", - "sha256": "1nxjhk0yd0njlscnxvsxnlf1wy6027spcaks64qgvnrzzq9vnzrj" + "commit": "28c4215704031e05190c17932b5e683bb462d9e5", + "sha256": "1jdkk837z8fw2dff5v8fh2dhx7rz348sf5jqpj2aja5ji48p0fs9" }, "stable": { "version": [ 0, 7, - 2 + 3 ], "deps": [ "dash", @@ -55217,8 +55310,8 @@ "org-ql", "s" ], - "commit": "f9d4f6241546166f98b5b3b74db4f4532620235a", - "sha256": "1nxjhk0yd0njlscnxvsxnlf1wy6027spcaks64qgvnrzzq9vnzrj" + "commit": "28c4215704031e05190c17932b5e683bb462d9e5", + "sha256": "1jdkk837z8fw2dff5v8fh2dhx7rz348sf5jqpj2aja5ji48p0fs9" } }, { @@ -55581,16 +55674,16 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20221215, - 613 + 20231023, + 1425 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "35a2111d00c0c0c9d8743280d3f1243bb217118a", - "sha256": "0gd170h3v5i1886f7pvb5h5licy797djhjrigwfj2wa7i5q1avxv" + "commit": "e2e38825c975269a4971df25e79b2ae98929624e", + "sha256": "1q1699qqalgd3pkdhl4bijn9zv2l2bsazjgaiyi2yzmk9ksjwiiq" }, "stable": { "version": [ @@ -56959,8 +57052,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20231007, - 2141 + 20231028, + 516 ], "deps": [ "dash", @@ -56968,8 +57061,8 @@ "f", "s" ], - "commit": "737ff828d763e156a6072a532f2c3d2d0c26178e", - "sha256": "1d46rscvjhpdn1nlydgcsxhk670dabwckdk9jljyblnzh4mn5g5k" + "commit": "a32a5b3d959a7fccf09a71d97b3d7c888ac31c69", + "sha256": "1shv5v0rls38znv64g8h80541qyjqk39fpr7wkq5vis8xpfvvpp5" }, "stable": { "version": [ @@ -59116,8 +59209,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20231021, - 15 + 20231027, + 1458 ], "deps": [ "compat", @@ -59126,8 +59219,8 @@ "plz", "transient" ], - "commit": "dbf3d5063f7a6c95ac27dff23eb4456ce9a270b5", - "sha256": "0c65f8kvz08997mx5jz03hw7ggyvs368fb98x9ziandq61vhhhwc" + "commit": "f37b757087a882d1736af3f06374bf81da940f06", + "sha256": "0l7gbqa8q5vkw2ydqgl5indf806shhi37pd2ihcr15g3az7indw3" }, "stable": { "version": [ @@ -62504,20 +62597,20 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20230714, - 751 + 20231025, + 2311 ], - "commit": "9d630d800e856a2c984c5a62a6f0ad313a9d2228", - "sha256": "0a2z9ca2m3f3wk4al60psdxnc3lyalh8h2vv6dr5l2xx5ahhb9ja" + "commit": "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d", + "sha256": "1iqj27pc2iivmwfh329v0d9g0z1y0whlnamrl7g2bi374h41m368" }, "stable": { "version": [ 0, 14, - 0 + 2 ], - "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479", - "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v" + "commit": "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d", + "sha256": "1iqj27pc2iivmwfh329v0d9g0z1y0whlnamrl7g2bi374h41m368" } }, { @@ -62528,28 +62621,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20230410, - 1815 + 20231025, + 2311 ], "deps": [ "avy", "ivy" ], - "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479", - "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v" + "commit": "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d", + "sha256": "1iqj27pc2iivmwfh329v0d9g0z1y0whlnamrl7g2bi374h41m368" }, "stable": { "version": [ 0, 14, - 0 + 2 ], "deps": [ "avy", "ivy" ], - "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479", - "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v" + "commit": "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d", + "sha256": "1iqj27pc2iivmwfh329v0d9g0z1y0whlnamrl7g2bi374h41m368" } }, { @@ -62896,28 +62989,28 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20230410, - 1815 + 20231025, + 2311 ], "deps": [ "hydra", "ivy" ], - "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479", - "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v" + "commit": "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d", + "sha256": "1iqj27pc2iivmwfh329v0d9g0z1y0whlnamrl7g2bi374h41m368" }, "stable": { "version": [ 0, 14, - 0 + 2 ], "deps": [ "hydra", "ivy" ], - "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479", - "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v" + "commit": "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d", + "sha256": "1iqj27pc2iivmwfh329v0d9g0z1y0whlnamrl7g2bi374h41m368" } }, { @@ -64475,11 +64568,11 @@ "repo": "nverno/jq-ts-mode", "unstable": { "version": [ - 20231018, - 1047 + 20231025, + 2319 ], - "commit": "14a4df0ed089bc9d322b9846d1b87f603c241161", - "sha256": "19rvid30zc561v88d45q51q1xrgs28m6s0njiph0rkfw4ffkcg5l" + "commit": "b1abef71843dd99349133a75245804aee503c05d", + "sha256": "0xjmpk33rhqlw5f9qjhmyc057l8rbrrzhz460zsljx2wm11cvp6d" } }, { @@ -65280,14 +65373,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20230529, - 943 + 20231026, + 1005 ], "deps": [ "s" ], - "commit": "9503ef7110732e444e686e815c5b2ae8228d274d", - "sha256": "0kw7228qfk1gamrjh8sddpslrb74a37zxadk22v4x16lm6f1cz27" + "commit": "4947319bc948b3f80d61b0d65a719737275949b8", + "sha256": "0vfpc4glkbl4ccz34i6fx9ny6zl9h69lw0sbv2rr526y7rr1cr7a" }, "stable": { "version": [ @@ -65328,8 +65421,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20231019, - 455 + 20231026, + 2200 ], "deps": [ "dash", @@ -65338,8 +65431,8 @@ "s", "spinner" ], - "commit": "249dd96cd112f4a2f9a15555aeed5a315cee8cb5", - "sha256": "1k34gn05rqlnmrvw8x0z0lq3zjdd10w8s7hkgy11yzfsks9r8fr3" + "commit": "97ca00411e16a2c1815090ca5aa05b3a36776a75", + "sha256": "168x8g2m30ci2msjfk09bbczpa33h4ax57b23hcwy5czk9511w70" }, "stable": { "version": [ @@ -66388,14 +66481,14 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20230901, - 1234 + 20231027, + 2204 ], "deps": [ "compat" ], - "commit": "481a1620cac3118aff4b2db027acde7d3834b153", - "sha256": "1gry1mzz5mxbi40xlnrl3ks8778lx963k68zwff0iry4xcbsss42" + "commit": "0a1cd94dfe047e60912791439e03caed0fdcaa0b", + "sha256": "13m07ik30li3jm9sa5js61i6kvjdhvqdy1yzj94i4qrr7mm67zk5" }, "stable": { "version": [ @@ -67194,11 +67287,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20231018, - 1342 + 20231026, + 958 ], - "commit": "6c2568693cd80b1cf57c7950d9458bca5af371ce", - "sha256": "1v51n5vb5gmx01vxqkwdwawcjp0g92316273v4qx3w3k7dr0k85h" + "commit": "0472c9346e30f8499c87938a323c733628a0dd26", + "sha256": "1gnlrbzj1z4028mm2c6bn7bf38vbs90z88i63f428hvjvimg0pw1" } }, { @@ -68070,6 +68163,7 @@ "stable": { "version": [ 1, + 0, 0 ], "commit": "d45dedbc74887c59f15c5a3dcd7546d2c29c30a4", @@ -68748,15 +68842,27 @@ "repo": "martianh/lem.el", "unstable": { "version": [ - 20231017, - 1432 + 20231022, + 1416 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "44b9535698384851f93257fd132319fb62c13c9e", - "sha256": "1ww05yqdrkgxnv37q2wa0al4k25cz1nwyygvycbcbawisqk3pmbk" + "commit": "7f4184f51001c6df218d318b2f938cbb631541e9", + "sha256": "0ggm8y8a0gn5cj6m34fvkymfxc0agfr7cvr7wnysfzwdc0iwgwdz" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "fedi", + "markdown-mode" + ], + "commit": "7f4184f51001c6df218d318b2f938cbb631541e9", + "sha256": "0ggm8y8a0gn5cj6m34fvkymfxc0agfr7cvr7wnysfzwdc0iwgwdz" } }, { @@ -69329,30 +69435,6 @@ } }, { - "ename": "ligo-mode", - "commit": "c8a86d223f5e764419aaf964d69a30350f74f904", - "sha256": "1289n7xbpx6ppil6rixck81xw3x0acrpcnxchml5yrwqrbr8czli", - "fetcher": "gitlab", - "repo": "ligolang/ligo", - "unstable": { - "version": [ - 20230927, - 1841 - ], - "commit": "a392154388b1abe974f424b71a66d618010f9e95", - "sha256": "0qd8ziv9j59s4q61bs1qdm5cvsd396pp3g2ymb1kxzpmbblaf0nc" - }, - "stable": { - "version": [ - 1, - 0, - 0 - ], - "commit": "a392154388b1abe974f424b71a66d618010f9e95", - "sha256": "0qd8ziv9j59s4q61bs1qdm5cvsd396pp3g2ymb1kxzpmbblaf0nc" - } - }, - { "ename": "line-reminder", "commit": "eb151125750b06c2cf6fcc5d762c980fdc89b0dc", "sha256": "1l7bf0lvncn645v7c3rr5gxd9jkz5jfyaps864mzwvmasbx6d3p4", @@ -69360,31 +69442,31 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20230420, - 142 + 20231028, + 359 ], "deps": [ "fringe-helper", "ht", - "indicators", "ov" ], - "commit": "583bff387b361e1fe442f57e9ad1f6f8e87dedf4", - "sha256": "16shzyvvqwr83qdpwzwnyxabmgk4kz6jc4gk4yjs0mnakrgx6c0c" + "commit": "9e60c92b2495737d25407d79fb3a0e3d9909d5c9", + "sha256": "128icdyrfcj9p6yg98bpgmm72qi71hb51bv042549qwgdfbx7is6" }, "stable": { "version": [ 0, 5, - 1 + 2 ], "deps": [ "fringe-helper", "ht", - "indicators" + "indicators", + "ov" ], - "commit": "8bf9e6d70347a99528bab56f90e0210f9a88dad8", - "sha256": "0f78dnz0qmmq2g4xsm3a9kqg4864lghv1nbz0hj2c8mz2c58laqs" + "commit": "8b63b6ad6733363b24a8f5472f71eab301044b43", + "sha256": "1m8mshggyyv7wqjydjnx0jzyxxqpq4r1v0hwyrmcv9a7rngh7dzr" } }, { @@ -70904,16 +70986,16 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20231015, - 1458 + 20231023, + 219 ], "deps": [ "compat", "map", "seq" ], - "commit": "0780e281e12742803f5aac8f2126156d4271d567", - "sha256": "1vv9gsswb03hmfxw7d517nx1qncax7mdgx1dfsqp9hcg3s3nwycs" + "commit": "3819e0f74dbde83822fb1d5d26444c3a5c63f408", + "sha256": "0w1gffzg2rjimwfwz6wrgskadjsd8cz7hnaqy6da022mskifzh1n" }, "stable": { "version": [ @@ -71007,14 +71089,14 @@ "repo": "abo-abo/lpy", "unstable": { "version": [ - 20221106, - 1310 + 20231026, + 1525 ], "deps": [ "lispy" ], - "commit": "fa95b11e1023704510cc7dd2897bf8bcc3027cbb", - "sha256": "18kx2mfmxy8s8csnp0iaiirl2z9baicq9f2w7rxlgkxww5511v7d" + "commit": "2c086ec162d4456b99a6095c3c335382a8304734", + "sha256": "0vrc7q7b872mm5shi6s7x5wx2d8znnmjd1adsjdxwnaqap4x98gd" } }, { @@ -71485,8 +71567,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20231021, - 455 + 20231027, + 613 ], "deps": [ "dash", @@ -71497,8 +71579,8 @@ "markdown-mode", "spinner" ], - "commit": "2134ca09245815487f395a4c53000da1082e8823", - "sha256": "0721z42hfh768b0cr57i7cr212962hx5k1fjsy9b6z19rvhr4ddy" + "commit": "0f5723f9ae5d7fe2a82ad45e4505710b6a13be41", + "sha256": "0zxsvz73whc44xgsvcfikdbb5d5f762r7ys6zpik07n7ry98qq85" }, "stable": { "version": [ @@ -71913,11 +71995,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20230810, - 931 + 20231023, + 947 ], - "commit": "7eb8eaa420c25477c830623b830fd18dc350cdfb", - "sha256": "12bv7rlhz8gncg142780ri4mhzrzd06xjrg8i0mwxb2rn8i0nidc" + "commit": "d074e4134b1beae9ed4c9b512af741ca0d852ba3", + "sha256": "1n1k55xy9zaknb9hfv7qlxi3ij1dvspldzzn6vc68c7yzskn88zv" }, "stable": { "version": [ @@ -72436,8 +72518,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20231014, - 1408 + 20231027, + 1202 ], "deps": [ "compat", @@ -72448,8 +72530,8 @@ "transient", "with-editor" ], - "commit": "c6a62accc5ed4bbdae4e1dc2060210ecfc4cdb8a", - "sha256": "1m1ip8ly0gjs3brmgkijb2vmyfrr489src9zgpn6whl1l10d7wa6" + "commit": "2ca552e3c4c0086f1097c2c7098888425ec6bdee", + "sha256": "0fpifvbnddx61y88ndr3sdx69knj50hvqd5bcapa8r1r3dic64dg" }, "stable": { "version": [ @@ -73079,8 +73161,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20230826, - 1832 + 20231027, + 1452 ], "deps": [ "async", @@ -73092,8 +73174,8 @@ "s", "transient" ], - "commit": "d85518d45d329cc0b465cc3b84910b7c66b3fc42", - "sha256": "1zjlf3bhz0a7r9sa5ic22vwr2w1zxbfk9z545pdd1fvp00c2kzd0" + "commit": "a197a04da1620ee7d41f3aa4f846a479760e2273", + "sha256": "16xdf60mw6lwklw2p2cv081c728d4qfrazrb36nq8pxxzz56bxas" }, "stable": { "version": [ @@ -73766,14 +73848,14 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20230925, - 1627 + 20231028, + 907 ], "deps": [ "compat" ], - "commit": "4e14bc0fa05ae8c35e019721d19acdec8b51248c", - "sha256": "0mv54hgb8cadwdhmn20d30fairhvvrvlvvp9awfi32dw91hma8gv" + "commit": "e4ff0838da33bf5102ee009ff28d541f0b51c9a3", + "sha256": "0q83ia4dh0jj17m8s66ps7nfzib8656w2ig6w2jnmv63qfzfyx3d" }, "stable": { "version": [ @@ -73893,11 +73975,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20231021, - 738 + 20231028, + 853 ], - "commit": "2a0556c5b7dbf29ce437eac6ee9b6636e1b95234", - "sha256": "1mkwqprh09328hqk1f40i8l09ksmphz7nyn3fzhghalgr40b1ij8" + "commit": "b1a862f0165b7bafe0f874738a55be1b1720dd7d", + "sha256": "0r9z4vlan1255118kdand9mr9rkdr8kmvrxr9q8bclyz8dk6fr54" }, "stable": { "version": [ @@ -76418,20 +76500,20 @@ "repo": "DCsunset/modaled", "unstable": { "version": [ - 20231014, - 255 + 20231026, + 247 ], - "commit": "ace80c0bd5d37803fdd1cbcb3ddb8a5e3b0cce98", - "sha256": "0ksl9jz4620myzhr2bfnw30ljni3bxn1drcydqnbs3ii94ysjm3d" + "commit": "0a8471752f89d07b439680212dceda2e69b63457", + "sha256": "0sgxsknrq65hijrlvzd14j78vfd6wfah7qg57rcbjxw00hs9nxf3" }, "stable": { "version": [ 0, - 7, + 8, 0 ], - "commit": "ace80c0bd5d37803fdd1cbcb3ddb8a5e3b0cce98", - "sha256": "0ksl9jz4620myzhr2bfnw30ljni3bxn1drcydqnbs3ii94ysjm3d" + "commit": "0a8471752f89d07b439680212dceda2e69b63457", + "sha256": "0sgxsknrq65hijrlvzd14j78vfd6wfah7qg57rcbjxw00hs9nxf3" } }, { @@ -77986,20 +78068,20 @@ "repo": "mkcms/mu4e-overview", "unstable": { "version": [ - 20231021, - 46 + 20231027, + 1038 ], - "commit": "18b74e26616f7fe4d2db13d9def4b5a0fa44ddcd", - "sha256": "0ly0fcffdb73923hr1m5s1zfl9c7m9wh0khsn1zxj6bw7azjqk6i" + "commit": "0e711f47f9bab8bea9fe4f8e857920b879e70dcd", + "sha256": "0zh4pi4d74cs9p8ll7fzq8chxk84safvb7svxcss692jjsqvj89y" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "467a7dfda4e534783469a137545193ded8a66723", - "sha256": "08lwvgwfsxmvm5bnw0sl96dry57h4wcjsi2fr2mmfq190kdjrizy" + "commit": "0e711f47f9bab8bea9fe4f8e857920b879e70dcd", + "sha256": "0zh4pi4d74cs9p8ll7fzq8chxk84safvb7svxcss692jjsqvj89y" } }, { @@ -78107,8 +78189,8 @@ "repo": "mihaiolteanu/mugur", "unstable": { "version": [ - 20210719, - 722 + 20231024, + 755 ], "deps": [ "anaphora", @@ -78116,8 +78198,8 @@ "dash", "s" ], - "commit": "63a0377ac1ad48171621c9f0c719b62ec9395d35", - "sha256": "180i7igzqv5l22vk6n96g196mnd50lgwcmjkmzwlwdxn4jsgvjbv" + "commit": "9d55e6eac893abfc0a2622d6ac2a791ce5b23fbb", + "sha256": "1571bxz6jjdpxdcmv3aisd87pwrr46z0pljql45n9lsvs01liyr3" }, "stable": { "version": [ @@ -78640,10 +78722,10 @@ }, { "ename": "my-repo-pins", - "commit": "71668cffda630ca39d6f606ee61fc1dc47d70978", - "sha256": "10kapw38sq850599axqpmkvr4cn6pmqy2r1cw07ks6f423bxrlh9", + "commit": "761dcdc06682d1511e07142fbbb48749ef22a859", + "sha256": "0ppnxz6b0gyxp9462bkq70p4drs5qshxa3n059brx0bcd14g20z6", "fetcher": "github", - "repo": "NinjaTrappeur/my-repo-pins", + "repo": "picnoir/my-repo-pins", "unstable": { "version": [ 20230120, @@ -80654,14 +80736,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20230801, - 1005 + 20231024, + 854 ], "deps": [ "compat" ], - "commit": "fcfd51fbdf08469e6d1b59bc4bd2d75aa708c791", - "sha256": "190lhzqdn4681frk0ih519c3riwxc6mz16q3bisl3l7brsp1rgwj" + "commit": "1fb3271e991fb941e8cc480beff74000e3a08a3a", + "sha256": "0ahlri3hlkrlmm6bh094ays6qrw9yd02rghq0hgin006817r8pqz" }, "stable": { "version": [ @@ -81109,10 +81191,11 @@ "stable": { "version": [ 0, - 38 + 38, + 1 ], - "commit": "60b5ea319a45900b1e610715481faaa339ea3a4c", - "sha256": "1x0h5z2476qsfi1qfywlfdn68gydlyqfmvpjr92yw3pmp28ilrl3" + "commit": "356ad392716d2a775e58d766c1fec9047cc84163", + "sha256": "01h8handfqhps79gyx579b70sfigyxdlk3qgqv413ahvinw5h47b" } }, { @@ -82928,14 +83011,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20231021, - 1002 + 20231027, + 518 ], "deps": [ "restclient" ], - "commit": "3fb2c99c37c9972ecda143c826725819357e0de9", - "sha256": "15dcl1js20d9csmsj7xn4y0nzr6b0q1p1vfa5kl103i4l2v6cj62" + "commit": "1a127eb0165f10bb9d33606aa8529051118805e7", + "sha256": "0fk0ly8hyhlq4vyndkmv22cx0p7cknf56j6djika1c9d4hl75ff2" } }, { @@ -84518,11 +84601,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20230920, - 553 + 20231025, + 2044 ], - "commit": "d6b402a89e234d0e6166247ed6025f9acc8b4d9a", - "sha256": "00233wp3dlzxbnxbxq1ph9j93d25mnqn6iagr7rfp83b7d9s9gbb" + "commit": "89eb3775daa53cfb52ad03015410c23f28c72d30", + "sha256": "0gpnfxh8kps0szd5lmpy4zvqxgzmazspgg5wfdd0c1ywszz5lczh" }, "stable": { "version": [ @@ -85219,14 +85302,14 @@ "repo": "drghirlanda/org-change", "unstable": { "version": [ - 20230505, - 150 + 20231026, + 2216 ], "deps": [ "org" ], - "commit": "45898a67701ade93f310db8e5820b8bfc4a28846", - "sha256": "10ryk3p8nz8pqck310m1zrkam9p6wb3lf46wcgwhqsri9aa780vj" + "commit": "c74662112e8a857bd87c54128baba9307a393974", + "sha256": "0mpsghnzgyhxzjdsnj57sizv0dny75hm0kj61q13ckrc26bjlhg7" } }, { @@ -86411,14 +86494,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20231013, - 1147 + 20231022, + 829 ], "deps": [ "org" ], - "commit": "ac0832f02a1259c10d3691b35496a01b54f0a3b9", - "sha256": "02ax78319p8iy8qqxrlcc32a3mkmawybb1qv37m34g1f49wlx0d7" + "commit": "a306f76ee2b0292946a20530bd9114aefc85a263", + "sha256": "0bym8v8hwwhshk65hpfg7dnyzyym0g0hz6h692jpiqrp0mcvnilc" }, "stable": { "version": [ @@ -86684,16 +86767,16 @@ "repo": "alphapapa/org-make-toc", "unstable": { "version": [ - 20230904, - 911 + 20231025, + 2326 ], "deps": [ "dash", "org", "s" ], - "commit": "e6da481729a103a081b1b6bbca7202a21cb7321a", - "sha256": "009sim07f0dyxdpcr5fqbqla5s5i1sc8z008h85v957wbhw6dmhi" + "commit": "df29826107ad12fd1d5f173a9a8e070b84f21a68", + "sha256": "1bsn8z7nc2qngjdkd7sq14f53i8pgjchka1s3l6cqxbjv9gvm0q5" }, "stable": { "version": [ @@ -87537,8 +87620,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20231020, - 244 + 20231025, + 830 ], "deps": [ "dash", @@ -87552,14 +87635,14 @@ "transient", "ts" ], - "commit": "ac2d43588aa96f0b7fe88f518d6fca4fd65b5aa0", - "sha256": "098x2vv7w7s4i9kic7q8jcnixm517247i31a2ng06jkad7q7gx5d" + "commit": "bd2dd12a417df5403954576756d9c24273d94379", + "sha256": "1rmf5jg1jgfhyaarfmrmha7vhzc3v45zqccn44sihrhxpp1b8www" }, "stable": { "version": [ 0, 7, - 2 + 3 ], "deps": [ "dash", @@ -87573,8 +87656,8 @@ "transient", "ts" ], - "commit": "f9d4f6241546166f98b5b3b74db4f4532620235a", - "sha256": "1nxjhk0yd0njlscnxvsxnlf1wy6027spcaks64qgvnrzzq9vnzrj" + "commit": "28c4215704031e05190c17932b5e683bb462d9e5", + "sha256": "1jdkk837z8fw2dff5v8fh2dhx7rz348sf5jqpj2aja5ji48p0fs9" } }, { @@ -87847,8 +87930,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20231021, - 1453 + 20231027, + 1224 ], "deps": [ "avy", @@ -87863,8 +87946,8 @@ "parsebib", "s" ], - "commit": "b2eaf51c0082fab335475ef3e9761ec5a3858f79", - "sha256": "0w359ijj3qzp180wnialrjmgxfrygp9i3jjyhwyil6ka5gnbyycj" + "commit": "1773de623017e177e79b17ed6a5ee6f7162fd9e5", + "sha256": "0c2p68nhxf8abpnp28zskpqnnp13x5vb47pdzymad4zjc4zrdf3y" }, "stable": { "version": [ @@ -91648,26 +91731,26 @@ "repo": "ox-tufte/ox-tufte", "unstable": { "version": [ - 20230910, - 2353 + 20231022, + 2117 ], "deps": [ "org" ], - "commit": "88e0cd130c7db748855e7f083d7f623692ef8239", - "sha256": "18b5ch69db4kavz18pg2kyf8fy0yi28176bal5drxwdffsyw7p4f" + "commit": "58422fb109f2b2a997f9c773b5436e7b62182e12", + "sha256": "14i1pliifj5p0i1bgsdgph32ilj7snrh8gnhk59f1f4ngh3kw3zg" }, "stable": { "version": [ 3, 0, - 2 + 3 ], "deps": [ "org" ], - "commit": "88e0cd130c7db748855e7f083d7f623692ef8239", - "sha256": "18b5ch69db4kavz18pg2kyf8fy0yi28176bal5drxwdffsyw7p4f" + "commit": "58422fb109f2b2a997f9c773b5436e7b62182e12", + "sha256": "14i1pliifj5p0i1bgsdgph32ilj7snrh8gnhk59f1f4ngh3kw3zg" } }, { @@ -93327,10 +93410,10 @@ }, { "ename": "pcap-mode", - "commit": "44f4cb526556a4b58b7e67314002e73413a59a76", - "sha256": "1p6lnr7yr8i3yp63xc8r1hnx8a4v0mz1s7q89zxx7aprk7i9kpv6", + "commit": "ee84077d859aa8f941bc2749c2fc02ada6e608cd", + "sha256": "1k1vbvx3g9g5bn6vfijaffacn7lf2gl67b7f3kh3fq12jxp1swvp", "fetcher": "github", - "repo": "orgcandman/pcap-mode", + "repo": "apconole/pcap-mode", "unstable": { "version": [ 20161025, @@ -97667,11 +97750,11 @@ "repo": "nverno/prisma-ts-mode", "unstable": { "version": [ - 20231007, - 904 + 20231022, + 1802 ], - "commit": "b597a437a96c0f03cf2bc038794d6a98ba1bd48b", - "sha256": "1m4lv4isfd0szyy6dj75kpid6qs6zvj2jx80glndm0qqyznrkl94" + "commit": "a7029980140ae60612ef876efa17ab81bf4b3add", + "sha256": "0isym89c4432qrdzpbmg85pw97jw6lvbz9sdv1xy08c448dydg79" } }, { @@ -98932,15 +99015,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20231001, - 432 + 20231023, + 1749 ], "deps": [ "async", "cl-lib" ], - "commit": "fc60f1253aeb9c38a08dc74f9c7dbfe0d535a19b", - "sha256": "15x1h104krici21ipsn6jr1y3yhyif5mkw38s3bwd5xhmsa3lazz" + "commit": "1f74eecb5375fa94eb8d809f8e27caa48ed2323d", + "sha256": "1aa5g9082s8dvd0hd1n4yjlcnpd64l1przmmvjr4vgyaix42rg9z" }, "stable": { "version": [ @@ -99444,11 +99527,11 @@ "repo": "ideasman42/emacs-py-autopep8", "unstable": { "version": [ - 20230115, - 633 + 20231025, + 2256 ], - "commit": "d0486c22c0a92ad7911714026021fe4ad276b7c9", - "sha256": "1xa25sfdmc6srys0ymhdj07kss4ixnw3sqq5grjix7acifdmrbj9" + "commit": "3e3f6c182455bf85284cda7f4ffe639444b84940", + "sha256": "05xqdja61p3c3sx836z3c1jjbm0ih2mrw13qnkp2hhh3ahyz2qql" }, "stable": { "version": [ @@ -102958,8 +103041,8 @@ "repo": "alhassy/repl-driven-development", "unstable": { "version": [ - 20231020, - 1039 + 20231023, + 1120 ], "deps": [ "bind-key", @@ -102974,8 +103057,8 @@ "pulsar", "s" ], - "commit": "106712f43d4cb8d891837a670dabad08a7629528", - "sha256": "0xad9xksjgiw02rw1174adgaqjpvyqx0hp61qd4r44y40rzns5kp" + "commit": "8877f692112459095649735ac4d023248b3905ae", + "sha256": "19zj743ayv322cz13kilkkl4djpzs9q22z6qhk0ipasy1kdijh57" } }, { @@ -103878,8 +103961,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20230212, - 1425 + 20231025, + 1220 ], "deps": [ "cl-lib", @@ -103887,8 +103970,8 @@ "popup", "posframe" ], - "commit": "6438abacace7d94f05fabc45b82d619677fc5fca", - "sha256": "0fyv92lfz7c98l79valrh9wr78b4303bhnqjgycbz33p9m2hply0" + "commit": "0de3250fd1005878dd7a06a8fef7324a878f17b3", + "sha256": "0yfv3pw82953l77lz1jj5pscjra1ha157pzlhhykmn3sfvn0s45r" }, "stable": { "version": [ @@ -104093,11 +104176,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20231011, - 525 + 20231024, + 221 ], - "commit": "f693bb31605d6e8a0b98f74d35e2a728e33f0af7", - "sha256": "1pvmcxdv9lw6gzgx5wgpbvws6z9lwxh8vrf4vykqdym5g9wdk3hb" + "commit": "86c6e12a85db472e6660ef7fef12a4e719ef3c66", + "sha256": "1kvl8syz700vl2dbva4k1vdzxd67sjby4w4zsl62njvbvwzvcj0r" } }, { @@ -104108,14 +104191,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20231021, - 48 + 20231023, + 2046 ], "deps": [ "inf-ruby" ], - "commit": "0095a48075f366e195d4861c3a91467bcf423c73", - "sha256": "1qa3w3g5ayrxh20l0948sr7yhz480qc8q1r34iv50jv8i6flsb5w" + "commit": "021a7bc34848ef77eaeaa41d7899c6cab873cb0e", + "sha256": "0s0cmj1vmfa9gwn388ll3fpsv25q3v6vvj6k4xlcn75kdfzsbx59" }, "stable": { "version": [ @@ -105846,11 +105929,11 @@ "repo": "meain/scopeline.el", "unstable": { "version": [ - 20230622, - 829 + 20231027, + 1524 ], - "commit": "254d300aee0a22349b07fbe542fbec81547bae75", - "sha256": "1q4x5fmx95isiq47nk7r3q0n3q9dvbl855yph0p6wy7rr999v3jb" + "commit": "58d6ef20b6cf398c48571239311d812a2f926ecb", + "sha256": "0p10mpn9bbd6cccafw0h296xhavq8x46mn3292iks10v553b0li6" } }, { @@ -107688,11 +107771,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20231020, - 743 + 20231026, + 455 ], - "commit": "622038d8e24c542f29bccde2db84a6a6d6af19a2", - "sha256": "0yi9dmayyr8di6kczbya37zym32cxwzcwkkac2fw5jwsm63kyzan" + "commit": "e3b87d61dfef3a9d44872c50db360732ba949d57", + "sha256": "06rqxib501xn2xlc4pqdh06zw0wrkg70sxr2fqv7i2fpl9qxwriv" } }, { @@ -108729,14 +108812,14 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20230305, - 1006 + 20231024, + 1738 ], "deps": [ "terminal-focus-reporting" ], - "commit": "e4142baa470e5f33dd508bce0264359dc5204b6f", - "sha256": "1yhlc8wpnay8fj9m5n9sy1mzdqs2sq7bkdabbc2cv5pczj88ndbv" + "commit": "80b2e7c3be365c7685cc4070294359341799cd47", + "sha256": "1qa0dzy8qjdyd1m0bxwx269lrvqxz7hmyl95c55rr9pj928a3v12" } }, { @@ -109852,15 +109935,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20231021, - 1239 + 20231024, + 1804 ], "deps": [ "cl-lib", "dash" ], - "commit": "e3e563b20e405d87e3f1b3792174803bb8de2b7b", - "sha256": "1vkxskgh1qbr4l2k6ghvpyws3192gay0shsj5vds6432q7ckyr5v" + "commit": "0778a8a84064cf2bc3a9857bd0e7a4619cc1e5c3", + "sha256": "1svi5zfrg2ygsjb247y02c9i0cqmc5lqa7sq999niriblj5plr60" }, "stable": { "version": [ @@ -110422,15 +110505,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20231020, - 614 + 20231028, + 558 ], "deps": [ "dash", "s" ], - "commit": "cf1e6ae475c053ec18c3722b4591b863a788adce", - "sha256": "043p574fqfjbh1yqgxnihrjf2mmqra4s4wabb64y6acc9jpbpavw" + "commit": "dd092660aa7204060223377ba07e5d6c8b766d41", + "sha256": "0ssbwygc5c9jmd4vmj4y2pn9fpk2zd0m7qpkq2c6wnsl7z9g07rg" } }, { @@ -112459,8 +112542,8 @@ "repo": "daanturo/starhugger.el", "unstable": { "version": [ - 20230901, - 1922 + 20231023, + 1523 ], "deps": [ "compat", @@ -112468,14 +112551,14 @@ "s", "spinner" ], - "commit": "32c362a31fab1deedd37d787812e399fbee0d870", - "sha256": "1a08a7nxldxyprpq3ywydfvhaglcap7a1rh0x057zy8qaka86x05" + "commit": "8e1bc1167a64cc421ce3d1368a9c0e5da89bf687", + "sha256": "0wpxicq7yh99qx6vwvjgbwwghx1bqyx972zymzhq3m89wnliqlx3" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "compat", @@ -112483,8 +112566,8 @@ "s", "spinner" ], - "commit": "aa8ac995e48b2e810ca11ddd04f68178a819fb5a", - "sha256": "1lw7djgz10n7mg5k32jfvrkabdmhddf2bfvdjp9wgfw65mpy1xly" + "commit": "8e1bc1167a64cc421ce3d1368a9c0e5da89bf687", + "sha256": "0wpxicq7yh99qx6vwvjgbwwghx1bqyx972zymzhq3m89wnliqlx3" } }, { @@ -113904,26 +113987,26 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20230410, - 1815 + 20231025, + 2311 ], "deps": [ "ivy" ], - "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479", - "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v" + "commit": "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d", + "sha256": "1iqj27pc2iivmwfh329v0d9g0z1y0whlnamrl7g2bi374h41m368" }, "stable": { "version": [ 0, 14, - 0 + 2 ], "deps": [ "ivy" ], - "commit": "d28225e86f8dfb3825809ad287f759f95ee9e479", - "sha256": "16j5k96wllfjgcb1bn0rfm7x67yhr3kh5601b8rydlk768zjpq5v" + "commit": "8c30f4cab5948aa8d942a3b2bbf5fb6a94d9441d", + "sha256": "1iqj27pc2iivmwfh329v0d9g0z1y0whlnamrl7g2bi374h41m368" } }, { @@ -114892,14 +114975,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20231018, - 1932 + 20231026, + 1454 ], "deps": [ "project" ], - "commit": "a971a63ae4bca93f2faa963d6a71eed413f0e37b", - "sha256": "00r7v97ndvs7szcv7yfym3qzi859kryjj2sr2yfkrzygp336v88l" + "commit": "3ff927ffc427d2debca56bc6ec2cbad37d85dd61", + "sha256": "1a11bbsckfn341xd0yw1jaalqn7w178fwxc2l8ag766bk878fmwr" } }, { @@ -116098,15 +116181,15 @@ "repo": "johannes-mueller/test-cockpit.el", "unstable": { "version": [ - 20231021, - 2149 + 20231027, + 1842 ], "deps": [ "projectile", "toml" ], - "commit": "98a15ab65d45e2053c587b2f2fde37d16fd45a21", - "sha256": "16296dhqbprsbvq7ld2c806qw6ivj7p14y5djpxj0li7m8wr7v5s" + "commit": "911e42d1b71e844b9821a4561154734adaa0f1e0", + "sha256": "1y1qdsm0rdjmxa4pgf1fhkim3ahkn70601l8d8snq5gdcfkx30s1" } }, { @@ -116527,6 +116610,30 @@ } }, { + "ename": "third-time", + "commit": "f73607e0ca3d2533a5c46daae76d1b4c49d2134e", + "sha256": "0fsfyfcmhr9m9nmc82lxbxiji3d80m9q4b6bp6nkyhavwqqznbm3", + "fetcher": "sourcehut", + "repo": "swflint/third-time", + "unstable": { + "version": [ + 20231023, + 316 + ], + "commit": "05bed0c25ce5def3db6b885ffcee74a705dc0dfb", + "sha256": "1jcbkbc31cshayvgq835sv89jhsbd9w0820872wccs09jkkzfrzf" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "commit": "d1e0e146c298de0114035b19c9c4f990db7f1ae5", + "sha256": "0l0d35rwrm2l8smywdy20fy7vvw50pxs08w0mfjqzsfxh5piy1wh" + } + }, + { "ename": "thread-dump", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", "sha256": "0dzr86jyf2j49gq40q6qd6lppa57n65n94xzpdjjbs182hxzavp2", @@ -116567,21 +116674,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20231014, - 28 + 20231021, + 1233 ], - "commit": "aed0ba17906360dd1ec566a6184ef02f96c919cd", - "sha256": "1ckp7alxng8r505zggqp82v3w4mlfpgixsl1v36gzgqlcb6hqzs9" + "commit": "72cc23eeb9d696a22c6054d4de0a75a9c18fe46b", + "sha256": "05a64c2wmvky5m1vb9072scix2a6q7na448hf96aj40q3qbkh0ga" }, "stable": { "version": [ 2023, 10, - 16, + 23, 0 ], - "commit": "aed0ba17906360dd1ec566a6184ef02f96c919cd", - "sha256": "1ckp7alxng8r505zggqp82v3w4mlfpgixsl1v36gzgqlcb6hqzs9" + "commit": "72cc23eeb9d696a22c6054d4de0a75a9c18fe46b", + "sha256": "05a64c2wmvky5m1vb9072scix2a6q7na448hf96aj40q3qbkh0ga" } }, { @@ -116957,11 +117064,11 @@ "repo": "aimebertrand/timu-caribbean-theme", "unstable": { "version": [ - 20230911, - 2112 + 20231022, + 1816 ], - "commit": "ab1c4d0df4f4a8fcb4eaa78dbf9d6f6f3e834462", - "sha256": "0kyqnsdgj4wdfc3qnkjnncs6jnbjza398krbmcsqlvqg1c23ilgd" + "commit": "5fc2cad6c91748afa98d1df2b65b3b5329d21b03", + "sha256": "0hsn3q36pdgg4w2nxmszsr7d3n0wkc291i1v04nakknhw8fx6b0m" }, "stable": { "version": [ @@ -117009,11 +117116,11 @@ "repo": "aimebertrand/timu-macos-theme", "unstable": { "version": [ - 20230911, - 2059 + 20231022, + 1832 ], - "commit": "bbd88a1460f184cc8701a361e0eeea34f71accaa", - "sha256": "0s25b24mbrbkfvybjzx4015z2sw159va8hyd530f7q5wny532yd9" + "commit": "f1ecdf8415e4cb3d35019af5b2ad0d6bea96e610", + "sha256": "0w1xh0i8q2d84f9d5gw61nn7a8xqyllm427qnnjsa5wjlhgvilfl" }, "stable": { "version": [ @@ -117055,11 +117162,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20231002, - 1522 + 20231010, + 2137 ], - "commit": "145ee85b9d65bbef32687681d65f72e227e52225", - "sha256": "1li13z0202qrjzipw9azy9yp028rrzyjkb9538cnf297caqdmqcl" + "commit": "fbe0aacc0d1010631ba8b2848b78e26514ce60c6", + "sha256": "0h8kkzgfz5hkynlynml0pgkq9j6fzzq33hl9ww8mq1gzzq6n62db" }, "stable": { "version": [ @@ -117236,6 +117343,21 @@ } }, { + "ename": "tmux-mode", + "commit": "382cb915901971ff5e9b32156cbeb5639c3bf20f", + "sha256": "0k6hdhyc5w2axmik49dp5hfk1c5hprdyam02v4cm4nhdwbv1ma01", + "fetcher": "github", + "repo": "nverno/tmux-mode", + "unstable": { + "version": [ + 20231026, + 2118 + ], + "commit": "632fc7981ceaea19ab2af0e47acae926354ab453", + "sha256": "1j4gr3wmh6wrr6lj9bjx7gg34qqywb54309vq28x6y4k9ng966zb" + } + }, + { "ename": "tmux-pane", "commit": "8bc165e115a2c457e44ac2762cf6a9f07f1b99c4", "sha256": "0mv5y367i1wmk5kp8ms09xhrwvb4cwa08p39qy6mkakdhiby5m9q", @@ -117928,14 +118050,15 @@ "repo": "magit/transient", "unstable": { "version": [ - 20231019, - 1421 + 20231027, + 2121 ], "deps": [ - "compat" + "compat", + "seq" ], - "commit": "a81eff942bb2cd5bb5b6450dcf7db78c876abd1f", - "sha256": "05y7qppq0ldmsmy61vc9zfnqgsijjsjv9q3gi2dsx37rm3jy9r7g" + "commit": "a8829875b25c0dc8cbd7163b6617c436365897b5", + "sha256": "0adk7fmz2ina9wkq8qbjc5jd677khy4f0mbzj4qfa7wsrwnxh69s" }, "stable": { "version": [ @@ -118498,8 +118621,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20231016, - 2107 + 20231024, + 1919 ], "deps": [ "ace-window", @@ -118511,8 +118634,8 @@ "pfuture", "s" ], - "commit": "474febd6c3f2d5059ed26c13277b9a3a8a5a8a82", - "sha256": "0kzaf06aszv1gcmaszv31kxj1sz20x0ilkzgpi3sxqavcb03mad9" + "commit": "95c07470b281a1eaa3ce88290748bcb2045a163a", + "sha256": "01d3kw4hl0vkqfw08nb9ldbhsd6s7shrmaxgjiahwxfkr63gvdjn" }, "stable": { "version": [ @@ -119092,11 +119215,14 @@ "repo": "ehawkvu/tsort.el", "unstable": { "version": [ - 20231015, - 2136 + 20231027, + 334 ], - "commit": "844a983841798a5e9de4a442674d691fea6d09ff", - "sha256": "06kz39dflgzpx4afb3qwgx2gyahahhwqsdabxip99wfllhsqwa32" + "deps": [ + "compat" + ], + "commit": "3f9cffdbd4ac83a6a69dd4ccbb135e95950494ad", + "sha256": "0zssgrkzsn3q2g8ayhs31c408yhsggmyrzfscklvvdhmgg5qcabj" } }, { @@ -120457,26 +120583,26 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20230923, - 31 + 20231023, + 219 ], "deps": [ "magit-section" ], - "commit": "0cec1fa196df55cfb13c1e2ee226b55ff740e7f2", - "sha256": "04fvzla00lbbz94ihi9vn5cwxpj4ivfcxifjr19h8nycm7h2xs8n" + "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", + "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" }, "stable": { "version": [ 1, 4, - 0 + 1 ], "deps": [ "magit-section" ], - "commit": "0cec1fa196df55cfb13c1e2ee226b55ff740e7f2", - "sha256": "04fvzla00lbbz94ihi9vn5cwxpj4ivfcxifjr19h8nycm7h2xs8n" + "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", + "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" } }, { @@ -120487,30 +120613,30 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20231002, - 22 + 20231023, + 219 ], "deps": [ "bibtex-completion", "elfeed", "universal-sidecar" ], - "commit": "8e9b4ce2faf304aedc485e7bedb6f0e460d9ea09", - "sha256": "1f2km4v4pvjmlr4fp5q51x0ycq0na8b6yd3las50slrf01wd3f48" + "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", + "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" }, "stable": { "version": [ 1, 4, - 0 + 1 ], "deps": [ "bibtex-completion", "elfeed", "universal-sidecar" ], - "commit": "0cec1fa196df55cfb13c1e2ee226b55ff740e7f2", - "sha256": "04fvzla00lbbz94ihi9vn5cwxpj4ivfcxifjr19h8nycm7h2xs8n" + "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", + "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" } }, { @@ -120521,31 +120647,30 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20230925, - 9 + 20231023, + 219 ], "deps": [ "elfeed", "elfeed-score", "universal-sidecar" ], - "commit": "dfcd0cd9d8f1e7fc3d8d4d1ed1da32d657acb088", - "sha256": "1mjkdzczkzpplfa23kwyk8iy57khzpxbclfbgyijf9i8i1cpnc53" + "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", + "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" }, "stable": { "version": [ 1, 4, - 0 + 1 ], "deps": [ - "bibtex-completion", "elfeed", "elfeed-score", "universal-sidecar" ], - "commit": "0cec1fa196df55cfb13c1e2ee226b55ff740e7f2", - "sha256": "04fvzla00lbbz94ihi9vn5cwxpj4ivfcxifjr19h8nycm7h2xs8n" + "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", + "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" } }, { @@ -120556,28 +120681,28 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20231008, - 1742 + 20231023, + 219 ], "deps": [ "org-roam", "universal-sidecar" ], - "commit": "d8311910fae3ea65fb4153e3872ec24b64d5d8aa", - "sha256": "0ckm8a0ihj4ds3w6ls8yzq5z6qy24ck3gdyd3ii3zz5rh01galf8" + "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", + "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" }, "stable": { "version": [ 1, 4, - 0 + 1 ], "deps": [ "org-roam", "universal-sidecar" ], - "commit": "0cec1fa196df55cfb13c1e2ee226b55ff740e7f2", - "sha256": "04fvzla00lbbz94ihi9vn5cwxpj4ivfcxifjr19h8nycm7h2xs8n" + "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", + "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" } }, { @@ -122433,11 +122558,11 @@ "repo": "nverno/vimscript-ts-mode", "unstable": { "version": [ - 20231020, - 1008 + 20231022, + 1758 ], - "commit": "84c061f4f80f0768fbe2a8e4b7fb337da83bd150", - "sha256": "1w648mk17ysvcx70nawdp83df15q52qwq9nk5hyamn00ldw6wl0s" + "commit": "20aea980ef94d643100638f2528aafc4b136e20c", + "sha256": "141mhzqv0fchcp6r6r3w8nismxa6a455d4z0ap6hcla2mxvszrwh" } }, { @@ -122788,11 +122913,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20231020, - 542 + 20231028, + 356 ], - "commit": "2ec99feff875e0e8a850cb423c798da0315f1bd1", - "sha256": "0a03xg4dg07wxmdxsq2173zn27zs63h5gvfqx9f4cysxxkzc4277" + "commit": "1f6f0afecc4576cc1cee573f82efe465042507f3", + "sha256": "0yv1gs6prj4qkwav6yjfxrck8y29pbsnidfhnap2vx2rfb94q1k8" }, "stable": { "version": [ @@ -122811,11 +122936,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20231020, - 542 + 20231028, + 356 ], - "commit": "6d64f04575d9629ecf240f73fd8e051cae7f0127", - "sha256": "1knkajh1zlhvc1q3ljcjp5ib1p6dx9f7crvvdx75yi2gii6q09ah" + "commit": "174e1dffc26998d8bc074f1f78068a8e612d4be3", + "sha256": "01h55rw65wk630l868lm3s1zkggksmvf1c0ywhnz0l4a570f859h" }, "stable": { "version": [ @@ -123146,11 +123271,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20231003, - 113 + 20231023, + 653 ], - "commit": "3aa5d009f57a4d416127080938c846f4234d3619", - "sha256": "1c4i7ghap5qrgh1qc1szg374vwjqpla7zhi5dyrjn4yqz68vfv3m" + "commit": "55baf2bcb1a583d3baae1d37ad0e17b0480ffd02", + "sha256": "1vqr7bmairp70lrx9gm80w7qr2jxiijg5w1na36k7if4wikfg4kl" } }, { @@ -123711,11 +123836,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20230911, - 1817 + 20231025, + 1927 ], - "commit": "44c6bfa3626f476750ed3c1c0d253607c1606716", - "sha256": "14gmmsrqdhhvn7m9467phm4dr4c0jr7lfqpdmxj0rs85p2fsspmd" + "commit": "848fce94de202541cd3fcd35e9c9d22783e9e828", + "sha256": "1yypnb36hr04sgwn486j18a2z5i3i5fbwnjdw6yn2v59mbgqfdfz" }, "stable": { "version": [ @@ -124719,11 +124844,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231015, - 30 + 20231024, + 2323 ], - "commit": "14f29cfa8d185b544a481012e3bc33cbe5338dd4", - "sha256": "1z4rj4bryfs8x0wyg0bk27pxykaszkrlhjs7cgg99s9ihs963zqf" + "commit": "83e902cfd9526cdefc973ce9b3f3d7415beb59f5", + "sha256": "1yjfywf8spi23zdcdj412msgyannwinvfgdarwbmiwpj9h8ll6qh" }, "stable": { "version": [ @@ -124742,11 +124867,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231015, - 30 + 20231024, + 2311 ], - "commit": "14f29cfa8d185b544a481012e3bc33cbe5338dd4", - "sha256": "1z4rj4bryfs8x0wyg0bk27pxykaszkrlhjs7cgg99s9ihs963zqf" + "commit": "cd887cf61f73a4cf044bd01cec60be7324660f9b", + "sha256": "15ngcigdx6yayg93kiiraqq2rng0zx54kbni5cgh0gnf673yqzwy" }, "stable": { "version": [ @@ -127034,14 +127159,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20200604, - 246 + 20230914, + 1400 ], "deps": [ "cl-lib" ], - "commit": "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6", - "sha256": "1cp1sgmfc8pgcy24l77aam833710mjp2y3m8l8c90677wxqr44vl" + "commit": "52a1c5031912243c791c55e0fe345d04f219b507", + "sha256": "0gmkhv8slzshgn9bcamp49szf24nflqcfn8c1f9iff36vviyibgf" }, "stable": { "version": [ @@ -127064,14 +127189,14 @@ "repo": "elken/yasnippet-capf", "unstable": { "version": [ - 20230813, - 1906 + 20231024, + 1604 ], "deps": [ "yasnippet" ], - "commit": "40654214db7a44db3a99321447632b43a10fae57", - "sha256": "1kywl7jblrmixr0vwycpil5hyk4p5qlc3gxg9w25xga4jj91r663" + "commit": "a0a6b1c2bb6decdad5cf9b74202f0042f494a6ab", + "sha256": "0fzkdl32cblv8rc25d76hq90m40kbkkswz6m8f4fx2m8rw2ysfr8" } }, { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/make-emacs.nix index d3aabb739ec81..d3aabb739ec81 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 318e633d6ebbc..37bab4923bfc3 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -67,7 +67,7 @@ let }; in { - emacs28 = import ./generic.nix (mkArgs { + emacs28 = import ./make-emacs.nix (mkArgs { pname = "emacs"; version = "28.2"; variant = "mainline"; @@ -75,7 +75,7 @@ in hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag="; }); - emacs29 = import ./generic.nix (mkArgs { + emacs29 = import ./make-emacs.nix (mkArgs { pname = "emacs"; version = "29.1"; variant = "mainline"; @@ -83,7 +83,7 @@ in hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg="; }); - emacs28-macport = import ./generic.nix (mkArgs { + emacs28-macport = import ./make-emacs.nix (mkArgs { pname = "emacs-mac"; version = "28.2"; variant = "macport"; @@ -91,7 +91,7 @@ in hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; }); - emacs29-macport = import ./generic.nix (mkArgs { + emacs29-macport = import ./make-emacs.nix (mkArgs { pname = "emacs-mac"; version = "29.1"; variant = "macport"; diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index c2b3229d4523e..1c5d1f15ecb80 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { }; src = [ ftesrc ftecommon ]; + env.NIX_CFLAGS_COMPILE = "-DHAVE_STRLCAT -DHAVE_STRLCPY"; + buildFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" "INSTALL_NONROOT=1" ]; diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index f783dfea81c23..e8cb1a572f70c 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ne"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "vigna"; repo = pname; rev = version; - sha256 = "sha256-mRMACfWcUW6/R43riRGNce4Ac5IRo4YEML8H0oGSH5o="; + sha256 = "sha256-lbXb/ZY0+vkOB8mXkHDaehXZMzrpx3A0jWnLpCjhMDE="; }; postPatch = '' diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 1c57658026c47..c2085bcf0455d 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-1ci1g+qBDsw9IkqjI3tRvMsLBvnPU+nn7heYuid/e5M="; + sha256 = "sha256-m8+kM9uz3gJ3kvpgZdoonSvYlh/f1WiGZlB8JKMTXh4="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 640a00eaaa2c7..8da51bd97a62d 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -20,13 +20,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "60"; + version = "61"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-SfMqGQKJtPTMSv4B70jOvTAIzNQc0AC16mum4fuNch4="; + hash = "sha256-7qkQelB0Y+DBihhaYVVQjK66pk8p2Sjhno87bW554SY="; }; format = "other"; diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 59c79721a6ef5..16598d02485c3 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.173.4", + "version": "3.178.4", "deb": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.173.4/standard-notes-3.173.4-linux-amd64.deb", - "hash": "sha512-8GDzj7Xm61rF5xybLE74D4yMbT2HgEG0ez1gQio/qWtWSqY72+GSKWlCA+3wz8Mz2jThRDlka9s2fHBBUvG+fg==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.178.4/standard-notes-3.178.4-linux-amd64.deb", + "hash": "sha512-6er/a9PqhKU4aagAxsbVdoXbRBNUr3Fa8BPWfuQ74Q4ai+iYlPjd4q50cTJQ4wJ5ucGyopgBEJq4/xYNunw6Ig==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.173.4/standard-notes-3.173.4-linux-arm64.deb", - "hash": "sha512-yJ8yZK+RkPUzkjbscCXT5yv9BxeHGQsZsCrKwOJRdd/XbcVPnKWQm00JVZmMuz17d8rhm8Km/EW81JufZByM0Q==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.178.4/standard-notes-3.178.4-linux-arm64.deb", + "hash": "sha512-lvvXCK3XOIH9HS1EU5eVBo4W8VoE4iM1Ve1XkZ/CysYBYLaXojXyybeN5Iw1Rmuk3trq/7RebjkNx/rxhsU0LQ==" } } } diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index 153bc248f6434..47a7445bd7f19 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "An extensible text editor based on Scintilla with Lua scripting."; homepage = "http://foicica.com/textadept"; license = licenses.mit; - maintainers = with maintainers; [ raskin mirrexagon patricksjackson ]; + maintainers = with maintainers; [ raskin mirrexagon arcuru ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f162864e9135b..d4557313c9d9e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -532,8 +532,8 @@ let mktplcRef = { name = "emojisense"; publisher = "bierner"; - version = "0.9.1"; - sha256 = "sha256-bfhImi2qMHWkgKqkoStS0NtbXTfj6GpcLkI0PSMjuvg="; + version = "0.10.0"; + sha256 = "sha256-PD8edYuJu6QHPYIM08kV85LuKh0H0/MIgFmMxSJFK5M="; }; meta = { license = lib.licenses.mit; @@ -3298,8 +3298,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "107.4.3"; - sha256 = "sha256-z1foIJXVKmJ0G4FfO9xsjiQgmq/ZtoB3b6Ch8Nyj1zY="; + version = "107.12.0"; + sha256 = "036ri011fd0cf91iwv59j57m05mxliy27ms4di2y9jlk7jzmr4s2"; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -3478,6 +3478,22 @@ let }; }; + tsandall.opa = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "opa"; + publisher = "tsandall"; + version = "0.12.2"; + sha256 = "sha256-/eJzDhnQyvC9OBr4M03wLIWPiBeVtvX7ztSnO+YoCZM="; + }; + meta = { + changelog = "https://github.com/open-policy-agent/vscode-opa/blob/master/CHANGELOG.md"; + description = "An extension for VS Code which provides support for OPA"; + homepage = "https://github.com/open-policy-agent/vscode-opa"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.msanft ]; + }; + }; + tuttieee.emacs-mcx = buildVscodeMarketplaceExtension { mktplcRef = { name = "emacs-mcx"; @@ -3521,8 +3537,8 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.19"; - sha256 = "sha256-Tww1urq6CfLma254Sn5lwOYwbvxAeDZuBuFBQlzks1c="; + version = "0.0.21"; + sha256 = "sha256-u57U/MmxvionFZp/tLK/KpddaxA/SUffeggKBSzmsXo="; }; meta = { description = "VSCode language extension for Uiua"; diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix index 5d376955ea66d..359b2f26a5735 100644 --- a/pkgs/applications/emulators/cdemu/daemon.nix +++ b/pkgs/applications/emulators/cdemu/daemon.nix @@ -1,4 +1,4 @@ -{ callPackage, glib, libao, intltool, libmirage }: +{ callPackage, glib, libao, intltool, libmirage, coreutils }: let pkg = import ./base.nix { version = "3.2.5"; pname = "cdemu-daemon"; @@ -7,4 +7,12 @@ let pkg = import ./base.nix { in callPackage pkg { nativeBuildInputs = [ intltool ]; buildInputs = [ glib libao libmirage ]; + drvParams.postInstall = '' + mkdir -p $out/share/dbus-1/services + cp -R ../$pname-$version/service-example $out/share/cdemu + substitute \ + $out/share/cdemu/net.sf.cdemu.CDEmuDaemon.service \ + $out/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service \ + --replace /bin/true ${coreutils}/bin/true + ''; } diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 525682c603d25..e1805df07c2e0 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -164,16 +164,6 @@ in }; }; - beetle-snes = mkLibretroCore { - core = "mednafen-snes"; - src = getCoreSrc "beetle-snes"; - makefile = "Makefile"; - meta = { - description = "Port of Mednafen's SNES core to libretro"; - license = lib.licenses.gpl2Only; - }; - }; - beetle-supafaust = mkLibretroCore { core = "mednafen-supafaust"; src = getCoreSrc "beetle-supafaust"; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index f1099967fe789..78cb11c7d98dd 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -59,12 +59,6 @@ "rev": "cd395e9e3ee407608450ebc565e871b24e7ffed6", "hash": "sha256-EIZRv1EydfLWFoBb8TzvAY3kkL9Qr2OrwrljOnnM92A=" }, - "beetle-snes": { - "owner": "libretro", - "repo": "beetle-bsnes-libretro", - "rev": "d770563fc3c4bd9abb522952cefb4aa923ba0b91", - "hash": "sha256-zHPtfgp9hc8Q4gXJ5VgfJLWLeYjCsQhkfU1T5RM7AL0=" - }, "beetle-supafaust": { "owner": "libretro", "repo": "supafaust", diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index 5348092c52473..e9536d8318dca 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../ -i python3 -p "python3.withPackages (ps: with ps; [ requests nix-prefetch-github ])" -p "git" +#!nix-shell -I nixpkgs=../../../../ -i python3 -p "python3.withPackages (ps: with ps; [ nix-prefetch-github ])" -p "git" import json import os @@ -22,7 +22,6 @@ CORES = { "beetle-pcfx": {"repo": "beetle-pcfx-libretro"}, "beetle-psx": {"repo": "beetle-psx-libretro"}, "beetle-saturn": {"repo": "beetle-saturn-libretro"}, - "beetle-snes": {"repo": "beetle-bsnes-libretro"}, "beetle-supafaust": {"repo": "supafaust"}, "beetle-supergrafx": {"repo": "beetle-supergrafx-libretro"}, "beetle-vb": {"repo": "beetle-vb-libretro"}, diff --git a/pkgs/applications/file-managers/walk/default.nix b/pkgs/applications/file-managers/walk/default.nix index 2a15b12a9f30b..d6273cf07ed55 100644 --- a/pkgs/applications/file-managers/walk/default.nix +++ b/pkgs/applications/file-managers/walk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "walk"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "walk"; rev = "v${version}"; - hash = "sha256-Wo8i0nPAuzADLXlsEho9TSSbNh3d13iNsXXx5onPnIs="; + hash = "sha256-hif62WAyJyFHpJoP3ph7gJk1QkEL7qkcv/BJuoXkwFU="; }; - vendorHash = "sha256-AmgCyq+N+EMdpIUCe6Lzd8bDXHsbOzclsHPp+H5ROMc="; + vendorHash = "sha256-e292ke0JiFEopLSozb+FkpwzSuhpIs/PdWOYuNI2M2o="; meta = with lib; { description = "Terminal file manager"; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 92414531522e8..fdf571b026a35 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -4,7 +4,6 @@ , fetchYarnDeps , makeDesktopItem , copyDesktopItems -, desktopToDarwinBundle , fixup_yarn_lock , makeWrapper , nodejs @@ -14,28 +13,29 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "22.0.2"; + version = "22.0.3"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-L+tbNCokVoiS2KkaPVBjG7H/8cqz1e8dlXC5H8BkPvU="; + hash = "sha256-Im0T+1jm1IZT3UILsOJ4Rp5P5IiBUKcJJ+cqv3WsqXw="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-d8AquOKdrPQHBhRG9o1GB18LpwlwQK6ZaM1gLAcjilM="; + hash = "sha256-Abyu/WoNOPAIfRIThG7vKFECW9NQMgcBAkLgEPwdJDQ="; }; nativeBuildInputs = [ - copyDesktopItems fixup_yarn_lock makeWrapper nodejs yarn - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optionals (!stdenv.isDarwin) [ + copyDesktopItems + ]; ELECTRON_SKIP_BINARY_DOWNLOAD = true; @@ -54,9 +54,15 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild + '' + lib.optionalString stdenv.isDarwin '' + cp -R ${electron}/Applications/Electron.app Electron.app + chmod -R u+w Electron.app + export CSC_IDENTITY_AUTO_DISCOVERY=false + sed -i "/afterSign/d" electron-builder-linux-mac.json + '' + '' yarn --offline run electron-builder --dir \ --config electron-builder-linux-mac.json \ - -c.electronDist=${electron}/libexec/electron \ + -c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \ -c.electronVersion=${electron.version} runHook postBuild @@ -65,6 +71,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + mv dist/mac*/draw.io.app $out/Applications + + # Symlinking `draw.io` doesn't work; seems to look for files in the wrong place. + makeWrapper $out/Applications/draw.io.app/Contents/MacOS/draw.io $out/bin/drawio + '' + lib.optionalString (!stdenv.isDarwin) '' mkdir -p "$out/share/lib/drawio" cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/drawio" @@ -74,6 +87,7 @@ stdenv.mkDerivation rec { --add-flags "$out/share/lib/drawio/resources/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --inherit-argv0 + '' + '' runHook postInstall ''; @@ -98,6 +112,5 @@ stdenv.mkDerivation rec { changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; maintainers = with maintainers; [ qyliss darkonion0 ]; platforms = platforms.darwin ++ platforms.linux; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/graphics/figma-linux/default.nix b/pkgs/applications/graphics/figma-linux/default.nix index 64af09ada8b25..0ee58e009c262 100644 --- a/pkgs/applications/graphics/figma-linux/default.nix +++ b/pkgs/applications/graphics/figma-linux/default.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" ]; license = licenses.gpl2; maintainers = with maintainers; [ ercao kashw2 ]; + knownVulnerabilities = [ "CVE-2023-5217" ]; }; }) diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix index b6c0472140441..45c1e6f541635 100644 --- a/pkgs/applications/graphics/hello-wayland/default.nix +++ b/pkgs/applications/graphics/hello-wayland/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "hello-wayland"; - version = "unstable-2023-04-23"; + version = "unstable-2023-10-26"; src = fetchFromGitHub { owner = "emersion"; repo = "hello-wayland"; - rev = "77e270c19672f3ad863e466093f429cde8eb1f16"; - sha256 = "NMQE2zU858b6OZhdS2oZnGvLK+eb7yU0nFaMAcpNw04="; + rev = "b631afa4f6fd86560ccbdb8c7b6fe42851c06a57"; + sha256 = "MaBzGZ05uCoeeiglFYHC40hQlPvtDw5sQhqXgtVDySc="; }; separateDebugInfo = true; diff --git a/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch b/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch deleted file mode 100644 index e7200814eb059..0000000000000 --- a/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py -index 809338ef..9125928f 100644 ---- a/hydrus/core/HydrusConstants.py -+++ b/hydrus/core/HydrusConstants.py -@@ -59,12 +59,7 @@ elif PLATFORM_HAIKU: - RUNNING_FROM_SOURCE = sys.argv[0].endswith( '.py' ) or sys.argv[0].endswith( '.pyw' ) - RUNNING_FROM_MACOS_APP = os.path.exists( os.path.join( BASE_DIR, 'running_from_app' ) ) - --if RUNNING_FROM_SOURCE: -- NICE_RUNNING_AS_STRING = 'from source' --elif RUNNING_FROM_FROZEN_BUILD: -- NICE_RUNNING_AS_STRING = 'from frozen build' --elif RUNNING_FROM_MACOS_APP: -- NICE_RUNNING_AS_STRING = 'from App' -+NICE_RUNNING_AS_STRING = "from nixpkgs (source)" - - BIN_DIR = os.path.join( BASE_DIR, 'bin' ) - HELP_DIR = os.path.join( BASE_DIR, 'help' ) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 968f60ba80965..91f38633e6ddf 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,21 +12,16 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "544"; + version = "549"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-e3VvkdJAQx5heKDJ1Ms6XpXrXWdzv48f8yu0DHfPy1A="; + hash = "sha256-y3WFQhPE8H0198Xu3Dn9YAqaX8YvFJcdt90tebTg7qw="; }; - patches = [ - # Nixpkgs specific, can be removed if upstream makes a more reasonable check - ./0001-inform-nixpkgs.patch - ]; - nativeBuildInputs = [ wrapQtAppsHook python3Packages.mkdocs-material @@ -75,31 +70,35 @@ python3Packages.buildPythonPackage rec { # most tests are failing, presumably because we are not using test.py checkPhase = '' + runHook preCheck + nosetests $src/hydrus/test \ - -e TestClientAPI \ - -e TestClientConstants \ - -e TestClientDaemons \ - -e TestClientData \ - -e TestClientDB \ - -e TestClientDBDuplicates \ - -e TestClientDBTags \ - -e TestClientImageHandling \ - -e TestClientImportOptions \ - -e TestClientListBoxes \ - -e TestClientMigration \ - -e TestClientNetworking \ - -e TestClientTags \ - -e TestClientThreading \ - -e TestDialogs \ - -e TestFunctions \ - -e TestHydrusNetwork \ - -e TestHydrusNATPunch \ - -e TestHydrusSerialisable \ - -e TestHydrusServer \ - -e TestHydrusSessions \ - -e TestServer \ - -e TestClientMetadataMigration \ - -e TestClientFileStorage \ + -e TestClientAPI \ + -e TestClientConstants \ + -e TestClientDaemons \ + -e TestClientData \ + -e TestClientDB \ + -e TestClientDBDuplicates \ + -e TestClientDBTags \ + -e TestClientImageHandling \ + -e TestClientImportOptions \ + -e TestClientListBoxes \ + -e TestClientMigration \ + -e TestClientNetworking \ + -e TestClientTags \ + -e TestClientThreading \ + -e TestDialogs \ + -e TestFunctions \ + -e TestHydrusNetwork \ + -e TestHydrusNATPunch \ + -e TestHydrusSerialisable \ + -e TestHydrusServer \ + -e TestHydrusSessions \ + -e TestServer \ + -e TestClientMetadataMigration \ + -e TestClientFileStorage \ + + runHook postCheck ''; outputs = [ "out" "doc" ]; @@ -112,7 +111,8 @@ python3Packages.buildPythonPackage rec { chmod -x $out/${python3Packages.python.sitePackages}/static/*.{png,svg,ico} # Build docs mkdocs build -d help - mv help $out/doc/ + mkdir -p $doc/share/doc + mv help $doc/share/doc/hydrus # install the hydrus binaries mkdir -p $out/bin diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 3cb4b001124f2..b693626fae644 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libpng, zlib, nasm }: stdenv.mkDerivation rec { - version = "4.1.4"; + version = "4.1.5"; pname = "mozjpeg"; src = fetchFromGitHub { owner = "mozilla"; repo = "mozjpeg"; rev = "v${version}"; - sha256 = "sha256-F9W7tWfcNP2UNuwMbYiSvS8BnFq4ob//b8AXXrRjVuA="; + sha256 = "sha256-k8qWtU4j3ipIHvY60ae7kdNnPvWnUa0qgacqlSIJijo="; }; cmakeFlags = [ "-DENABLE_STATIC=NO" "-DPNG_SUPPORTED=TRUE" ]; # See https://github.com/mozilla/mozjpeg/issues/351 diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 8d376730a90bd..cb7e1310a0663 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = finalAttrs.version; - hash = "sha256-dD0pHqw1Gxp+yxzYdm2ZgxiHKyuJKBGYpjv99B1Da1g="; + hash = "sha256-UZVpyrUFf/uJNs2GHLYXpb81e7yzC8EFuoD+0Bzj6xQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix index e428d02d9dcdc..ccf21d630e649 100644 --- a/pkgs/applications/graphics/pizarra/default.nix +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "pizarra"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitLab { owner = "categulario"; repo = "pizarra-gtk"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-fWwAmzF3ppCvJZ0K4EDrmP8SVPVRayEQTtbhNscZIF0="; + sha256 = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw="; }; - cargoSha256 = "sha256-pxRJXUeFGdVj6iCFZ4Y8b9z5hw83g8YywpKztTZ0g+4="; + cargoHash = "sha256-btvMUKADGHlXLmeKF1K9Js44SljZ0MejGId8aDwPhVU="; nativeBuildInputs = [ wrapGAppsHook pkg-config gdk-pixbuf ]; diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index ec37b9b429f0f..a892a0263a1e2 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.8.6"; + version = "2.9.1"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-w5rjLqdlPOZWgdc2t0Y3tl24qZqpjBV6I9gruLaI+qc="; + hash = "sha256-x7tNGWXrg4hkr4d5QK4Z/cOmGGdbWLJ/GIASZjmiL4w="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index a4f0b957c9918..89ff023f86fe6 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,22 +2,22 @@ let inherit (stdenv.hostPlatform) system; - fetch = srcPlatform: sha256: extension: + fetch = srcPlatform: hash: extension: let args = { url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_${srcPlatform}_v${version}.${extension}"; - inherit sha256; + inherit hash; } // lib.optionalAttrs (extension == "zip") { stripRoot = false; }; in if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.21.0"; + version = "2.22.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-pXGBlduNOvxpPMd/BObHVXXGQ0ZTlIkqZ3jYyoGXnqA=" "zip"; - i686-linux = fetch "linux_386" "sha256-iePA4nzwBtAlYWybmQdV7Zvvnv+jPqrndB4aabf/JMM=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-wevv0KYe01ZL70zL4BNti/oCcAzNJ3EO97QIU1BYQRE=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-AViR53q1/jZtzpFZ7FaBwoZAGuXsGHfULEIuIrTqgSs=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-MWNbwCJ5ltAV1qmy8LPYkb6VTH0UVi2S5QEZZfpcnGM=" "zip"; + i686-linux = fetch "linux_386" "sha256-lqwEm7fCiM2WNZvlAt/HeqI2zxnal/OMbTMGvvmXkvY=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-GfQ441a5mIgCTtxnk6L9UXodNGXek7f/jxJXWYJUb+0=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-yF0dy4MUgvSJUremXFfxCIHcGmYrCcjofcv1sBD9qyI=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 918605366fe7d..1f37a8e942104 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-pdf"; - version = "0.5"; + version = "0.5.1"; src = fetchFromGitHub { owner = "vslavik"; repo = "diff-pdf"; rev = "v${version}"; - sha256 = "sha256-Si8v5ZY1Q/AwQTaxa1bYG8bgqxWj++c4Hh1LzXSmSwE="; + sha256 = "sha256-jt11wssl8cH2cH3NXF+iWHxVNxPJm0I8toignBHq3q0="; }; nativeBuildInputs = [ autoconf automake pkg-config ]; diff --git a/pkgs/applications/misc/faircamp/Cargo.lock b/pkgs/applications/misc/faircamp/Cargo.lock index 6c5d689d3758c..b8dba83ebfbe9 100644 --- a/pkgs/applications/misc/faircamp/Cargo.lock +++ b/pkgs/applications/misc/faircamp/Cargo.lock @@ -4,19 +4,19 @@ version = 3 [[package]] name = "actix-codec" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" +checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-sink", - "log", "memchr", "pin-project-lite", "tokio", "tokio-util", + "tracing", ] [[package]] @@ -30,7 +30,7 @@ dependencies = [ "actix-utils", "actix-web", "askama_escape", - "bitflags", + "bitflags 1.3.2", "bytes", "derive_more", "futures-core", @@ -44,17 +44,17 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74" +checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", - "ahash 0.8.3", + "ahash", "base64", - "bitflags", + "bitflags 2.2.1", "brotli", "bytes", "bytestring", @@ -127,7 +127,7 @@ dependencies = [ "futures-util", "mio", "num_cpus", - "socket2", + "socket2 0.4.9", "tokio", "tracing", ] @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96" +checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9" dependencies = [ "actix-codec", "actix-http", @@ -168,7 +168,7 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", - "ahash 0.7.6", + "ahash", "bytes", "bytestring", "cfg-if", @@ -177,7 +177,6 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "http", "itoa", "language-tags", "log", @@ -189,8 +188,8 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2", - "time 0.3.20", + "socket2 0.5.3", + "time 0.3.21", "url", ] @@ -207,6 +206,15 @@ dependencies = [ ] [[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -214,25 +222,13 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.7.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", ] [[package]] @@ -249,9 +245,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -272,6 +268,12 @@ dependencies = [ ] [[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" @@ -282,55 +284,63 @@ dependencies = [ [[package]] name = "anstream" -version = "0.2.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", - "is-terminal", + "colorchoice", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ "utf8parse", ] [[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] name = "anstyle-wincon" -version = "0.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "arbitrary-int" -version = "1.2.3" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2967dc82d90be9986876ba8ec7a7d89f5cc64930cc576a683089caae12134ee2" +checksum = "6a49f791c7c8885e8221d31bc3a34455b0fd869810d8ddff608dbe08a598f9d9" [[package]] name = "askama_escape" @@ -371,10 +381,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.7.1", + "object", + "rustc-demangle", +] + +[[package]] name = "base64" -version = "0.21.0" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "base64ct" @@ -392,12 +417,24 @@ dependencies = [ ] [[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813" + +[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -429,9 +466,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "bytemuck" @@ -504,70 +541,69 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "d87d9d13be47a5b7c3907137f1290b0459a7f80efb26be8c52afb11963bccb02" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.0", ] [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] name = "clap" -version = "4.2.1" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.31", ] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "claxon" @@ -577,22 +613,24 @@ checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" [[package]] name = "cmake" -version = "0.1.49" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" dependencies = [ "cc", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "color_quant" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "combine" @@ -605,21 +643,6 @@ dependencies = [ ] [[package]] -name = "concolor-override" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys", -] - -[[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -638,7 +661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.20", + "time 0.3.21", "version_check", ] @@ -654,15 +677,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -683,72 +706,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" [[package]] -name = "crossbeam-utils" -version = "0.8.15" +name = "crossbeam-channel" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", + "crossbeam-utils", ] [[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" +name = "crossbeam-deque" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "generic-array", - "typenum", + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", ] [[package]] -name = "cxx" -version = "1.0.92" +name = "crossbeam-epoch" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", ] [[package]] -name = "cxx-build" -version = "1.0.92" +name = "crossbeam-utils" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.109", + "cfg-if", ] [[package]] -name = "cxxbridge-flags" -version = "1.0.92" +name = "crunchy" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "cxxbridge-macro" -version = "1.0.92" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "generic-array", + "typenum", ] [[package]] @@ -782,24 +795,10 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" +name = "either" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encoding_rs" @@ -812,33 +811,28 @@ dependencies = [ [[package]] name = "enolib" -version = "0.1.0" -source = "git+https://codeberg.org/simonrepp/enolib-rs#fdb3d6fa2184d3a19f32246e71451881358a3de5" - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] +version = "0.2.1" +source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.2.1#16f94efb92203f5b8f92a67de6abb7fa0ef5869d" [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "exr" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4" dependencies = [ - "cc", - "libc", + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide 0.6.2", + "rayon-core", + "smallvec", + "zune-inflate", ] [[package]] name = "faircamp" -version = "0.1.0" +version = "0.8.0" dependencies = [ "actix-files", "actix-web", @@ -850,8 +844,8 @@ dependencies = [ "enolib", "hound", "id3", - "indoc 1.0.9", - "indoc 2.0.1", + "image", + "indoc", "iso_currency", "lewton", "libvips", @@ -874,6 +868,15 @@ dependencies = [ ] [[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] name = "fixed" version = "1.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -887,12 +890,25 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", +] + +[[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]] @@ -903,36 +919,36 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-core", "futures-task", @@ -942,39 +958,48 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", ] [[package]] -name = "getopts" -version = "0.2.21" +name = "getrandom" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ - "unicode-width", + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] -name = "getrandom" -version = "0.2.8" +name = "gif" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "color_quant", + "weezl", ] [[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] name = "h2" -version = "0.3.16" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -1042,12 +1067,6 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1063,6 +1082,15 @@ dependencies = [ ] [[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] name = "hound" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1099,92 +1127,90 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] name = "id3" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d7a833474b30425eb64132d1f9b727b4e39537418bcc3288497c8d2f5c8948" +checksum = "9389dd9c8c4671b1e4b2878a6329bccb573f9c24a75bc91c641c451ce5436501" dependencies = [ - "bitflags", + "bitflags 2.2.1", "byteorder", "flate2", ] [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", ] [[package]] -name = "indexmap" -version = "1.9.2" +name = "image" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ - "autocfg", - "hashbrown", + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", ] [[package]] -name = "indoc" -version = "1.0.9" +name = "indexmap" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] [[package]] name = "indoc" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" - -[[package]] -name = "io-lifetimes" -version = "1.0.7" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e86b86ae312accbf05ade23ce76b625e0e47a255712b7414037385a1c05380" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys", -] +checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" [[package]] -name = "is-terminal" -version = "0.4.4" +name = "inout" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys", + "generic-array", ] [[package]] @@ -1198,9 +1224,9 @@ dependencies = [ [[package]] name = "iso_currency" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cd86f5dc2dd0a46368e141f794bf2cc53d13a1e8cdce9e6ca0f8c94ef6e096" +checksum = "33f07181be95c82347a07cf4caf43d2acd8a7e8d08ef1db75e10ed5a9aec3c1b" dependencies = [ "iso_country", ] @@ -1224,7 +1250,7 @@ dependencies = [ "log", "thiserror", "walkdir", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1243,10 +1269,19 @@ dependencies = [ ] [[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" dependencies = [ "wasm-bindgen", ] @@ -1264,6 +1299,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] name = "lewton" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1276,9 +1317,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libvips" @@ -1291,21 +1332,6 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] name = "local-channel" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1358,6 +1384,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] name = "metaflac" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1370,9 +1405,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" @@ -1400,6 +1435,16 @@ dependencies = [ ] [[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] name = "mio" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1408,7 +1453,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1421,6 +1466,15 @@ dependencies = [ ] [[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] name = "ndk-context" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1458,6 +1512,17 @@ dependencies = [ ] [[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] name = "num-traits" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1472,7 +1537,7 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -1486,6 +1551,15 @@ dependencies = [ ] [[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] name = "ogg" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1510,12 +1584,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] name = "opus" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1564,7 +1632,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1598,15 +1666,35 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pin-project" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1616,9 +1704,22 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.1", +] [[package]] name = "ppv-lite86" @@ -1628,30 +1729,38 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "pulldown-cmark" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ - "bitflags", - "getopts", + "bitflags 1.3.2", "memchr", "unicase", ] [[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1688,9 +1797,31 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.5.1" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rayon" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f851a03551ceefd30132e447f07f96cb7011d6b658374f3aed847333adb5559" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] [[package]] name = "redox_syscall" @@ -1698,25 +1829,26 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] -name = "redox_users" -version = "0.4.3" +name = "regex" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ - "getrandom", - "redox_syscall", - "thiserror", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.7.1" +name = "regex-automata" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", @@ -1725,9 +1857,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rmp3" @@ -1740,6 +1872,12 @@ dependencies = [ ] [[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1749,20 +1887,6 @@ dependencies = [ ] [[package]] -name = "rustix" -version = "0.36.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] name = "ryu" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1779,9 +1903,9 @@ dependencies = [ [[package]] name = "sanitize-filename" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c" +checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603" dependencies = [ "lazy_static", "regex", @@ -1794,12 +1918,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] name = "semver" version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1807,26 +1925,29 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.31", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -1877,6 +1998,12 @@ dependencies = [ ] [[package]] +name = "simd-adler32" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" + +[[package]] name = "slab" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1911,10 +2038,20 @@ dependencies = [ ] [[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", +] + +[[package]] name = "spin" -version = "0.9.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -1950,9 +2087,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -1960,32 +2097,34 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", ] [[package]] @@ -2001,9 +2140,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa", "serde", @@ -2013,15 +2152,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -2043,11 +2182,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -2055,27 +2194,27 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.31", ] [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -2099,9 +2238,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] @@ -2123,9 +2262,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d502c968c6a838ead8e69b2ee18ec708802f99db92a0d156705ec9ef801993b" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -2143,16 +2282,10 @@ dependencies = [ ] [[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -2195,9 +2328,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2205,24 +2338,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2230,28 +2363,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" dependencies = [ "js-sys", "wasm-bindgen", @@ -2259,12 +2392,12 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579cc485bd5ce5bfa0d738e4921dd0b956eca9800be1fd2e5257ebe95bc4617e" +checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" dependencies = [ "core-foundation", - "dirs", + "home", "jni", "log", "ndk-context", @@ -2275,6 +2408,12 @@ dependencies = [ ] [[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2306,12 +2445,30 @@ 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.0", +] + +[[package]] name = "windows-sys" version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -2320,13 +2477,28 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -2336,46 +2508,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] name = "zip" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", "byteorder", @@ -2387,7 +2601,7 @@ dependencies = [ "hmac", "pbkdf2", "sha1", - "time 0.3.20", + "time 0.3.21", "zstd 0.11.2+zstd.1.5.2", ] @@ -2406,7 +2620,7 @@ version = "0.12.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" dependencies = [ - "zstd-safe 6.0.4+zstd.1.5.4", + "zstd-safe 6.0.5+zstd.1.5.4", ] [[package]] @@ -2421,9 +2635,9 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.4+zstd.1.5.4" +version = "6.0.5+zstd.1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7afb4b54b8910cf5447638cb54bf4e8a65cbedd783af98b98c62ffe91f185543" +checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" dependencies = [ "libc", "zstd-sys", @@ -2431,11 +2645,20 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", "pkg-config", ] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index df9d08dacc2ca..bbceb6833b9c1 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , rustPlatform -, fetchgit +, fetchFromGitea , makeWrapper , pkg-config , glib @@ -9,29 +9,32 @@ , vips , ffmpeg , callPackage -, unstableGitUpdater , darwin +, testers +, faircamp }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "unstable-2023-04-10"; + version = "0.8.0"; - # TODO when switching to a stable release, use fetchFromGitea and add a - # version test. Meanwhile, fetchgit is used to make unstableGitUpdater work. - src = fetchgit { - url = "https://codeberg.org/simonrepp/faircamp.git"; - rev = "21f775dc35a88c54015694f9757e81c97fa860ea"; - hash = "sha256-aMSMMIGfoiqtg8Dj8QiCbUE40OKQXMXt4hvlvbXQLls="; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "simonrepp"; + repo = "faircamp"; + rev = version; + hash = "sha256-Rz/wMlVNjaGhk26QMnS4+W3oA/RSdB6FuigC84L8eDg="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "enolib-0.1.0" = "sha256-0+T8RRQnqbIiIup/aDJgvxeV8sRV4YrlA9JVbQxMfF0="; + "enolib-0.2.1" = "sha256-ryB5Tk90BvsstdXgYw7F0BJymWWetAIijhVpLeVBOa8="; }; }; + buildFeatures = [ "libvips" ]; + nativeBuildInputs = [ makeWrapper pkg-config @@ -50,9 +53,10 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; - passthru.tests.wav = callPackage ./test-wav.nix { }; - - passthru.updateScript = unstableGitUpdater { }; + passthru.tests = { + wav = callPackage ./test-wav.nix { }; + version = testers.testVersion { package = faircamp; }; + }; meta = with lib; { description = "A self-hostable, statically generated bandcamp alternative"; diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index ff1630dc3504d..bb47e1a251adf 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.25.3"; + version = "1.26.0"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-raslLhVbeUL6Zoz5cw+fKtqdUvAkd7frAncd+q1AVxs="; + sha256 = "sha256-Y0d3TgSLrxA2kPWlHrNC8GlEcD7s4VZR2YZlderZ3gI="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/gimoji/default.nix b/pkgs/applications/misc/gimoji/default.nix index 24fd6cf2ea18c..63223755e01b7 100644 --- a/pkgs/applications/misc/gimoji/default.nix +++ b/pkgs/applications/misc/gimoji/default.nix @@ -26,6 +26,7 @@ rustPlatform.buildRustPackage rec { description = "Easily add emojis to your git commit messages"; homepage = "https://github.com/zeenix/gimoji"; license = licenses.mit; + mainProgram = "gimoji"; maintainers = with maintainers; [ a-kenji ]; }; } diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 99fc367835664..72acbe02bbaef 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.9"; + version = "13.10"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-vzbZN+0lDSmvZnQCuvNJCYHTYKqErFhW4RI5Mfbgr6o="; + hash = "sha256-84F4B2yQREPosH1bK74nOby3o/C0isKq4t2CJprsblU="; }; buildInputs = [ diff --git a/pkgs/applications/misc/hyprdim/default.nix b/pkgs/applications/misc/hyprdim/default.nix index f7cf680ad0d1b..c59277a154f92 100644 --- a/pkgs/applications/misc/hyprdim/default.nix +++ b/pkgs/applications/misc/hyprdim/default.nix @@ -2,38 +2,41 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "hyprdim"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "donovanglover"; - repo = pname; + repo = "hyprdim"; rev = version; - hash = "sha256-6HeVLgEJDPy4cWL5td3Xl7+a6WUFZWUFynvBzPhItcg="; + hash = "sha256-b2T/ueinKiheuK+siV29vJfEsEodq6qT2J3XxvoD/14="; }; - cargoHash = "sha256-qYX5o64X8PsFcTYuZ82lIShyUN69oTzQIHrQH4B7iIw="; + cargoHash = "sha256-Sf32vaqcxVdg6/kDidxBSr5XDWg3aNEBpEl31do2ZJ8="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installManPage man/hyprdim.1 + installManPage target/man/hyprdim.1 installShellCompletion --cmd hyprdim \ - --bash <(cat completions/hyprdim.bash) \ - --fish <(cat completions/hyprdim.fish) \ - --zsh <(cat completions/_hyprdim) + --bash <(cat target/completions/hyprdim.bash) \ + --fish <(cat target/completions/hyprdim.fish) \ + --zsh <(cat target/completions/_hyprdim) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Automatically dim windows in Hyprland when switching between them"; homepage = "https://github.com/donovanglover/hyprdim"; - license = licenses.mit; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ donovanglover ]; mainProgram = "hyprdim"; diff --git a/pkgs/applications/misc/jetbrains-toolbox/default.nix b/pkgs/applications/misc/jetbrains-toolbox/default.nix index 1a2304d340447..569492d296e86 100644 --- a/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -10,11 +10,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.0.4.17212"; + version = "2.0.5.17700"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-lnTYLZJBiM8nnUvMqtcp/i/VNek/9zlxYyZFa+hew5g="; + sha256 = "sha256-BO9W9miQUltsg1tCyTl9j5xRCJUCsO02hUKDCYt7hd8="; stripRoot = false; }; diff --git a/pkgs/applications/misc/k40-whisperer/default.nix b/pkgs/applications/misc/k40-whisperer/default.nix index 720536b18e517..a6059ae44f88f 100644 --- a/pkgs/applications/misc/k40-whisperer/default.nix +++ b/pkgs/applications/misc/k40-whisperer/default.nix @@ -23,12 +23,12 @@ let in stdenv.mkDerivation rec { pname = "k40-whisperer"; - version = "0.62"; + version = "0.67"; src = fetchzip { url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip"; stripRoot = true; - sha256 = "sha256-3O+lCpmsCCu61REuxhrV8Uy01AgEGq/1DlMhjo45URM="; + sha256 = "sha256-jyny5uNZ5eL4AV47uAgOhBe4Zqg8GK3e86Z9gZbC68s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index 49406fc0114b6..ef1baa1e853ca 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -88,7 +88,14 @@ stdenv.mkDerivation rec { runHook postCheck ''; - nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ]; + nativeBuildInputs = [ + asciidoctor + cmake + wrapQtAppsHook + qttools + pkg-config + ] + ++ lib.optional (!stdenv.isDarwin) wrapGAppsHook; dontWrapGApps = true; preFixup = '' diff --git a/pkgs/applications/misc/kickoff/default.nix b/pkgs/applications/misc/kickoff/default.nix index a17be0e092ec1..89e0356309eac 100644 --- a/pkgs/applications/misc/kickoff/default.nix +++ b/pkgs/applications/misc/kickoff/default.nix @@ -10,23 +10,23 @@ rustPlatform.buildRustPackage rec { pname = "kickoff"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "j0ru"; repo = pname; rev = "v${version}"; - hash = "sha256-AolJXFolMEwoK3AtC93naphZetytzRl1yI10SP9Rnzo="; + hash = "sha256-9QupKpB3T/6gdGSeLjRknjPdgOzbfzEeJreIamWwpSw="; }; - cargoHash = "sha256-Twg2C29OwXfCK/rYXnyjbhmCClnsFHz8le9h4AmzXfA="; + cargoHash = "sha256-a7FZpMtgTdqpLV/OfgN4W4GpTJlkfEtPO7F//FmVA/s="; libPath = lib.makeLibraryPath [ wayland libxkbcommon ]; - buildInputs = [ fontconfig ]; + buildInputs = [ fontconfig libxkbcommon ]; nativeBuildInputs = [ makeWrapper pkg-config ]; postInstall = '' diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index faa6c2180fc6f..fbdbe92ff6341 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "1.02.0"; + version = "1.03.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-URGAhd7u1DrGReQAwsX9LMj7Jq1GsILzP8fVFnA74O4="; + sha256 = "sha256-S2Pnueo3opP1k6XBBHGAyRJpkNuI1Hotz7ypXa/96eQ="; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/applications/misc/nwg-bar/default.nix index 0c30fac6a5ba0..41d32418b0873 100644 --- a/pkgs/applications/misc/nwg-bar/default.nix +++ b/pkgs/applications/misc/nwg-bar/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "nwg-bar"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/GkusNhHprXwGMNDruEEuFC2ULVIHBN5F00GNex/uq4="; + sha256 = "sha256-kqLQwqZ2RPSKNdw1yzKUfqSe8hQcJe/6/8UzTT/Gz/8="; }; patches = [ ./fix-paths.patch ]; @@ -24,7 +24,7 @@ buildGoModule rec { substituteInPlace tools.go --subst-var out ''; - vendorHash = "sha256-mqcXhnja8ed7vXIqOKBsNrcbrcaycTQXG1jqdc6zcyI="; + vendorHash = "sha256-vdDlPsjfHl7w1ufosLYquHAKOvkolNBr04bt+OQBlFE="; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/oversteer/default.nix b/pkgs/applications/misc/oversteer/default.nix index 87c49c2cf7aaf..67a9e27667138 100644 --- a/pkgs/applications/misc/oversteer/default.nix +++ b/pkgs/applications/misc/oversteer/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, gettext, python3, python3Packages -, meson, cmake, ninja, udev, appstream, appstream-glib, desktop-file-utils, gtk3 +, meson, ninja, udev, appstream, appstream-glib, desktop-file-utils, gtk3 , wrapGAppsHook, gobject-introspection, bash, }: let python = python3.withPackages (p: @@ -14,7 +14,7 @@ let pygobject3 ]); - version = "0.7.2"; + version = "0.8.0"; in stdenv.mkDerivation { inherit version; @@ -24,7 +24,7 @@ in stdenv.mkDerivation { owner = "berarma"; repo = "oversteer"; rev = version; - sha256 = "sha256-9MWRb0NXUbB8c+pH0mjUzsz849PmEjsZMhQr4wsmlKI="; + sha256 = "sha256-fkf6sa4yYbxGOehyLzuFj5nZiPK3B1D/VVvobhKB4Uo="; }; buildInputs = [ bash gtk3 ]; @@ -64,12 +64,13 @@ in stdenv.mkDerivation { --replace /bin/sh ${bash}/bin/sh ''; - patches = [ ./fix-install-dir.patch ]; + patches = [ ]; meta = with lib; { homepage = "https://github.com/berarma/oversteer"; + changelog = "https://github.com/berarma/oversteer/releases/tag/${version}"; description = "Steering Wheel Manager for Linux"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.srounce ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/oversteer/fix-install-dir.patch b/pkgs/applications/misc/oversteer/fix-install-dir.patch deleted file mode 100644 index 0d5fdec689820..0000000000000 --- a/pkgs/applications/misc/oversteer/fix-install-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 239acf9..6a06c83 100644 ---- a/meson.build -+++ b/meson.build -@@ -8,7 +8,7 @@ pymod = import('python') - prefix = get_option('prefix') - pkgdatadir = join_paths(prefix, get_option('datadir'), meson.project_name()) - py_installation = pymod.find_installation(get_option('python')) --py_path = py_installation.get_path('purelib') -+py_path = py_installation.get_install_dir() - - python3_required_modules = ['gi', 'pyudev', 'xdg', 'evdev', 'gettext', 'matplotlib', 'scipy', 'numpy'] - foreach p : python3_required_modules diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index f140f8271e0d1..ef77c5a56f7e9 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tNLy3HeHh8nBtmfJS5XhKX+KhIBnuUV2C8LwQl3mQLU="; + hash = "sha256-l//DeaIqUl6FdGFxM8yTKcTjVNvYMllorcoXoK33Iy4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index fb796eb95de3e..0c9907764f225 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -18,7 +18,6 @@ , glew , glib , gmp -, gtest , gtk3 , hicolor-icon-theme , ilmbase @@ -105,10 +104,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libX11 ] ++ lib.optionals withSystemd [ systemd - ] ++ finalAttrs.nativeCheckInputs; - - doCheck = true; - nativeCheckInputs = [ gtest ]; + ]; separateDebugInfo = true; @@ -118,11 +114,6 @@ stdenv.mkDerivation (finalAttrs: { # additionally need to set the path via the NLOPT environment variable. NLOPT = nlopt; - # Disable compiler warnings that clutter the build log. - # It seems to be a known issue for Eigen: - # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221 - env.NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; - # prusa-slicer uses dlopen on `libudev.so` at runtime NIX_LDFLAGS = lib.optionalString withSystemd "-ludev"; @@ -150,9 +141,6 @@ stdenv.mkDerivation (finalAttrs: { # Fix resources folder location on macOS substituteInPlace src/PrusaSlicer.cpp \ --replace "#ifdef __APPLE__" "#if 0" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - # Disable segfault tests - sed -i '/libslic3r/d' tests/CMakeLists.txt ''; patches = [ @@ -193,11 +181,23 @@ stdenv.mkDerivation (finalAttrs: { ) ''; + doCheck = true; + + checkPhase = '' + runHook preCheck + + ctest \ + --force-new-ctest-process \ + -E 'libslic3r_tests|sla_print_tests' + + runHook postCheck + ''; + meta = with lib; { description = "G-code generator for 3D printer"; homepage = "https://github.com/prusa3d/PrusaSlicer"; license = licenses.agpl3; - maintainers = with maintainers; [ moredread tweber ]; + maintainers = with maintainers; [ moredread tweber tmarkus ]; } // lib.optionalAttrs (stdenv.isDarwin) { mainProgram = "PrusaSlicer"; }; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 6f071521d9bfc..308c0949f134b 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,9 +1,23 @@ -{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, wxGTK31, prusa-slicer }: +{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, wxGTK31, prusa-slicer, libspnav }: let appname = "SuperSlicer"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; + patches = [ + # Fix compile error with boost 1.79. See https://github.com/supermerill/SuperSlicer/issues/2823 + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/81e3ca3b7c131e8345aede89e3bbcd700e1ad567/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch"; + # Excludes Linux-only patches + excludes = [ + "src/slic3r/GUI/FreeCADDialog.cpp" + "src/slic3r/GUI/Tab.cpp" + "src/slic3r/Utils/Http.cpp" + ]; + sha256 = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; + }) + ]; + versions = { stable = { version = "2.3.57.12"; @@ -11,26 +25,14 @@ let patches = null; }; latest = { - version = "2.4.58.3"; - sha256 = "sha256-pEZcBEvK4Mq8nytiXLJvta7Bk6qZRJfTNrYz7N/aUAE="; - patches = [ - # Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355 - (fetchpatch { - url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch"; - sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6"; - }) - # Fix compile error with boost 1.79. See https://github.com/supermerill/SuperSlicer/issues/2823 - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/81e3ca3b7c131e8345aede89e3bbcd700e1ad567/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch"; - # Excludes Linux-only patches - excludes = [ - "src/slic3r/GUI/FreeCADDialog.cpp" - "src/slic3r/GUI/Tab.cpp" - "src/slic3r/Utils/Http.cpp" - ]; - sha256 = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; - }) - ]; + version = "2.4.58.5"; + sha256 = "sha256-UywxEGedXaBUTKojEkbkuejI6SdPSkPxTJMwUDNW6W0="; + inherit patches; + }; + beta = { + version = "2.5.59.2"; + sha256 = "sha256-IgE+NWy2DUrPR2ROfK1F67e8B3eoM9yRVQ0GZTxJ42I="; + inherit patches; }; }; @@ -45,19 +47,23 @@ let fetchSubmodules = true; }; - # wxScintilla is not used on macOS + # - wxScintilla is not used on macOS + # - Partially applied upstream changes cause a bug when trying to link against a nonexistent libexpat prePatch = super.prePatch + '' substituteInPlace src/CMakeLists.txt \ - --replace "scintilla" "" + --replace "scintilla" "" \ + --replace "list(APPEND wxWidgets_LIBRARIES libexpat)" "list(APPEND wxWidgets_LIBRARIES EXPAT::EXPAT)" + + substituteInPlace src/libslic3r/CMakeLists.txt \ + --replace "libexpat" "EXPAT::EXPAT" ''; # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. postInstall = null; separateDebugInfo = true; - # See https://github.com/supermerill/SuperSlicer/issues/432 - cmakeFlags = super.cmakeFlags ++ [ - "-DSLIC3R_BUILD_TESTS=0" + buildInputs = super.buildInputs ++ [ + libspnav ]; desktopItems = [ @@ -76,7 +82,7 @@ let inherit description; homepage = "https://github.com/supermerill/SuperSlicer"; license = licenses.agpl3; - maintainers = with maintainers; [ cab404 moredread ]; + maintainers = with maintainers; [ cab404 moredread tmarkus ]; mainProgram = "superslicer"; }; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index b670bcabf6106..e644f44f59517 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-X6q8ePaADv1+n/WmCp4SOhVm9lnc14qGhLSCxtc/ONw="; + hash = "sha256-EDd8SChQ8Vh2uNSZq5mrWdsLNT0KC4IMA7e3BPk6p04="; }; - cargoHash = "sha256-lfWuOkKNNDQ0b6oncuCC3KOAgtQGvLptIbmdyY8vy6o="; + cargoHash = "sha256-H4Oyn2cLyj/RNkiMQMzbHjhs1AJIcmSkZOO83ETByWk="; nativeBuildInputs = [ installShellFiles @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { any terminal on the same machine. The queue will be continuously processed, even if you no longer have any active ssh sessions. ''; - changelog = "https://github.com/Nukesor/pueue/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Nukesor/pueue/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index a6ce353694963..ee7d7974fb64c 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.24.2"; + version = "2.25.2"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-jzEtXmlpt6foldLW57ZcpevX8CDc+c8iIynT5nOD9qY="; + hash = "sha256-llPxR4awKBBv0jiLr5MbE33D5KZx3LmBo5BDwZI8ZM0="; }; - vendorHash = "sha256-rMMTUT7HIgYvxGcqR02VmxOh1ihE6xuIboDsnuOo09g="; + vendorHash = "sha256-VktAO3yKCdm5yz/RRLeLv6zzyGrwuHC/i8WdJtqZoYc="; ldflags = [ "-s -w" diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 0d1b78ca918b7..21cec72c5f808 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-06qiJ3NZZSvDBH7r6K1qnz0q4ngB45wBoaG6eTFiRtk="; + sha256 = "sha256-5U9LWFaCwszvT1reu6NflPKQUrsQkP/NdSO4LBHWm2g="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-tcyLoXOrC+lrFVRzxWfWpvHpfA6tbEBXFj9mSeTLcbc="; + cargoHash = "sha256-S4+cS4m69nqDN2h0vwyO35fFFBEa0Rcxx0XDBfSNLp0="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index 67c9f83683b8e..ac188fcbc5f75 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_24, libsecret }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_25, libsecret }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "8.3.3"; + version = "8.6.0"; src = fetchurl { url = "https://electron-dl.todoist.com/linux/Todoist-linux-x86_64-${version}.AppImage"; - hash = "sha256-X928hCrYVOBTEZq1hmZWgWlabtOzQrLUuptF/SJcAto="; + hash = "sha256-LjztKgpPm4RN1Pn5gIiPg8UCO095kzTQ9BTEG5Rlv10="; }; appimageContents = appimageTools.extractType2 { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_24}/bin/electron $out/bin/todoist-electron \ + makeWrapper ${electron_25}/bin/electron $out/bin/todoist-electron \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 23e348aad010e..96f033744e6b2 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -21,11 +21,11 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.15.3"; + version = "5.15.4"; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "sha256-unAic6GTgvZFFJwPERh164vfDiFE0zLEUjgADR94w5w="; + sha256 = "sha256-5pEpYnJFHQKEfTve07ngFVDAOM9+kwrx6hc30gEwsko="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 66a9eedeff647..780be25a33b52 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-thpVcJ1HRhoOAli7829zM4fermEcS9FwzKX7ZjHGhZg="; + hash = "sha256-SJypezOTQr+TiG/rePXxgjrspeErqj6qw9TBen41e4Q="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-S7fahA+ykviQoWc7p0CcTGfouswxQNBn4HH+tbl0fbI="; + vendorHash = "sha256-i2lH6ajRmfJHsh7nzCjt7mi3issA4kSBdG42w67pOC4="; proxyVendor = true; # Exclude broken genji, hive & impala drivers (bad group) diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 79d386e349c05..88f3cd5540a02 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -2,11 +2,7 @@ builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texlive; })) { zettlr = { - version = "2.3.0"; - hash = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk="; - }; - zettlr-beta = { - version = "3.0.0-beta.7"; - hash = "sha256-zIZaINE27bcjbs8yCGQ3UKAwStFdvhHD3Q1F93LrG4U="; + version = "3.0.2"; + hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA="; }; } diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 60267331cc275..a241ee0dd7cff 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -151,10 +151,6 @@ def channel_name_to_attr_name(channel_name): """Maps a channel name to the corresponding main Nixpkgs attribute name.""" if channel_name == 'stable': return 'chromium' - if channel_name == 'beta': - return 'chromiumBeta' - if channel_name == 'dev': - return 'chromiumDev' if channel_name == 'ungoogled-chromium': return 'ungoogled-chromium' print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) @@ -206,6 +202,10 @@ with urlopen(RELEASES_URL) as resp: if channel_name in channels: continue + # We only look for channels that are listed in our version pin file. + if channel_name not in last_channels: + continue + # If we're back at the last release we used, we don't need to # keep going -- there's no new version available, and we can # just reuse the info from last time. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 29a15907cb36a..e6a7e3f6c7adf 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,30 +1,4 @@ { - beta = { - deps = { - gn = { - rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; - hash = "sha256-WCq+PNkWxWpssUOQyQbAZ5l6k+hg+qGMsoaMG0Ybj0o="; - url = "https://gn.googlesource.com/gn"; - version = "2023-08-01"; - }; - }; - hash = "sha256-spzY2u5Wk52BrKCk9aQOEp/gbppaGVLCQxXa+3JuajA="; - hash_deb_amd64 = "sha256-eTeEeNa4JuCW81+SUAyrKi3S0/TJNTAoTktWQ0JsgYc="; - version = "117.0.5938.22"; - }; - dev = { - deps = { - gn = { - rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; - hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M="; - url = "https://gn.googlesource.com/gn"; - version = "2023-08-10"; - }; - }; - hash = "sha256-W0fZuvv9jz03ibQqB6MG45aw2zPklfxoFzZzr+kRuJk="; - hash_deb_amd64 = "sha256-XWxRFLFxBqnvKcoB5HErwVbtHCGYRteLeTv44zVMwIc="; - version = "118.0.5966.0"; - }; stable = { chromedriver = { hash_darwin = "sha256-ugsxRhIPtDD7Y4/PsIc8Apqrtyo4uiVKoLmtRvQaJ3k="; @@ -35,31 +9,31 @@ }; deps = { gn = { - rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M="; + rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; url = "https://gn.googlesource.com/gn"; version = "2023-08-10"; }; }; - hash = "sha256-CTkw92TiRD2tkYu5a5dy8fjpR2MMOMCvcbxXhJ36Bp8="; - hash_deb_amd64 = "sha256-Y4IUVJIBlt2kcrK5c8SiUyvetC3aBhQQIBTCSaDUKxs="; - version = "118.0.5993.88"; + hash = "sha256-65rN17DIF+9FgZu7ohc9dM8ni6Qmqc9l1oyOcloip44="; + hash_deb_amd64 = "sha256-RJcyIA0TdXWRk+K2GVcHSv4OSq5c6Y7InUblao3uusc="; + version = "118.0.5993.117"; }; ungoogled-chromium = { deps = { gn = { - rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M="; + rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; url = "https://gn.googlesource.com/gn"; version = "2023-08-10"; }; ungoogled-patches = { - rev = "118.0.5993.88-1"; - hash = "sha256-Tv/DSvVHa/xU5SXNtobaJPOSrbMMwYIu0+okSkw7RJ4="; + hash = "sha256-10kSaLteFtvg3nGffslRpAxmc7nFsp0rA8gwm8jqt/8="; + rev = "118.0.5993.117-1"; }; }; - hash = "sha256-CTkw92TiRD2tkYu5a5dy8fjpR2MMOMCvcbxXhJ36Bp8="; - hash_deb_amd64 = "sha256-Y4IUVJIBlt2kcrK5c8SiUyvetC3aBhQQIBTCSaDUKxs="; - version = "118.0.5993.88"; + hash = "sha256-65rN17DIF+9FgZu7ohc9dM8ni6Qmqc9l1oyOcloip44="; + hash_deb_amd64 = "sha256-RJcyIA0TdXWRk+K2GVcHSv4OSq5c6Y7InUblao3uusc="; + version = "118.0.5993.117"; }; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index bb4b1ba0a85d7..8a9cc71d083f7 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,5 +1,6 @@ { pname , version +, packageVersion ? version , meta , updateScript ? null , binaryName ? "firefox" @@ -206,7 +207,7 @@ in buildStdenv.mkDerivation { pname = "${pname}-unwrapped"; - inherit version; + version = packageVersion; inherit src unpackPhase meta; @@ -557,7 +558,6 @@ buildStdenv.mkDerivation { passthru = { inherit application extraPatches; inherit updateScript; - inherit version; inherit alsaSupport; inherit binaryName; inherit jackSupport; @@ -569,6 +569,7 @@ buildStdenv.mkDerivation { inherit tests; inherit gtk3; inherit wasiSysRoot; + version = packageVersion; } // extraPassthru; hardeningDisable = [ "format" ]; # -Werror=format-security diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix new file mode 100644 index 0000000000000..c144704fa13f1 --- /dev/null +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, fetchFromGitHub +, buildMozillaMach +, nixosTests +}: + +((buildMozillaMach rec { + pname = "floorp"; + packageVersion = "11.5.0"; + applicationName = "Floorp"; + binaryName = "floorp"; + version = "155.4.0"; + + src = fetchFromGitHub { + owner = "Floorp-Projects"; + repo = "Floorp"; + fetchSubmodules = true; + rev = "v${packageVersion}"; + hash = "sha256-adK3LAu3cDh6d+GvtnkWmSnxansnSZoIgtA9TAqIMyA="; + }; + + extraConfigureFlags = [ + "--with-app-name=${pname}" + "--with-app-basename=${applicationName}" + "--with-branding=browser/branding/official" + "--with-distribution-id=app.floorp.Floorp" + "--with-unsigned-addon-scopes=app,system" + "--allow-addon-sideload" + ]; + + meta = { + description = "A fork of Firefox, focused on keeping the Open, Private and Sustainable Web alive, built in Japan"; + homepage = "https://floorp.app/"; + maintainers = with lib.maintainers; [ christoph-heiss ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) + license = lib.licenses.mpl20; + }; + tests = [ nixosTests.floorp ]; +}).override { + privacySupport = true; + enableOfficialBranding = false; +}).overrideAttrs (prev: { + MOZ_REQUIRE_SIGNING = ""; +}) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 342396c6a5aac..e1d79afac0441 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , nix-update-script , cmake , pkg-config @@ -17,15 +18,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.17.0"; + version = "1.17.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-UoyCsmZKpRkO4bQt6RwRAceu3+JPD8I8qSf9/uU5Vm4="; + hash = "sha256-x80le9/mkL57NQGgmqAdbixYGxcoKKO3Rl+BlpOzTwc="; }; + patches = [ + # Remove on next release + (fetchpatch { + url = "https://github.com/skyjake/lagrange/commit/e8295f0065e8ecddab2e291e420098ac7981e0a9.patch"; + hash = "sha256-s8Ryace6DOjw4C4h1Kb2ti5oygvsAAs/MF9pC3eQbAM="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ the-foundation ] diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 3ddb046568a31..28f8358feb5c7 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -78,7 +78,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0"; + version = "13.0.1"; sources = { x86_64-linux = fetchurl { @@ -90,7 +90,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-YtkGgSnQVJ9wtamDOtLROufhPJ9KizV8j5kK26iJ+ZY="; + hash = "sha256-VYkRHWyTAAt5P7jnNuf4s2bOv36LuqcTMMKOLRGE9FQ="; }; }; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index 21dde7700b222..d9c9ed6165899 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "15.0.0"; + version = "15.0.1"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-O0VWgx6FKulELZuJgMwFgGSo+EaCqb9dgneF2XFnq7U="; + sha256 = "sha256-CU5PI+9iBcxZdhhs2QjfZTViU2xQ3i+T+4Wzp+yeKEE="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 9a768857fb51f..caa4b6e39a591 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -86,7 +86,7 @@ lib.warnIf (useHardenedMalloc != null) ffmpeg ]; - version = "13.0"; + version = "13.0.1"; sources = { x86_64-linux = fetchurl { @@ -96,7 +96,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-zdmPbmJo5FDoOjob+9TDCvCgKgLHvLi3bOMhcZg8DVM="; + hash = "sha256-ORa973US2VY9Can4Nr35YSpZrYGqBP4I/S/ulsbRJLc="; }; i686-linux = fetchurl { @@ -106,7 +106,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-Hlvx2C4DF/wcHo9ES+g9UUgNFGDokW5OAX3FeOvR+fY="; + hash = "sha256-OBUleXLTNFG+aFuftnphgBtQCfyoIWDcoVFs5elJ0tA="; }; }; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index a956dee90d1a6..2ce73facf61eb 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.2.3105.54"; + version = "6.2.3105.58"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-QqdCnwSrqJAEj++xcr3cOkKSbZIFkyvMutxsLNR/Moc="; - x86_64-linux = "sha256-z5/l94MFhpHRLvbUdSwFSSt3n21mPZJzanYugXecLFk="; + aarch64-linux = "sha256-PDy+cenU1D9UKlICgZgj/KKZFq5x8iSDpbtCr06ks70="; + x86_64-linux = "sha256-uWv4odg/nEuY6B8Jzt5Br4pUFMlG0vGEt968PajxMUA="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/applications/networking/circumflex/default.nix index 832456d35d3f6..bc1d81e7f9565 100644 --- a/pkgs/applications/networking/circumflex/default.nix +++ b/pkgs/applications/networking/circumflex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circumflex"; - version = "3.2"; + version = "3.5"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-3cu5Y9Z20CbFN+4/2LLM3pcXofuc8oztoZVPhDzFLas="; + hash = "sha256-w5QdFvF+kIxt27rg/uXjd+G0Dls7oYhmFew+O2NoaVg="; }; - vendorHash = "sha256-w9WDbNvnaRgZ/rpI450C7AA244AXRE8u960xZnAiXn4="; + vendorHash = "sha256-F9mzGP5b9dcmnT6TvjjbRq/isk1o8vM/5yxWUaZrnaw="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 33ac8cc965aa3..e20ad8c68e51d 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-ETvAE9kegqtAduXm9/9fmPgJJ2Xq6ZY5J5iGcjHkyKM="; + hash = "sha256-oYREaXUm60AkWO/2X6Cu55F+gCaPYpYqRigJW0ocDL0="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-4vGBi6P0xSfBheTg2/z28l9H07TasqqM8l6YjGgLhvs="; + vendorHash = "sha256-KzH4GmOeurcEMIDN3B8QSMZY1Fk+tNqy0SYzCXiRVlo="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 269f97ac3948d..2e2ca3341d83c 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.10.10"; + version = "0.10.13"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-Lu/itKaF7mSG/jwg2sA4wNkbzBWdDY4pfwHB0elI1Bc="; + hash = "sha256-DhMoNI1eRzP9FK752Z8sAcuj5dpu2vRqXRv4tbSYmLE="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index 98a051cb7c3b5..4abcb0321d8cf 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.4.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hxak76S3+i5G81Xv4wdFvR/+vg5Eh86YjeqRzNUmfh4="; + sha256 = "sha256-T8fPD0i15U/PzDOAVP0sifLYFHr76jD1o7q+nn+N0cY="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index f145b306d8868..f33d11a4c9a4f 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.67"; + version = "1.0.68"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-EBpKJrQ+zdoMlTbOsWCAj2Hfu8OqQTFb0l+i2UdkNSs="; + sha256 = "sha256-qvcMA8oPDyi8WoIzr/3mu+2cHDXn5rgLUmnsGdOQXVM="; }; - vendorHash = "sha256-AvAS3S7bepaTFPelE+Bj5/UuQIXEDvSAtDuFaPRC9sk="; + vendorHash = "sha256-C+XaX78iGKw6Ll7PMPFWWAy6fRwjrmbLhFdmqJPMrxc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 4082fdbc0f44d..407b0c0dd9c11 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.15.9"; + version = "1.15.14"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-P3NC1/ZujqSO2C4ToNLpxgbxqACXYYsAFQh1Xbbu7x4="; + hash = "sha256-rQZOGM97mXKFFMQRw6+iiaDLugu0CM7OW2V7w0fgpDM="; }; - vendorHash = "sha256-KaBq1VCGWv3K50DDelS0hOQkXnK1ufBiXBtbPQFzwMY="; + vendorHash = "sha256-51s+C4P8xKp52qjr6LK3zWKWzwnuEQyKxi/Wzpha9Fs="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 503a4ff0c0d13..e2ba162b75812 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, callPackage }: +{ lib, callPackage, ... }@args: let k3s_builder = import ./builder.nix lib; common = opts: callPackage (k3s_builder opts); + # extraArgs is the extra arguments passed in by the caller to propogate downward. + # This is to allow all-packages.nix to do: + # + # let k3s_1_23 = (callPackage ./path/to/k3s { + # commonK3sArg = .... + # }).k3s_1_23; + extraArgs = builtins.removeAttrs args [ "callPackage" ]; in { k3s_1_26 = common ((import ./1_26/versions.nix) // { updateScript = [ ./update-script.sh "26" ]; - }) { }; + }) extraArgs; # 1_27 can be built with the same builder as 1_26 k3s_1_27 = common ((import ./1_27/versions.nix) // { updateScript = [ ./update-script.sh "27" ]; - }) { }; + }) extraArgs; } diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index ae15ac80259e4..e4bd3be1e78ef 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.14"; + version = "0.14.2"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-5o2bIjO9eF+NDAAhVssHJXmKE/eTHMuEwz4F48OBKaE="; + hash = "sha256-SHijhYZyvaBkRVt0BO37OXEjaDGUIeO+PfrmUqPJf/M="; }; - vendorHash = "sha256-e7VLDipadGa/Zzss2jgj0fyCKr92Sq2urshnFob4SSE="; + vendorHash = "sha256-fxbyAd2NaU1WQCPE+Feb1mrz6dzwCyZqanm+wfBL/IE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index fe3732152d215..7197a695e826f 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.34.1"; + version = "0.34.2"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-UGxtL8X1wEyo7jYmPw0GTvuzzQCBA3WTIowMnYSyfvM="; + hash = "sha256-+qQ/80wXSKvPg2nRuvkYZe0+fwnxKsegR0IjsxBKDNQ="; }; - vendorHash = "sha256-AbEEHG+LJB5fOm8koVQllKohtb0lqD6Kln3GCwlkb/0="; + vendorHash = "sha256-X+EvvrAnqMw/jpVdF/UJq9zFH+1NLFLYOu5RsxykynY="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index d7eb948109512..8c15855576b88 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.2.17"; + version = "2.3.0"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-cqKnoGRW+IquuZ7wvCRipRJ6mO18w/yhf5nS094vs7c="; + hash = "sha256-5znZMr0Dj6kpKJbypICN5+Fv/+3FgTLBok3YMrWaHdo="; }; - vendorHash = "sha256-0J27JSewc0DCcc3xvl2DBZE/b0qKuozuP7tFdbrRX7I="; + vendorHash = "sha256-/iAGUnIMH2+IrvvXig56SpZ0eTfVwaCgGMUDp5/MtEo="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 08d1c5d22e432..b5e726dfcb690 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.32"; + version = "0.0.33"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pMen6ZL1S0xr5+h7gVBMG4XjlZUifIiqHvjKgg8AY5c="; + sha256 = "sha256-bPxsXRXk8hlhIhj2tO7mJ5XYd6oNH25cwp5CUVo65mo="; }; - vendorHash = "sha256-pNOCagxOcxhELSWO1GfbxGmopYXIgKD00XdZdVgawrc="; + vendorHash = "sha256-WZTtu7T7aWOk3Q0HBjGcc+lsgOExmQQEs0lEEvP+Wb4="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index ab02dff316031..ae514e2b9226a 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-L5j7+2m2zKRQ/zpmwq1OimPM6I1KmmPBzNcK+s1NIDs="; + sha256 = "sha256-vKAKDQrQ7FmCnJwo8ItwpiayrHa9bhMognYZMlpZAlM="; }; - vendorHash = "sha256-+x5wohzPYzff3jpqsvnDqElrBW867WLrl4RaLlRjkUk="; + vendorHash = "sha256-LPxU6qvpUb0ZjzjqGeTywOluwWbsi1YmiYYWJfaMWvg="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 72dbfde9f59b8..32e738a8e24af 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-O1N8+Gjo0EapRV5Z7Z27Cfs886cbwTmckJsSJ2OI5fM="; + hash = "sha256-izFDqaJFJrgeb3YPP/7rIf/IjvrtlwjbktNy702zVTU="; }; - vendorHash = "sha256-/4XFQagUbU8SgoBogK1hAsfGoTY+DaIVaNpSA3Enaho="; + vendorHash = "sha256-4I+qCh/A/Yj5kUZLFvXTUV85l/2LVGPUCivTdDlA1ao="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index b119bfdcde2ec..3fef75313b004 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -1,108 +1,56 @@ -{ nixosTests -, pkgs -, poetry2nix -, lib -, overrides ? (self: super: {}) -}: +{ python3 }: let - - interpreter = ( - poetry2nix.mkPoetryPackages { - projectDir = ./.; - python = pkgs.python310; - overrides = [ - poetry2nix.defaultPoetryOverrides - (import ./poetry-git-overlay.nix { inherit pkgs; }) - ( - self: super: { - - nixops = super.nixops.overridePythonAttrs ( - old: { - version = "${old.version}-pre-${lib.substring 0 7 super.nixops.src.rev or "dirty"}"; - - postPatch = '' - substituteInPlace nixops/args.py --subst-var version - ''; - - meta = old.meta // { - homepage = "https://github.com/NixOS/nixops"; - description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ adisbladis aminechikhaoui roberth ]; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl3; - mainProgram = "nixops"; - }; - - } - ); - } - ) - - # User provided overrides - overrides - - # Make nixops pluginable - (self: super: let - # Create a fake sphinx directory that doesn't pull the entire setup hook and incorrect python machinery - sphinx = pkgs.runCommand "sphinx" {} '' - mkdir -p $out/bin - for f in ${pkgs.python3.pkgs.sphinx}/bin/*; do - ln -s $f $out/bin/$(basename $f) - done - ''; - - in { - nixops = super.__toPluginAble { - drv = super.nixops; - finalDrv = self.nixops; - - nativeBuildInputs = [ sphinx ]; - - postInstall = '' - doc_cache=$(mktemp -d) - sphinx-build -b man -d $doc_cache doc/ $out/share/man/man1 - - html=$(mktemp -d) - sphinx-build -b html -d $doc_cache doc/ $out/share/nixops/doc - ''; - - }; - }) - - (self: super: { - cryptography = super.cryptography.overridePythonAttrs (old: { - meta = old.meta // { - knownVulnerabilities = old.meta.knownVulnerabilities or [ ] - ++ lib.optionals (lib.versionOlder old.version "41.0.0") [ - "CVE-2023-2650" - "CVE-2023-2975" - "CVE-2023-3446" - "CVE-2023-3817" - "CVE-2023-38325" - ]; - }; - }); - }) - - ]; - } - ).python; - - pkg = (interpreter.pkgs.nixops.withPlugins(ps: [ - ps.nixops-aws - ps.nixops-digitalocean - ps.nixops-encrypted-links - ps.nixops-gcp - ps.nixops-hercules-ci - ps.nixops-hetzner - ps.nixopsvbox - ps.nixops-virtd - ps.nixops-hetznercloud - ])).overrideAttrs (finalAttrs: prevAttrs: { - passthru = prevAttrs.passthru or {} // { - tests = prevAttrs.passthru.tests or {} // - nixosTests.nixops.unstable.passthru.override { nixopsPkg = pkg; }; + python = python3.override { + packageOverrides = self: super: { + nixops = self.callPackage ./unwrapped.nix { }; + } // (plugins self); + }; + + plugins = ps: with ps; rec { + nixops-aws = callPackage ./plugins/nixops-aws.nix { }; + nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; + nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; + nixops-gce = callPackage ./plugins/nixops-gce.nix { }; + nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; + nixops-hetzner = callPackage ./plugins/nixops-hetzner.nix { }; + nixops-hetznercloud = callPackage ./plugins/nixops-hetznercloud.nix { }; + nixops-libvirtd = callPackage ./plugins/nixops-libvirtd.nix { }; + nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; + nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; + + # aliases for backwards compatibility + nixops-gcp = nixops-gce; + nixops-virtd = nixops-libvirtd; + nixopsvbox = nixops-vbox; + }; + + # selector is a function mapping pythonPackages to a list of plugins + # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) + withPlugins = selector: let + selected = selector (plugins python.pkgs); + in python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ selected; + + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; + + passthru = old.passthru // { + plugins = plugins python.pkgs; + inherit withPlugins python; }; - }); -in pkg + })); +in withPlugins (ps: [ + ps.nixops-aws + ps.nixops-digitalocean + ps.nixops-encrypted-links + ps.nixops-gce + ps.nixops-hercules-ci + ps.nixops-hetzner + ps.nixops-hetznercloud + ps.nixops-libvirtd + ps.nixops-vbox +]) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix new file mode 100644 index 0000000000000..06d8135bc9ffb --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, boto +, boto3 +, nixops +, nixos-modules-contrib +, typing-extensions +}: + +buildPythonPackage { + pname = "nixops-aws"; + version = "unstable-2023-08-09"; + pyproject = true; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nixops-aws"; + rev = "8802d1cda9004ec1362815292c2a8ab95e6d64e8"; + hash = "sha256-i0KjFrwpDHRch9jorccdVwnjAQiORClDUqm2R2xvwuU="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + boto + boto3 + nixos-modules-contrib + typing-extensions + ]; + + pythonImportsCheck = [ "nixops_aws" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "AWS plugin for NixOps"; + homepage = "https://github.com/NixOS/nixops-aws"; + license = licenses.lgpl3Only; + maintainers = nixops.meta.maintainers; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix new file mode 100644 index 0000000000000..e35b4cd07f380 --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, nixops +, digital-ocean +}: + +buildPythonPackage { + pname = "nixops-digitalocean"; + version = "unstable-2022-08-14"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixops-digitalocean"; + rev = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff"; + hash = "sha256-aJtShvdqjAiCK5oZL0GR5cleDb4s1pJkO6UPKGd4Dgg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + digital-ocean + ]; + + pythonImportsCheck = [ "nixops_digitalocean" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "NixOps Digitalocean plugin"; + homepage = "https://github.com/nix-community/nixops-digitalocean"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ kiwi ]; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix new file mode 100644 index 0000000000000..49ffc319a05e2 --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, nixops +}: + +buildPythonPackage { + pname = "nixops-encrypted-links"; + version = "unstable-2021-02-16"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixops-encrypted-links"; + rev = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1"; + hash = "sha256-1TTbARyCfrLxF6SVNkmIKNNcLS9FVW22d9w0VRrH1os="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + pythonImportsCheck = [ "nixops_encrypted_links" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "EncryptedLinksTo from Nixops 1 module port"; + homepage = "https://github.com/nix-community/nixops-encrypted-links"; + license = licenses.mit; + maintainers = with maintainers; [ adisbladis ]; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix new file mode 100644 index 0000000000000..604e82114badc --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, cryptography +, libcloud +, nixops +, nixos-modules-contrib +}: + +buildPythonPackage { + pname = "nixops-gce"; + version = "unstable-2023-05-26"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixops-gce"; + rev = "d13cb794aef763338f544010ceb1816fe31d7f42"; + hash = "sha256-UkYf6CoUrr8yuQoe/ik6vu+UCi3ByJd0BdkS9SLEp0Q="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + cryptography + libcloud + nixos-modules-contrib + ]; + + pythonImportsCheck = [ "nixops_gcp" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "NixOps Google Cloud Backend"; + homepage = "https://github.com/nix-community/nixops-gce"; + license = licenses.mit; + maintainers = nixops.meta.maintainers; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix new file mode 100644 index 0000000000000..90ed88edfa0e9 --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, nixops +}: + +buildPythonPackage { + pname = "nixops-hercules-ci"; + version = "unstable-2021-10-06"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hercules-ci"; + repo = "nixops-hercules-ci"; + rev = "e601d5baffd003fd5f22deeaea0cb96444b054dc"; + hash = "sha256-4IZ+qzhERJIhLcIq9FvVml+xAFJ8R4QpUjFRw2DZl2U="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + pythonImportsCheck = [ "nixops_hercules_ci" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "Use Hercules CI as a NixOps backend"; + homepage = "https://github.com/hercules-ci/nixops-hercules-ci"; + license = licenses.asl20; + maintainers = with maintainers; [ roberth ]; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix new file mode 100644 index 0000000000000..c4d037fe75f5a --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, hetzner +, nixops +, nixos-modules-contrib +, typing-extensions +}: + +buildPythonPackage { + pname = "nixops-hetzner"; + version = "unstable-2022-04-23"; + pyproject = true; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nixops-hetzner"; + rev = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35"; + hash = "sha256-duK1Ui4VpbGSgGvfjTOddHSqHZ1FSy4L9Egg+FvZv04="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + hetzner + nixos-modules-contrib + typing-extensions + ]; + + pythonImportsCheck = [ "nixops_hetzner" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "Hetzner bare metal NixOps plugin"; + homepage = "https://github.com/NixOS/nixops-hetzner"; + license = licenses.mit; + maintainers = nixops.meta.maintainers; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix new file mode 100644 index 0000000000000..17e94ab9f32bd --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, hcloud +, nixops +, typing-extensions +}: + +buildPythonPackage { + pname = "nixops-hetznercloud"; + version = "unstable-2023-02-19"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lukebfox"; + repo = "nixops-hetznercloud"; + rev = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3"; + hash = "sha256-IsRJUUAfN6YXcue80qlcunkawUtgMiMU8mM6DP+7Cm4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + hcloud + typing-extensions + ]; + + pythonImportsCheck = [ "nixops_hetznercloud" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "A NixOps plugin supporting Hetzner Cloud deployments"; + homepage = "https://github.com/lukebfox/nixops-hetznercloud"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ lukebfox ]; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix new file mode 100644 index 0000000000000..b3439bf4fe521 --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, libvirt +, nixops +}: + +buildPythonPackage { + pname = "nixops-libvirtd"; + version = "unstable-2023-09-01"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixops-libvirtd"; + rev = "b59424bf53e74200d684a4bce1ae64d276e793a0"; + hash = "sha256-HxJu8/hOPI5aCddTpna0mf+emESYN3ZxpTkitfKcfVQ="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + propagatedBuildInputs = [ + libvirt + ]; + + pythonImportsCheck = [ "nixops_virtd" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "NixOps libvirtd backend plugin"; + homepage = "https://github.com/nix-community/nixops-libvirtd"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ aminechikhaoui ]; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix new file mode 100644 index 0000000000000..4a9f0351094c0 --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, nixops +}: + +buildPythonPackage { + pname = "nixops-vbox"; + version = "unstable-2023-08-10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixops-vbox"; + rev = "baa5f09c9ae9aaf639c95192460ab5dcbe83a883"; + hash = "sha256-QrxherQO1t0VpYjJSEbntUWVD6GW4MtVHiKINpzHA1M="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + pythonImportsCheck = [ "nixopsvbox" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "NixOps plugin for VirtualBox VMs"; + homepage = "https://github.com/nix-community/nixops-vbox"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ aminechikhaoui ]; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix new file mode 100644 index 0000000000000..5c6e9fec32cfd --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, nixops +}: + +buildPythonPackage { + pname = "nixos-modules-contrib"; + version = "unstable-2021-01-20"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nixos-modules-contrib"; + rev = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8"; + hash = "sha256-/RSStpkAxWpUB5saQ8CmQZljFjJyUMOrR1+GiHJR2Tg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace poetry.masonry.api poetry.core.masonry.api \ + --replace "poetry>=" "poetry-core>=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + nixops + ]; + + pythonImportsCheck = [ "nixos_modules_contrib" ]; + + passthru.updateScript = unstableGitUpdater {}; + + meta = with lib; { + description = "Useful NixOS modules which may not belong in the Nixpkgs repository itself"; + homepage = "https://github.com/nix-community/nixos-modules-contrib"; + license = licenses.lgpl3; + maintainers = []; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix deleted file mode 100644 index 7de5435ddc4a0..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ pkgs }: -self: super: { - - nixops = super.nixops.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/NixOS/nixops.git"; - rev = "fc9b55c55da62f949028143b974f67fdc7f40c8b"; - sha256 = "0f5r17rq3rf3ylp16cq50prn8qmfc1gwpqgqfj491w38sr5sspf8"; - }; - } - ); - - nixops-aws = super.nixops-aws.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/NixOS/nixops-aws.git"; - rev = "8802d1cda9004ec1362815292c2a8ab95e6d64e8"; - sha256 = "1rf2dxn4gdm9a91jji4f100y62ap3p3svs6qhxf78319phba6hlb"; - }; - } - ); - - nixops-digitalocean = super.nixops-digitalocean.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-digitalocean.git"; - rev = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff"; - sha256 = "020fg1kjh3x57dj95micpq6mxjg5j50jy6cs5f10i33ayy3556v8"; - }; - } - ); - - nixops-encrypted-links = super.nixops-encrypted-links.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-encrypted-links.git"; - rev = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1"; - sha256 = "12ynqwd5ad6wfyv6sma55wnmrlr8i14kd5d42zqv4zl23h0xnd6m"; - }; - } - ); - - nixops-gcp = super.nixops-gcp.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-gce.git"; - rev = "d13cb794aef763338f544010ceb1816fe31d7f42"; - sha256 = "0i57qhiga4nr0ms9gj615l599vxy78lzw7hap4rbzbhl5bl1yijj"; - }; - } - ); - - nixops-hercules-ci = super.nixops-hercules-ci.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/hercules-ci/nixops-hercules-ci.git"; - rev = "e601d5baffd003fd5f22deeaea0cb96444b054dc"; - sha256 = "0rcpv5hc6l9ia8lq8ivwa80b2pwssmdz8an25lhr4i2472mpx1p0"; - }; - } - ); - - nixops-hetzner = super.nixops-hetzner.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/NixOS/nixops-hetzner"; - rev = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35"; - sha256 = "0kmzv5dzh828yh5jwjs5klfslx3lklrqvpvbh29b398m5r9bbqkn"; - }; - } - ); - - nixops-hetznercloud = super.nixops-hetznercloud.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/lukebfox/nixops-hetznercloud.git"; - rev = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3"; - sha256 = "0vhapgzhqfk3y8a26ck09g0ilydsbjlx5g77f8bscdqz818lki12"; - }; - } - ); - - nixops-virtd = super.nixops-virtd.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-libvirtd.git"; - rev = "be1ea32e02d8abb3dbe1b09b7c5a7419a7412991"; - sha256 = "1mklm3lmicvhs0vcib3ss21an45wk24m1mkcwy1zvbpbmvhdz2m4"; - }; - } - ); - - nixopsvbox = super.nixopsvbox.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-vbox.git"; - rev = "2729672865ebe2aa973c062a3fbddda8c1359da0"; - sha256 = "07bmrbg3g2prnba2kwg1rg6rvmnx1vzc538y2q3g04s958hala56"; - }; - } - ); - - nixos-modules-contrib = super.nixos-modules-contrib.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixos-modules-contrib.git"; - rev = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8"; - sha256 = "0f6ra5r8i1jz8ymw6l3j68b676a1lv0466lv0xa6mi80k6v9457x"; - }; - } - ); - -} diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock deleted file mode 100644 index 900875191e3cb..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ /dev/null @@ -1,731 +0,0 @@ -# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. - -[[package]] -name = "apache-libcloud" -version = "3.7.0" -description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org" -optional = false -python-versions = ">=3.6, <4" -files = [ - {file = "apache-libcloud-3.7.0.tar.gz", hash = "sha256:148a9e50069654432a7d34997954e91434dd38ebf68832eb9c75d442b3e62fad"}, - {file = "apache_libcloud-3.7.0-py2.py3-none-any.whl", hash = "sha256:027a9aff2c01db9c8e6f9f94b6eb44b3153d82702c42bfbe7af5624dabf1f950"}, -] - -[package.dependencies] -requests = ">=2.26.0" - -[[package]] -name = "boto" -version = "2.49.0" -description = "Amazon Web Services Library" -optional = false -python-versions = "*" -files = [ - {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"}, - {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, -] - -[[package]] -name = "boto3" -version = "1.28.22" -description = "The AWS SDK for Python" -optional = false -python-versions = ">= 3.7" -files = [ - {file = "boto3-1.28.22-py3-none-any.whl", hash = "sha256:0c1c1d19232018ac49fd2c0a94aa0b802f5d222e89448ff50734626bce454b32"}, - {file = "boto3-1.28.22.tar.gz", hash = "sha256:af1ce129f462cdc8dfb1a1c559d7ed725e51344fb0ae4a56d9453196bf416555"}, -] - -[package.dependencies] -botocore = ">=1.31.22,<1.32.0" -jmespath = ">=0.7.1,<2.0.0" -s3transfer = ">=0.6.0,<0.7.0" - -[package.extras] -crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] - -[[package]] -name = "botocore" -version = "1.31.22" -description = "Low-level, data-driven core of boto 3." -optional = false -python-versions = ">= 3.7" -files = [ - {file = "botocore-1.31.22-py3-none-any.whl", hash = "sha256:b91025ca1a16b13ae662bdb46e7c16d2c53619df23bf3583a43791519da14870"}, - {file = "botocore-1.31.22.tar.gz", hash = "sha256:d193ab0742ddc4af3a3994af4ec993acf5ac75460f298880fe869765e7bc578d"}, -] - -[package.dependencies] -jmespath = ">=0.7.1,<2.0.0" -python-dateutil = ">=2.1,<3.0.0" -urllib3 = ">=1.25.4,<1.27" - -[package.extras] -crt = ["awscrt (==0.16.26)"] - -[[package]] -name = "certifi" -version = "2023.7.22" -description = "Python package for providing Mozilla's CA Bundle." -optional = false -python-versions = ">=3.6" -files = [ - {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"}, - {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"}, -] - -[[package]] -name = "cffi" -version = "1.15.1" -description = "Foreign Function Interface for Python calling C code." -optional = false -python-versions = "*" -files = [ - {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"}, - {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"}, - {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"}, - {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"}, - {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"}, - {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"}, - {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"}, - {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"}, - {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"}, - {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"}, - {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"}, - {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"}, - {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"}, - {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"}, - {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"}, - {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"}, - {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"}, - {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"}, - {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"}, -] - -[package.dependencies] -pycparser = "*" - -[[package]] -name = "charset-normalizer" -version = "3.2.0" -description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -optional = false -python-versions = ">=3.7.0" -files = [ - {file = "charset-normalizer-3.2.0.tar.gz", hash = "sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-win32.whl", hash = "sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96"}, - {file = "charset_normalizer-3.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-win32.whl", hash = "sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1"}, - {file = "charset_normalizer-3.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-win32.whl", hash = "sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1"}, - {file = "charset_normalizer-3.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-win32.whl", hash = "sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706"}, - {file = "charset_normalizer-3.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-win32.whl", hash = "sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9"}, - {file = "charset_normalizer-3.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80"}, - {file = "charset_normalizer-3.2.0-py3-none-any.whl", hash = "sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6"}, -] - -[[package]] -name = "cryptography" -version = "40.0.1" -description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -optional = false -python-versions = ">=3.6" -files = [ - {file = "cryptography-40.0.1-cp36-abi3-macosx_10_12_universal2.whl", hash = "sha256:918cb89086c7d98b1b86b9fdb70c712e5a9325ba6f7d7cfb509e784e0cfc6917"}, - {file = "cryptography-40.0.1-cp36-abi3-macosx_10_12_x86_64.whl", hash = "sha256:9618a87212cb5200500e304e43691111570e1f10ec3f35569fdfcd17e28fd797"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a4805a4ca729d65570a1b7cac84eac1e431085d40387b7d3bbaa47e39890b88"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63dac2d25c47f12a7b8aa60e528bfb3c51c5a6c5a9f7c86987909c6c79765554"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:0a4e3406cfed6b1f6d6e87ed243363652b2586b2d917b0609ca4f97072994405"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:1e0af458515d5e4028aad75f3bb3fe7a31e46ad920648cd59b64d3da842e4356"}, - {file = "cryptography-40.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:d8aa3609d337ad85e4eb9bb0f8bcf6e4409bfb86e706efa9a027912169e89122"}, - {file = "cryptography-40.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:cf91e428c51ef692b82ce786583e214f58392399cf65c341bc7301d096fa3ba2"}, - {file = "cryptography-40.0.1-cp36-abi3-win32.whl", hash = "sha256:650883cc064297ef3676b1db1b7b1df6081794c4ada96fa457253c4cc40f97db"}, - {file = "cryptography-40.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:a805a7bce4a77d51696410005b3e85ae2839bad9aa38894afc0aa99d8e0c3160"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:cd033d74067d8928ef00a6b1327c8ea0452523967ca4463666eeba65ca350d4c"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d36bbeb99704aabefdca5aee4eba04455d7a27ceabd16f3b3ba9bdcc31da86c4"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:32057d3d0ab7d4453778367ca43e99ddb711770477c4f072a51b3ca69602780a"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:f5d7b79fa56bc29580faafc2ff736ce05ba31feaa9d4735048b0de7d9ceb2b94"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:7c872413353c70e0263a9368c4993710070e70ab3e5318d85510cc91cce77e7c"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:28d63d75bf7ae4045b10de5413fb1d6338616e79015999ad9cf6fc538f772d41"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:6f2bbd72f717ce33100e6467572abaedc61f1acb87b8d546001328d7f466b778"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:cc3a621076d824d75ab1e1e530e66e7e8564e357dd723f2533225d40fe35c60c"}, - {file = "cryptography-40.0.1.tar.gz", hash = "sha256:2803f2f8b1e95f614419926c7e6f55d828afc614ca5ed61543877ae668cc3472"}, -] - -[package.dependencies] -cffi = ">=1.12" - -[package.extras] -docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"] -docstest = ["pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"] -pep8test = ["black", "check-manifest", "mypy", "ruff"] -sdist = ["setuptools-rust (>=0.11.4)"] -ssh = ["bcrypt (>=3.1.5)"] -test = ["iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-shard (>=0.1.2)", "pytest-subtests", "pytest-xdist"] -test-randomorder = ["pytest-randomly"] -tox = ["tox"] - -[[package]] -name = "hcloud" -version = "1.18.2" -description = "Official Hetzner Cloud python library" -optional = false -python-versions = ">3.5" -files = [ - {file = "hcloud-1.18.2-py2.py3-none-any.whl", hash = "sha256:fcd73c7aab1d6e729333697e5214b26727775eccdbfb50effd1863c3424caa59"}, - {file = "hcloud-1.18.2.tar.gz", hash = "sha256:37bd5ba56387e3c491c5babd3e08ab91d5f0390cd5e880e4dfea19e21681bc9e"}, -] - -[package.dependencies] -python-dateutil = ">=2.7.5" -requests = ">=2.20" - -[package.extras] -docs = ["Sphinx (==1.8.1)", "sphinx-rtd-theme (==0.4.2)"] - -[[package]] -name = "hetzner" -version = "0.8.3" -description = "High level access to the Hetzner robot" -optional = false -python-versions = "*" -files = [ - {file = "hetzner-0.8.3.tar.gz", hash = "sha256:9a43dbbeb4a1f3efc86c5fe1c1d7039aaa635dfdb829506ec3aa34382d3a7114"}, -] - -[[package]] -name = "idna" -version = "3.4" -description = "Internationalized Domain Names in Applications (IDNA)" -optional = false -python-versions = ">=3.5" -files = [ - {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, - {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, -] - -[[package]] -name = "jmespath" -version = "1.0.1" -description = "JSON Matching Expressions" -optional = false -python-versions = ">=3.7" -files = [ - {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"}, - {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"}, -] - -[[package]] -name = "jsonpickle" -version = "3.0.1" -description = "Python library for serializing any arbitrary object graph into JSON" -optional = false -python-versions = ">=3.7" -files = [ - {file = "jsonpickle-3.0.1-py2.py3-none-any.whl", hash = "sha256:130d8b293ea0add3845de311aaba55e6d706d0bb17bc123bd2c8baf8a39ac77c"}, - {file = "jsonpickle-3.0.1.tar.gz", hash = "sha256:032538804795e73b94ead410800ac387fdb6de98f8882ac957fcd247e3a85200"}, -] - -[package.extras] -docs = ["jaraco.packaging (>=3.2)", "rst.linker (>=1.9)", "sphinx"] -testing = ["ecdsa", "feedparser", "gmpy2", "numpy", "pandas", "pymongo", "pytest (>=3.5,!=3.7.3)", "pytest-black-multipy", "pytest-checkdocs (>=1.2.3)", "pytest-cov", "pytest-flake8 (>=1.1.1)", "scikit-learn", "sqlalchemy"] -testing-libs = ["simplejson", "ujson"] - -[[package]] -name = "libvirt-python" -version = "9.6.0" -description = "The libvirt virtualization API python binding" -optional = false -python-versions = ">=3.6" -files = [ - {file = "libvirt-python-9.6.0.tar.gz", hash = "sha256:53422d8e3110139655c3d9c2ff2602b238f8a39b7bf61a92a620119b45550a99"}, -] - -[[package]] -name = "nixops" -version = "2.0.0" -description = "NixOS cloud provisioning and deployment tool" -optional = false -python-versions = "^3.10" -files = [] -develop = false - -[package.dependencies] -pluggy = "^1.0.0" -PrettyTable = "^0.7.2" -typeguard = "^2.7.1" -typing-extensions = "^3.7.4" - -[package.source] -type = "git" -url = "https://github.com/NixOS/nixops.git" -reference = "master" -resolved_reference = "fc9b55c55da62f949028143b974f67fdc7f40c8b" - -[[package]] -name = "nixops-aws" -version = "1.0" -description = "NixOps AWS plugin" -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -boto = "^2.49.0" -boto3 = "^1.13.7" -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} -nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} -typing-extensions = "^3.7.4" - -[package.source] -type = "git" -url = "https://github.com/NixOS/nixops-aws.git" -reference = "HEAD" -resolved_reference = "8802d1cda9004ec1362815292c2a8ab95e6d64e8" - -[[package]] -name = "nixops-digitalocean" -version = "2.0" -description = "NixOps plugin for Digital Ocean" -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git"} -python-digitalocean = "^1.15.0" - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-digitalocean.git" -reference = "HEAD" -resolved_reference = "e977b7f11e264a6a2bff2dcbc7b94c6a97b92fff" - -[[package]] -name = "nixops-encrypted-links" -version = "1.0" -description = "Encrypted links support for NixOps" -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-encrypted-links.git" -reference = "HEAD" -resolved_reference = "e2f196fce15fcfb00d18c055e1ac53aec33b8fb1" - -[[package]] -name = "nixops-gcp" -version = "1.0" -description = "NixOps backend for Google Cloud Platform" -optional = false -python-versions = "^3.10" -files = [] -develop = false - -[package.dependencies] -apache-libcloud = "^3.7.0" -cryptography = "40.0.1" -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} -nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-gce.git" -reference = "HEAD" -resolved_reference = "d13cb794aef763338f544010ceb1816fe31d7f42" - -[[package]] -name = "nixops-hercules-ci" -version = "0.1.0" -description = "" -optional = false -python-versions = "^3.8" -files = [] -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git"} - -[package.source] -type = "git" -url = "https://github.com/hercules-ci/nixops-hercules-ci.git" -reference = "HEAD" -resolved_reference = "e601d5baffd003fd5f22deeaea0cb96444b054dc" - -[[package]] -name = "nixops-hetzner" -version = "1.0" -description = "NixOS deployment tool, but for hetzner" -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -hetzner = "0.8.3" -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} -nixos-modules-contrib = {git = "https://github.com/nix-community/nixos-modules-contrib.git", rev = "master"} -typing-extensions = "^3.7.4" - -[package.source] -type = "git" -url = "https://github.com/NixOS/nixops-hetzner" -reference = "HEAD" -resolved_reference = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35" - -[[package]] -name = "nixops-hetznercloud" -version = "0.1.3" -description = "NixOps Hetzner Cloud plugin" -optional = false -python-versions = "^3.10" -files = [] -develop = false - -[package.dependencies] -hcloud = "1.18.2" -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} -typing-extensions = "^3.7.4" - -[package.source] -type = "git" -url = "https://github.com/lukebfox/nixops-hetznercloud.git" -reference = "HEAD" -resolved_reference = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3" - -[[package]] -name = "nixops-virtd" -version = "1.0" -description = "NixOps plugin for virtd" -optional = false -python-versions = "^3.10" -files = [] -develop = false - -[package.dependencies] -libvirt-python = "^9.0" -nixops = {git = "https://github.com/NixOS/nixops.git"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-libvirtd.git" -reference = "HEAD" -resolved_reference = "be1ea32e02d8abb3dbe1b09b7c5a7419a7412991" - -[[package]] -name = "nixopsvbox" -version = "1.7" -description = "NixOps backend for VirtualBox" -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixops-vbox.git" -reference = "HEAD" -resolved_reference = "2729672865ebe2aa973c062a3fbddda8c1359da0" - -[[package]] -name = "nixos-modules-contrib" -version = "0.1.0" -description = "NixOS modules that don't quite belong in NixOS." -optional = false -python-versions = "^3.7" -files = [] -develop = false - -[package.dependencies] -nixops = {git = "https://github.com/NixOS/nixops.git", rev = "master"} - -[package.source] -type = "git" -url = "https://github.com/nix-community/nixos-modules-contrib.git" -reference = "master" -resolved_reference = "81a1c2ef424dcf596a97b2e46a58ca73a1dd1ff8" - -[[package]] -name = "pluggy" -version = "1.2.0" -description = "plugin and hook calling mechanisms for python" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"}, - {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"}, -] - -[package.extras] -dev = ["pre-commit", "tox"] -testing = ["pytest", "pytest-benchmark"] - -[[package]] -name = "prettytable" -version = "0.7.2" -description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format." -optional = false -python-versions = "*" -files = [ - {file = "prettytable-0.7.2.tar.bz2", hash = "sha256:853c116513625c738dc3ce1aee148b5b5757a86727e67eff6502c7ca59d43c36"}, - {file = "prettytable-0.7.2.tar.gz", hash = "sha256:2d5460dc9db74a32bcc8f9f67de68b2c4f4d2f01fa3bd518764c69156d9cacd9"}, - {file = "prettytable-0.7.2.zip", hash = "sha256:a53da3b43d7a5c229b5e3ca2892ef982c46b7923b51e98f0db49956531211c4f"}, -] - -[[package]] -name = "pycparser" -version = "2.21" -description = "C parser in Python" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, - {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, -] - -[[package]] -name = "python-dateutil" -version = "2.8.2" -description = "Extensions to the standard Python datetime module" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" -files = [ - {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, - {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, -] - -[package.dependencies] -six = ">=1.5" - -[[package]] -name = "python-digitalocean" -version = "1.17.0" -description = "digitalocean.com API to manage Droplets and Images" -optional = false -python-versions = "*" -files = [ - {file = "python-digitalocean-1.17.0.tar.gz", hash = "sha256:107854fde1aafa21774e8053cf253b04173613c94531f75d5a039ad770562b24"}, - {file = "python_digitalocean-1.17.0-py3-none-any.whl", hash = "sha256:0032168e022e85fca314eb3f8dfaabf82087f2ed40839eb28f1eeeeca5afb1fa"}, -] - -[package.dependencies] -jsonpickle = "*" -requests = "*" - -[[package]] -name = "requests" -version = "2.31.0" -description = "Python HTTP for Humans." -optional = false -python-versions = ">=3.7" -files = [ - {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, - {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, -] - -[package.dependencies] -certifi = ">=2017.4.17" -charset-normalizer = ">=2,<4" -idna = ">=2.5,<4" -urllib3 = ">=1.21.1,<3" - -[package.extras] -socks = ["PySocks (>=1.5.6,!=1.5.7)"] -use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] - -[[package]] -name = "s3transfer" -version = "0.6.1" -description = "An Amazon S3 Transfer Manager" -optional = false -python-versions = ">= 3.7" -files = [ - {file = "s3transfer-0.6.1-py3-none-any.whl", hash = "sha256:3c0da2d074bf35d6870ef157158641178a4204a6e689e82546083e31e0311346"}, - {file = "s3transfer-0.6.1.tar.gz", hash = "sha256:640bb492711f4c0c0905e1f62b6aaeb771881935ad27884852411f8e9cacbca9"}, -] - -[package.dependencies] -botocore = ">=1.12.36,<2.0a.0" - -[package.extras] -crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"] - -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] - -[[package]] -name = "typeguard" -version = "2.13.3" -description = "Run-time type checker for Python" -optional = false -python-versions = ">=3.5.3" -files = [ - {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"}, - {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"}, -] - -[package.extras] -doc = ["sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] -test = ["mypy", "pytest", "typing-extensions"] - -[[package]] -name = "typing-extensions" -version = "3.10.0.2" -description = "Backported and Experimental Type Hints for Python 3.5+" -optional = false -python-versions = "*" -files = [ - {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, - {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, - {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, -] - -[[package]] -name = "urllib3" -version = "1.26.16" -description = "HTTP library with thread-safe connection pooling, file post, and more." -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" -files = [ - {file = "urllib3-1.26.16-py2.py3-none-any.whl", hash = "sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f"}, - {file = "urllib3-1.26.16.tar.gz", hash = "sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14"}, -] - -[package.extras] -brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] -secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] - -[metadata] -lock-version = "2.0" -python-versions = "^3.10" -content-hash = "3d42a61f93a1a6b6816e317a78f3385271bd838430200f69154ebc5bebeb6162" diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml deleted file mode 100644 index 84739cb09dce7..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ /dev/null @@ -1,28 +0,0 @@ -[tool.poetry] -name = "nixopsenv" -version = "2.0.0" -description = "NixOps 2.0" -authors = ["Adam Hoese <adam.hose@tweag.io>"] - -[tool.poetry.dependencies] -python = "^3.10" -nixops = {git = "https://github.com/NixOS/nixops.git"} -nixops-aws = {git = "https://github.com/NixOS/nixops-aws.git"} -nixops-digitalocean = {git = "https://github.com/nix-community/nixops-digitalocean.git"} -nixops-encrypted-links = {git = "https://github.com/nix-community/nixops-encrypted-links.git"} -nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} -nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"} -nixops-hetzner = {git = "https://github.com/NixOS/nixops-hetzner"} -nixops-hetznercloud = {git = "https://github.com/lukebfox/nixops-hetznercloud.git"} -nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} -nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} - -# poetry lock would download an excessive number of wheels looking for a compatible version, so -# we pin a feasible range here. This does not represent a real constraint on the version and -# would be ok to remove/update/ignore in future upgrades. Note that a botocore wheel is about 50MB. -boto3 = "^1.26" -botocore = "^1.29" - -[build-system] -requires = ["poetry>=0.12"] -build-backend = "poetry.masonry.api" diff --git a/pkgs/applications/networking/cluster/nixops/shell.nix b/pkgs/applications/networking/cluster/nixops/shell.nix deleted file mode 100644 index a7926d0fd5333..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/shell.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs ? import <nixpkgs> { } }: - -pkgs.mkShell { - packages = [ - pkgs.python310 - pkgs.poetry2nix.cli - pkgs.pkg-config - pkgs.libvirt - pkgs.poetry - ]; -} diff --git a/pkgs/applications/networking/cluster/nixops/unwrapped.nix b/pkgs/applications/networking/cluster/nixops/unwrapped.nix new file mode 100644 index 0000000000000..c70da93046956 --- /dev/null +++ b/pkgs/applications/networking/cluster/nixops/unwrapped.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, unstableGitUpdater +, poetry-core +, sphinx +, pluggy +, prettytable +, typeguard +, typing-extensions +, nixosTests +}: + +buildPythonApplication rec { + pname = "nixops"; + version = "unstable-2023-10-26"; + pyproject = true; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nixops"; + rev = "2cfc2cb4fa9ecb89a4274574ff7f63ea61782498"; + hash = "sha256-4uvQQkERZFEeRJjMAcyLYJzNvH0rNiiJ+5BDQmD58gI="; + }; + + postPatch = '' + substituteInPlace nixops/args.py --replace "@version@" "${version}-pre-${lib.substring 0 7 src.rev or "dirty"}" + ''; + + nativeBuildInputs = [ + poetry-core + sphinx + ]; + + propagatedBuildInputs = [ + pluggy + prettytable + typeguard + typing-extensions + ]; + + postInstall = '' + doc_cache=$(mktemp -d) + sphinx-build -b man -d $doc_cache doc/ $out/share/man/man1 + + html=$(mktemp -d) + sphinx-build -b html -d $doc_cache doc/ $out/share/nixops/doc + ''; + + pythonImportsCheck = [ "nixops" ]; + + passthru = { + tests.nixops = nixosTests.nixops.unstable; + updateScript = unstableGitUpdater {}; + }; + + meta = with lib; { + description = "A tool for deploying to NixOS machines in a network or cloud"; + homepage = "https://github.com/NixOS/nixops"; + license = licenses.lgpl3Only; + maintainers = with lib.maintainers; [ adisbladis aminechikhaoui roberth ]; + platforms = lib.platforms.unix; + mainProgram = "nixops"; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/update b/pkgs/applications/networking/cluster/nixops/update deleted file mode 100755 index 1d1fd93fdbeaa..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/update +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../../. -i bash -set -eux - -rm -f ./poetry.lock ./poetry-git-overlay.nix - -poetry lock - -# builtins.fetchGit is disabled in restricted eval -# Pin fixed-output derivations from lock file -poetry2nix lock diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index 823fdfb434d72..bf028f30f7493 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-z+JwtrP3WGMK11RRYrDig5SrX6YCj7U3AwuLg/J8dgs="; + sha256 = "sha256-Nhm2dLEFI+fAJ2lLE9z+3Qug3bbsoiRjex89Pa9oAVQ="; }; subPackages = "cmd/pinniped"; - vendorHash = "sha256-QywpqgQj76x0zmn4eC74fy7UECK4K81WO+nxOYKZqq0="; + vendorHash = "sha256-4y513BkV3EYgqlim2eXw02m36wtUVQeegmQiMZ3HyWg="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 65cddcbc34d4b..1cf21e63a1342 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.52.3"; + version = "0.53.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o/4L7TBdFFHuPOKAO/wP0IBixQtZHGr1GSNlsEpq710="; + hash = "sha256-Y3the1+p+ZAkPxKnScNIup7cfyTtE2LU3IdghA0mOY8="; }; - vendorHash = "sha256-RmzSKt5qt9Qb4GDrfs4dJEhGQW/jFbXPn+AOLzEyo6c="; + vendorHash = "sha256-5O3souGEosqLFxZpGbak4r57V39lR6X8mEPgfad3X5Q="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/applications/networking/cluster/terranix/default.nix index f1781cca3950d..2c42ac08d0591 100644 --- a/pkgs/applications/networking/cluster/terranix/default.nix +++ b/pkgs/applications/networking/cluster/terranix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "terranix"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; rev = version; - sha256 = "sha256-pNuJxmVMGbBHw7pa+Bx0HY0orXIXoyyAXOKuQ1zpfus="; + sha256 = "sha256-xiUfVD6rtsVWFotVtUW3Q1nQh4obKzgvpN1wqZuGXvM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/tilt/assets.nix b/pkgs/applications/networking/cluster/tilt/assets.nix new file mode 100644 index 0000000000000..85645c2849d61 --- /dev/null +++ b/pkgs/applications/networking/cluster/tilt/assets.nix @@ -0,0 +1,53 @@ +{ lib +, stdenvNoCC +, version, src +, fetchYarnDeps +, fixup_yarn_lock, yarn, nodejs +}: + +stdenvNoCC.mkDerivation rec { + pname = "tilt-assets"; + + inherit src version; + + nativeBuildInputs = [ fixup_yarn_lock yarn nodejs ]; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/web/yarn.lock"; + hash = "sha256-UTxglGn3eIgahZg4kxolg2f2MTReCL4r/GyWNg4105E="; + }; + + configurePhase = '' + export HOME=$(mktemp -d)/yarn_home + ''; + + buildPhase = '' + runHook preBuild + + yarn config --offline set yarn-offline-mirror $yarnOfflineCache + + cd web + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-engines + patchShebangs node_modules + export PATH=$PWD/node_modules/.bin:$PATH + ./node_modules/.bin/react-scripts build + + mkdir -p $out + cd .. + + runHook postBuild + ''; + + installPhase = '' + cp -r web/build/* $out + ''; + + meta = with lib; { + description = "Assets needed for Tilt"; + homepage = "https://tilt.dev/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anton-dessiatov ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/cluster/tilt/binary.nix b/pkgs/applications/networking/cluster/tilt/binary.nix new file mode 100644 index 0000000000000..d326f0f92e806 --- /dev/null +++ b/pkgs/applications/networking/cluster/tilt/binary.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, src, version +, tilt-assets +}: + +buildGoModule rec { + pname = "tilt"; + /* Do not use "dev" as a version. If you do, Tilt will consider itself + running in development environment and try to serve assets from the + source tree, which is not there once build completes. */ + inherit src version; + + vendorHash = null; + + subPackages = [ "cmd/tilt" ]; + + ldflags = [ "-X main.version=${version}" ]; + + preBuild = '' + mkdir -p pkg/assets/build + cp -r ${tilt-assets}/* pkg/assets/build/ + ''; + + meta = { + description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; + homepage = "https://tilt.dev/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anton-dessiatov ]; + }; +} diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index dd95c6d939edc..646f0c9a0a3df 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -1,32 +1,20 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ fetchFromGitHub +, callPackage }: +let args = rec { + /* Do not use "dev" as a version. If you do, Tilt will consider itself + running in development environment and try to serve assets from the + source tree, which is not there once build completes. */ + version = "0.33.6"; -buildGoModule rec { - pname = "tilt"; - /* Do not use "dev" as a version. If you do, Tilt will consider itself - running in development environment and try to serve assets from the - source tree, which is not there once build completes. */ - version = "0.33.6"; + src = fetchFromGitHub { + owner = "tilt-dev"; + repo = "tilt"; + rev = "v${version}"; + hash = "sha256-WtE8ExUKFRtdYeg0+My/DB+L/qT+J1EaKHKChNjC5oI="; + }; + }; - src = fetchFromGitHub { - owner = "tilt-dev"; - repo = "tilt"; - rev = "v${version}"; - hash = "sha256-WtE8ExUKFRtdYeg0+My/DB+L/qT+J1EaKHKChNjC5oI="; - }; + tilt-assets = callPackage ./assets.nix args; +in callPackage ./binary.nix (args // { inherit tilt-assets; }) - vendorHash = null; - - subPackages = [ "cmd/tilt" ]; - - ldflags = [ "-X main.version=${version}" ]; - - meta = { - description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; - homepage = "https://tilt.dev/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ anton-dessiatov ]; - }; -} diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 5bd4b16762e6c..f15e6ac474e23 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-NrOdnsdKxobJkMUGxdWQyzqB+2fDCjvTjnIt5S9fL0U="; + sha256 = "sha256-qa/Ic3qi+CAW9h4W2G8x6UdxPC2SkrMLMJEcxN7eDGY="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-mPRBmCqyQWCbWArORXL9sF8B4AlXHtA7Zs9NZD0TqoE="; + vendorHash = "sha256-TisGl0kM4vMVh9vk6/mRVOaRm9yoTwKkPedTPqdySDY="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index eeb97e1b0f01b..3099df6e9f12b 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.29.2"; + version = "0.30.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-eSKoh1Ab2rzpOOHRi+FZ92ic92Q6bFpu1jYIPhmoqQc="; + hash = "sha256-bsUnwciJ+s3lkiVXD09xQx8EAhE964/JBeggVprwkTc="; }; - vendorHash = "sha256-p1QLNbkNlIwqHzLjGX5YGC2Xxu0nAjmMfGwKXhi9XkU="; + vendorHash = "sha256-Uu7U8tjpHe/OzbQREty0X6ik6JafzYdax2762BkGacw="; proxyVendor = true; preBuild = '' diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 12d9d560760d6..87f9c4bbc19ea 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "unstable-2023-09-16"; + version = "unstable-2023-10-22"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "d3cdbe480392dbab6ddc099d7d880378f6a13f26"; - hash = "sha256-noCwPhp5/wYt28TM1vvsXb0ewRMV/cMzu/zUD2b0YV4="; + rev = "afaa155b510881efae8a9c27d3453cedc3fbb3b5"; + hash = "sha256-9Ls8IF6DoLUbUqdwqD5ncp9p/HUnAl8eaYYjnIAJcw0="; }; - vendorHash = "sha256-5Y+SP374Bd8F2ABKEKRhTcGNhsFM77N5oC5wRN6AzKk="; + vendorHash = "sha256-11dbOoajCXMonNy9bXy4RiT9FLH/Sga4+eH5mUFDlNA="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 95c274ab88ad1..da654a6bdd392 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-R3fw5GLQUYZUX1kH6e0IRQ/I/IsFTOK6aP5h5QVU0Ps="; + sha256 = "sha256-tgXBsby9ML+m4b2hvLXHIb552o5x6l3kO8YTeZRCExI="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 743d73f7ce7ca..47a3b35f02561 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -8,6 +8,7 @@ let python = python3.override { # FlexGet doesn't support transmission-rpc>=5 yet # https://github.com/NixOS/nixpkgs/issues/258504 + # https://github.com/Flexget/Flexget/issues/3847 packageOverrides = self: super: { transmission-rpc = super.transmission-rpc.overridePythonAttrs (old: rec { version = "4.3.1"; @@ -23,7 +24,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.9.13"; + version = "3.9.16"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -31,7 +32,7 @@ python.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-7qHJqxKGHgj/Th513EfFbk5CLEAX24AtWJF2uS1dRLs="; + hash = "sha256-p92wiQ01NBFs5910wngkNHnE/mOfs9XnOLUEOyk9VpA="; }; postPatch = '' diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index 470dc77cad3c1..0727848f8a8ae 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -15,9 +15,16 @@ , makeDesktopItem }: +let + wxGTK32' = wxGTK32.overrideAttrs (old: { + configureFlags = old.configureFlags ++ [ + "--disable-exceptions" + ]; + }); +in stdenv.mkDerivation (finalAttrs: { pname = "freefilesync"; - version = "13.0"; + version = "13.1"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; @@ -26,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { rm -f $out tryDownload "$url" ''; - hash = "sha256-E0lYKNCVtkdnhI3NPx8828Fz6sfmIm18KSC0NSWgHfQ="; + hash = "sha256-xuJQOegmZHPsCmJU2akTD4nQh05M+rpnjQVEer33SCk="; }; sourceRoot = "."; @@ -63,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 libssh2 openssl - wxGTK32 + wxGTK32' ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 9c0a5ea086f8f..c8db9d33a2ce8 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-e80TExGDZkUUZdw/g4Wj9qrdCE/+RN0lfdqBBYY7t2k="; + hash = "sha256-YEfHX555qbDMbWx2MgJKQSaBK8IS9SrPXTyBPMfJ+ws="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index e4440b483595a..3922b95fbac2c 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "sha256-z8MpoXBDkZXXBw7FOH2Vzdp+trhqyF7HB7ntDp1Xaik="; + sha256 = "sha256-JCGYmtzuain0io9ycvcZ7b6VTWbC6G46Uuecrhd/iHw="; }; strictDeps = true; diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index bd5b0d904cc75..2f00e4de0c834 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,11 +11,11 @@ }: let pname = "beeper"; - version = "3.82.8"; + version = "3.83.13"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.82.8-build-231019pq0po3woq.AppImage"; - hash = "sha256-tXPmTpbzWU+sUJHhyP2lexcAb33YmJnRaxX08G4CTaE="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.83.13-build-231024j9x7ova5e.AppImage"; + hash = "sha256-ZuwPLYcVcjCCLdWSarY0oq0GUDiOrvNBgK/7ETb8OLg="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock index c0c7795d90b2b..0fe7233f63ad4 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock @@ -3,899 +3,930 @@ version = 3 [[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" - -[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", -] - -[[package]] name = "aho-corasick" -version = "1.1.1" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] -name = "android-tzdata" -version = "0.1.1" +name = "alloc-no-stdlib" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" [[package]] -name = "android_system_properties" -version = "0.1.5" +name = "alloc-stdlib" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" dependencies = [ - "libc", + "alloc-no-stdlib", ] [[package]] -name = "anes" -version = "0.1.6" +name = "anyhow" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] -name = "annotate-snippets" -version = "0.6.1" +name = "atk" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags", + "glib", + "libc", +] [[package]] -name = "annotate-snippets" -version = "0.9.1" +name = "atk-sys" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b9d411ecbaf79885c6df4d75fff75858d5995ff25385657a28af47e82f9c36" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" dependencies = [ - "unicode-width", - "yansi-term", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", ] [[package]] -name = "anstream" -version = "0.5.0" +name = "attohttpc" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", + "flate2", + "http", + "log", + "native-tls", + "serde", + "serde_json", + "serde_urlencoded", + "url", ] [[package]] -name = "anstyle" -version = "1.0.2" +name = "autocfg" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "anstyle-parse" -version = "0.2.1" +name = "base64" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -dependencies = [ - "utf8parse", -] +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] -name = "anstyle-query" -version = "1.0.0" +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[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.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" dependencies = [ - "windows-sys 0.48.0", + "generic-array", ] [[package]] -name = "anstyle-wincon" -version = "2.1.0" +name = "brotli" +version = "3.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" dependencies = [ - "anstyle", - "windows-sys 0.48.0", + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", ] [[package]] -name = "anyhow" -version = "1.0.75" +name = "brotli-decompressor" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] [[package]] -name = "argfile" -version = "0.1.6" +name = "bstr" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1287c4f82a41c5085e65ee337c7934d71ab43d5187740a81fb69129013f6a5f6" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ - "fs-err", - "os_str_bytes", + "memchr", ] [[package]] -name = "arrayvec" -version = "0.7.4" +name = "bumpalo" +version = "3.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] -name = "ascii-canvas" -version = "3.0.0" +name = "bytemuck" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] +checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" [[package]] -name = "assert_cmd" -version = "2.0.12" +name = "byteorder" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] -name = "autocfg" -version = "1.1.0" +name = "bytes" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] -name = "base64" -version = "0.21.3" +name = "cairo-rs" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] [[package]] -name = "bincode" -version = "1.3.3" +name = "cairo-sys-rs" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ - "serde", + "glib-sys", + "libc", + "system-deps 6.0.3", ] [[package]] -name = "bit-set" -version = "0.5.3" +name = "cargo_toml" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "aa0e3586af56b3bfa51fca452bd56e8dbbbd5d8d81cbf0b7e4e35b695b537eb8" dependencies = [ - "bit-vec", + "serde", + "toml", ] [[package]] -name = "bit-vec" -version = "0.6.3" +name = "cc" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] -name = "bitflags" -version = "1.3.2" +name = "cesu8" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] -name = "bitflags" -version = "2.4.0" +name = "cfb" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" +dependencies = [ + "byteorder", + "uuid 0.8.2", +] [[package]] -name = "bstr" -version = "1.6.2" +name = "cfg-expr" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" dependencies = [ - "memchr", - "regex-automata 0.3.8", - "serde", + "smallvec", ] [[package]] -name = "bumpalo" -version = "3.13.0" +name = "cfg-expr" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +dependencies = [ + "smallvec", +] [[package]] -name = "cachedir" -version = "0.3.0" +name = "cfg-if" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e236bf5873ea57ec2877445297f4da008916bfae51567131acfc54a073d694f3" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cinny" +version = "3.1.0" dependencies = [ - "tempfile", + "serde", + "serde_json", + "tauri", + "tauri-build", ] [[package]] -name = "cast" -version = "0.3.0" +name = "cocoa" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] [[package]] -name = "cc" -version = "1.0.83" +name = "cocoa-foundation" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" dependencies = [ + "bitflags", + "block", + "core-foundation", + "core-graphics-types", + "foreign-types", "libc", + "objc", ] [[package]] -name = "cfg-if" -version = "1.0.0" +name = "color_quant" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "chic" -version = "1.2.2" +name = "combine" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b5db619f3556839cb2223ae86ff3f9a09da2c5013be42bc9af08c9589bf70c" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "annotate-snippets 0.6.1", + "bytes", + "memchr", ] [[package]] -name = "chrono" -version = "0.4.31" +name = "convert_case" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets 0.48.5", -] +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] -name = "ciborium" -version = "0.2.1" +name = "core-foundation" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", + "core-foundation-sys", + "libc", ] [[package]] -name = "ciborium-io" -version = "0.2.1" +name = "core-foundation-sys" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] -name = "ciborium-ll" -version = "0.2.1" +name = "core-graphics" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "ciborium-io", - "half", + "bitflags", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", ] [[package]] -name = "clap" -version = "4.4.5" +name = "core-graphics-types" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" +checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "clap_builder", - "clap_derive", + "bitflags", + "core-foundation", + "foreign-types", + "libc", ] [[package]] -name = "clap_builder" -version = "4.4.5" +name = "cpufeatures" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", + "libc", ] [[package]] -name = "clap_complete" -version = "4.4.0" +name = "crc32fast" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "clap", + "cfg-if", ] [[package]] -name = "clap_complete_command" -version = "0.5.1" +name = "crossbeam-channel" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ - "clap", - "clap_complete", - "clap_complete_fig", - "clap_complete_nushell", + "cfg-if", + "crossbeam-utils", ] [[package]] -name = "clap_complete_fig" -version = "4.4.0" +name = "crossbeam-utils" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9bae21b3f6eb417ad3054c8b1094aa0542116eba4979b1b271baefbfa6b965" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ - "clap", - "clap_complete", + "cfg-if", ] [[package]] -name = "clap_complete_nushell" -version = "0.1.11" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "clap", - "clap_complete", + "generic-array", + "typenum", ] [[package]] -name = "clap_derive" -version = "4.4.2" +name = "cssparser" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" dependencies = [ - "heck", + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", "proc-macro2", "quote", - "syn 2.0.37", + "smallvec", + "syn", ] [[package]] -name = "clap_lex" -version = "0.5.1" +name = "cssparser-macros" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" +dependencies = [ + "quote", + "syn", +] [[package]] -name = "clearscreen" -version = "2.0.1" +name = "ctor" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f3f22f1a586604e62efd23f78218f3ccdecf7a33c4500db2d37d85a24fe994" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "nix", - "terminfo", - "thiserror", - "which", - "winapi", + "quote", + "syn", ] [[package]] -name = "codspeed" -version = "2.2.0" +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + +[[package]] +name = "darling" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3238416c10f19985b52a937c5b3efc3ed7efe8f7ae263d2aab29a09bca9f57" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "colored", - "libc", - "serde_json", + "darling_core", + "darling_macro", ] [[package]] -name = "codspeed-criterion-compat" -version = "2.2.0" +name = "darling_core" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecc18f65b942d2b033545bb3bd8430a23eecbbe53fad3b1342fb0e5514bca7b" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ - "codspeed", - "colored", - "criterion", + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", ] [[package]] -name = "colorchoice" -version = "1.0.0" +name = "darling_macro" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", + "syn", +] [[package]] -name = "colored" -version = "2.0.4" +name = "dbus" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +checksum = "6f8bcdd56d2e5c4ed26a529c5a9029f5db8290d433497506f958eae3be148eb6" dependencies = [ - "is-terminal", - "lazy_static", - "windows-sys 0.48.0", + "libc", + "libdbus-sys", + "winapi", ] [[package]] -name = "configparser" -version = "3.0.2" +name = "derive_more" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5458d9d1a587efaf5091602c59d299696a3877a439c8f6d461a2d3cce11df87a" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version 0.4.0", + "syn", +] [[package]] -name = "console" -version = "0.15.7" +name = "digest" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.0", + "block-buffer", + "crypto-common", ] [[package]] -name = "console_error_panic_hook" -version = "0.1.7" +name = "dirs-next" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" dependencies = [ "cfg-if", - "wasm-bindgen", + "dirs-sys-next", ] [[package]] -name = "console_log" -version = "1.0.0" +name = "dirs-sys-next" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ - "log", - "web-sys", + "libc", + "redox_users", + "winapi", ] [[package]] -name = "core-foundation-sys" -version = "0.8.4" +name = "dispatch" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] -name = "countme" -version = "3.0.1" +name = "dtoa" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" [[package]] -name = "crc32fast" -version = "1.3.2" +name = "dtoa-short" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" dependencies = [ - "cfg-if", + "dtoa", ] [[package]] -name = "criterion" -version = "0.5.1" +name = "dunce" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot", - "is-terminal", - "itertools 0.10.5", - "num-traits", - "once_cell", - "oorandom", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] +checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" [[package]] -name = "criterion-plot" -version = "0.5.0" +name = "embed_plist" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" [[package]] -name = "crossbeam-channel" -version = "0.5.8" +name = "encoding_rs" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ "cfg-if", - "crossbeam-utils", ] [[package]] -name = "crossbeam-deque" -version = "0.8.3" +name = "fastrand" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", + "instant", ] [[package]] -name = "crossbeam-epoch" -version = "0.9.15" +name = "field-offset" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", "memoffset", - "scopeguard", + "rustc_version 0.3.3", ] [[package]] -name = "crossbeam-utils" -version = "0.8.16" +name = "filetime" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" dependencies = [ "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.42.0", ] [[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "darling" -version = "0.20.3" +name = "flate2" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ - "darling_core", - "darling_macro", + "crc32fast", + "miniz_oxide", ] [[package]] -name = "darling_core" -version = "0.20.3" +name = "fnv" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.37", -] +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "darling_macro" -version = "0.20.3" +name = "foreign-types" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "darling_core", - "quote", - "syn 2.0.37", + "foreign-types-shared", ] [[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difflib" -version = "0.4.0" +name = "foreign-types-shared" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "dirs" -version = "4.0.0" +name = "form_urlencoded" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "dirs-sys 0.3.7", + "percent-encoding", ] [[package]] -name = "dirs" -version = "5.0.1" +name = "futf" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" dependencies = [ - "dirs-sys 0.4.1", + "mac", + "new_debug_unreachable", ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "futures-channel" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ - "cfg-if", - "dirs-sys-next", + "futures-core", ] [[package]] -name = "dirs-sys" -version = "0.3.7" +name = "futures-core" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] -name = "dirs-sys" -version = "0.4.1" +name = "futures-executor" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", + "futures-core", + "futures-task", + "futures-util", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "futures-io" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] -name = "doc-comment" -version = "0.3.3" +name = "futures-macro" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] -name = "drop_bomb" -version = "0.1.5" +name = "futures-task" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] -name = "dyn-clone" -version = "1.0.13" +name = "futures-util" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] [[package]] -name = "either" -version = "1.9.0" +name = "fxhash" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] [[package]] -name = "ena" -version = "0.14.2" +name = "gdk" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" dependencies = [ - "log", + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", ] [[package]] -name = "encode_unicode" -version = "0.3.6" +name = "gdk-pixbuf" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] [[package]] -name = "env_logger" -version = "0.10.0" +name = "gdk-pixbuf-sys" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", ] [[package]] -name = "equivalent" -version = "1.0.1" +name = "gdk-sys" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.0.3", +] [[package]] -name = "errno" -version = "0.3.3" +name = "gdkx11-sys" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" dependencies = [ - "errno-dragonfly", + "gdk-sys", + "glib-sys", "libc", - "windows-sys 0.48.0", + "system-deps 6.0.3", + "x11", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "generator" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e" dependencies = [ "cc", "libc", + "log", + "rustversion", + "windows 0.39.0", ] [[package]] -name = "fastrand" -version = "2.0.0" +name = "generic-array" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] [[package]] -name = "fern" -version = "0.6.2" +name = "getrandom" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "log", + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] -name = "filetime" -version = "0.2.22" +name = "getrandom" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] -name = "fixedbitset" -version = "0.4.2" +name = "gio" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flake8-to-ruff" -version = "0.0.292" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" dependencies = [ - "anyhow", - "clap", - "colored", - "configparser", - "itertools 0.11.0", - "log", + "bitflags", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", "once_cell", - "pep440_rs", - "pretty_assertions", - "regex", - "ruff_linter", - "ruff_workspace", - "rustc-hash", - "serde", - "serde_json", - "strum", - "strum_macros", - "toml", + "thiserror", ] [[package]] -name = "flate2" -version = "1.0.27" +name = "gio-sys" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" dependencies = [ - "crc32fast", - "miniz_oxide", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", + "winapi", ] [[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.0" +name = "glib" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" dependencies = [ - "percent-encoding", + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", ] [[package]] -name = "fs-err" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" - -[[package]] -name = "fsevent-sys" -version = "4.1.0" +name = "glib-macros" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" dependencies = [ - "libc", + "anyhow", + "heck 0.4.0", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "getrandom" -version = "0.2.10" +name = "glib-sys" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ - "cfg-if", - "js-sys", "libc", - "wasi", - "wasm-bindgen", + "system-deps 6.0.3", ] [[package]] name = "glob" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" dependencies = [ "aho-corasick", "bstr", @@ -905,10 +936,70 @@ dependencies = [ ] [[package]] -name = "half" -version = "1.8.2" +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.0.3", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags", + "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 = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +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.0.3", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] [[package]] name = "hashbrown" @@ -917,56 +1008,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "hashbrown" -version = "0.14.0" +name = "heck" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "heck" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] [[package]] -name = "hexf-parse" -version = "0.2.1" +name = "html5ever" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn", +] [[package]] -name = "humantime" -version = "2.1.0" +name = "http" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.4", +] [[package]] -name = "iana-time-zone" -version = "0.1.57" +name = "http-range" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" [[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" +name = "ico" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" dependencies = [ - "cc", + "byteorder", + "png", ] [[package]] @@ -977,9 +1080,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -987,10 +1090,11 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" dependencies = [ + "crossbeam-utils", "globset", "lazy_static", "log", @@ -1003,495 +1107,577 @@ dependencies = [ ] [[package]] -name = "imara-diff" -version = "0.1.5" +name = "image" +version = "0.24.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8" +checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" dependencies = [ - "ahash", - "hashbrown 0.12.3", + "bytemuck", + "byteorder", + "color_quant", + "num-rational", + "num-traits", ] [[package]] -name = "imperative" -version = "1.0.5" +name = "indexmap" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b70798296d538cdaa6d652941fcc795963f8b9878b9e300c9fab7a522bd2fc0" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ - "phf", - "rust-stemmers", + "autocfg", + "hashbrown", ] [[package]] -name = "indexmap" -version = "2.0.0" +name = "infer" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" dependencies = [ - "equivalent", - "hashbrown 0.14.0", - "serde", + "cfb", ] [[package]] -name = "indicatif" -version = "0.17.7" +name = "instant" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", - "vt100", + "cfg-if", ] [[package]] -name = "indoc" -version = "2.0.4" +name = "itoa" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] -name = "inotify" -version = "0.9.6" +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", + "bitflags", + "glib", + "javascriptcore-rs-sys", ] [[package]] -name = "inotify-sys" -version = "0.1.5" +name = "javascriptcore-rs-sys" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" dependencies = [ + "glib-sys", + "gobject-sys", "libc", + "system-deps 5.0.0", ] [[package]] -name = "insta" -version = "1.33.0" +name = "jni" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" dependencies = [ - "console", - "globset", - "lazy_static", - "linked-hash-map", - "regex", - "serde", - "similar", + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", "walkdir", - "yaml-rust", ] [[package]] -name = "insta-cmd" -version = "0.4.0" +name = "jni-sys" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809d3023d1d6e8d5c2206f199251f75cb26180e41f18cb0f22dd119161cb5127" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" dependencies = [ - "insta", - "serde", - "serde_json", + "wasm-bindgen", ] [[package]] -name = "instant" -version = "0.1.12" +name = "json-patch" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce" dependencies = [ - "cfg-if", + "serde", + "serde_json", + "treediff", ] [[package]] -name = "is-macro" -version = "0.3.0" +name = "kuchiki" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" +checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" dependencies = [ - "Inflector", - "pmutil 0.6.1", - "proc-macro2", - "quote", - "syn 2.0.37", + "cssparser", + "html5ever", + "matches", + "selectors", ] [[package]] -name = "is-terminal" -version = "0.4.9" +name = "lazy_static" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libappindicator" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.48.0", + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", ] [[package]] -name = "itertools" -version = "0.10.5" +name = "libappindicator-sys" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" dependencies = [ - "either", + "gtk-sys", + "libloading", + "once_cell", ] [[package]] -name = "itertools" -version = "0.11.0" +name = "libc" +version = "0.2.138" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" + +[[package]] +name = "libdbus-sys" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" dependencies = [ - "either", + "pkg-config", ] [[package]] -name = "itoa" -version = "1.0.9" +name = "libloading" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] [[package]] -name = "js-sys" -version = "0.3.64" +name = "line-wrap" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" dependencies = [ - "wasm-bindgen", + "safemem", ] [[package]] -name = "kqueue" -version = "1.0.8" +name = "lock_api" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ - "kqueue-sys", - "libc", + "autocfg", + "scopeguard", ] [[package]] -name = "kqueue-sys" -version = "1.0.4" +name = "log" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "bitflags 1.3.2", - "libc", + "cfg-if", ] [[package]] -name = "lalrpop" -version = "0.20.0" +name = "loom" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" dependencies = [ - "ascii-canvas", - "bit-set", - "diff", - "ena", - "is-terminal", - "itertools 0.10.5", - "lalrpop-util", - "petgraph", - "regex", - "regex-syntax 0.7.5", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", ] [[package]] -name = "lalrpop-util" -version = "0.20.0" +name = "mac" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] -name = "lazy_static" -version = "1.4.0" +name = "mac-notification-sys" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] [[package]] -name = "lexical-parse-float" -version = "0.8.5" +name = "malloc_buf" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", + "libc", ] [[package]] -name = "lexical-parse-integer" -version = "0.8.6" +name = "markup5ever" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ - "lexical-util", - "static_assertions", + "log", + "phf 0.8.0", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", ] [[package]] -name = "lexical-util" -version = "0.8.5" +name = "matchers" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "static_assertions", + "regex-automata", ] [[package]] -name = "libc" -version = "0.2.147" +name = "matches" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] -name = "libcst" -version = "0.1.0" -source = "git+https://github.com/Instagram/LibCST.git?rev=03179b55ebe7e916f1722e18e8f0b87c01616d1f#03179b55ebe7e916f1722e18e8f0b87c01616d1f" +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "chic", - "libcst_derive", - "memchr", - "paste", - "peg", - "regex", - "thiserror", + "autocfg", ] [[package]] -name = "libcst_derive" -version = "0.1.0" -source = "git+https://github.com/Instagram/LibCST.git?rev=03179b55ebe7e916f1722e18e8f0b87c01616d1f#03179b55ebe7e916f1722e18e8f0b87c01616d1f" +name = "minisign-verify" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ - "quote", - "syn 1.0.109", + "adler", ] [[package]] -name = "libmimalloc-sys" -version = "0.1.35" +name = "native-tls" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ - "cc", + "lazy_static", "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", ] [[package]] -name = "linked-hash-map" -version = "0.5.6" +name = "ndk" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] [[package]] -name = "linux-raw-sys" -version = "0.4.5" +name = "ndk-context" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] -name = "lock_api" -version = "0.4.10" +name = "ndk-sys" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" dependencies = [ - "autocfg", - "scopeguard", + "jni-sys", ] [[package]] -name = "log" -version = "0.4.20" +name = "new_debug_unreachable" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] -name = "matchers" -version = "0.1.0" +name = "nodrop" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] -name = "matches" -version = "0.1.10" +name = "notify-rust" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" +checksum = "5cc2e370356160e41aba3fd0fbac26d86a89ddd2ac4300c03de999a77cfa2509" +dependencies = [ + "dbus", + "mac-notification-sys", + "tauri-winrt-notification", +] [[package]] -name = "memchr" -version = "2.6.4" +name = "nu-ansi-term" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] [[package]] -name = "memoffset" -version = "0.9.0" +name = "num-integer" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", + "num-traits", ] [[package]] -name = "mimalloc" -version = "0.1.39" +name = "num-rational" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ - "libmimalloc-sys", + "autocfg", + "num-integer", + "num-traits", ] [[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" +name = "num-traits" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ - "adler", + "autocfg", ] [[package]] -name = "mio" -version = "0.8.8" +name = "num_cpus" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ + "hermit-abi", "libc", - "log", - "wasi", - "windows-sys 0.48.0", ] [[package]] -name = "natord" -version = "1.0.9" +name = "num_enum" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +dependencies = [ + "num_enum_derive", +] [[package]] -name = "new_debug_unreachable" -version = "1.0.4" +name = "num_enum_derive" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] [[package]] -name = "nextest-workspace-hack" -version = "0.1.0" +name = "objc" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d906846a98739ed9d73d66e62c2641eef8321f1734b7a1156ab045a0248fb2b3" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] [[package]] -name = "nix" -version = "0.26.4" +name = "objc-foundation" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", + "block", + "objc", + "objc_id", ] [[package]] -name = "nom" -version = "7.1.3" +name = "objc_exception" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" dependencies = [ - "memchr", - "minimal-lexical", + "cc", ] [[package]] -name = "notify" -version = "6.1.1" +name = "objc_id" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" dependencies = [ - "bitflags 2.4.0", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "walkdir", - "windows-sys 0.48.0", + "objc", ] [[package]] -name = "nu-ansi-term" -version = "0.46.0" +name = "once_cell" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "open" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" dependencies = [ - "overload", - "winapi", + "pathdiff", + "windows-sys 0.42.0", ] [[package]] -name = "num-traits" -version = "0.2.16" +name = "openssl" +version = "0.10.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" dependencies = [ - "autocfg", + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", ] [[package]] -name = "number_prefix" -version = "0.4.0" +name = "openssl-macros" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] -name = "once_cell" -version = "1.18.0" +name = "openssl-probe" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "oorandom" -version = "11.1.3" +name = "openssl-sys" +version = "0.9.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] [[package]] -name = "option-ext" -version = "0.2.0" +name = "os_info" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" +dependencies = [ + "log", + "serde", + "winapi", +] [[package]] -name = "os_str_bytes" -version = "6.5.1" +name = "os_pipe" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" +checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" dependencies = [ - "memchr", + "libc", + "windows-sys 0.42.0", ] [[package]] @@ -1501,6 +1687,31 @@ 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", + "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.0.3", +] + +[[package]] name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1512,40 +1723,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-sys 0.42.0", ] [[package]] name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "path-absolutize" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" -dependencies = [ - "path-dedot", -] - -[[package]] -name = "path-dedot" -version = "3.1.1" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" -dependencies = [ - "once_cell", -] +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" [[package]] name = "pathdiff" @@ -1554,156 +1747,162 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] -name = "peg" -version = "0.8.1" +name = "percent-encoding" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554" -dependencies = [ - "peg-macros", - "peg-runtime", -] +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] -name = "peg-macros" -version = "0.8.1" +name = "pest" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b" +checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" dependencies = [ - "peg-runtime", - "proc-macro2", - "quote", + "thiserror", + "ucd-trie", ] [[package]] -name = "peg-runtime" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" - -[[package]] -name = "pep440_rs" -version = "0.3.12" +name = "phf" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887f66cc62717ea72caac4f1eb4e6f392224da3ffff3f40ec13ab427802746d6" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "lazy_static", - "regex", - "serde", - "unicode-width", + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", ] [[package]] -name = "pep508_rs" -version = "0.2.1" +name = "phf" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0713d7bb861ca2b7d4c50a38e1f31a4b63a2e2df35ef1e5855cc29e108453e2" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "once_cell", - "pep440_rs", - "regex", - "serde", - "thiserror", - "tracing", - "unicode-width", - "url", + "phf_macros 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", ] [[package]] -name = "percent-encoding" -version = "2.3.0" +name = "phf_codegen" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] [[package]] -name = "petgraph" -version = "0.6.4" +name = "phf_generator" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "fixedbitset", - "indexmap", + "phf_shared 0.8.0", + "rand 0.7.3", ] [[package]] -name = "phf" -version = "0.11.2" +name = "phf_generator" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ - "phf_shared 0.11.2", + "phf_shared 0.10.0", + "rand 0.8.5", ] [[package]] -name = "phf_codegen" -version = "0.11.2" +name = "phf_macros" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" dependencies = [ - "phf_generator", - "phf_shared 0.11.2", + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "phf_generator" -version = "0.11.2" +name = "phf_macros" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" dependencies = [ - "phf_shared 0.11.2", - "rand", + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "phf_shared" -version = "0.10.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" dependencies = [ "siphasher", ] [[package]] name = "phf_shared" -version = "0.11.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ "siphasher", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] -name = "pmutil" -version = "0.5.3" +name = "pin-utils" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pmutil" -version = "0.6.1" +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "plist" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" +checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", + "base64", + "indexmap", + "line-wrap", + "serde", + "time", + "xml-rs", ] [[package]] -name = "portable-atomic" -version = "1.4.3" +name = "png" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +dependencies = [ + "bitflags", + "crc32fast", + "flate2", + "miniz_oxide", +] [[package]] name = "ppv-lite86" @@ -1718,41 +1917,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] -name = "predicates" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" -dependencies = [ - "anstyle", - "difflib", - "itertools 0.10.5", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.0" +name = "proc-macro-crate" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" dependencies = [ - "diff", - "yansi", + "once_cell", + "thiserror", + "toml", ] [[package]] @@ -1764,7 +1936,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", + "syn", "version_check", ] @@ -1780,57 +1952,50 @@ dependencies = [ ] [[package]] -name = "proc-macro2" -version = "1.0.67" +name = "proc-macro-hack" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" -dependencies = [ - "unicode-ident", -] +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] -name = "pyproject-toml" -version = "0.7.0" +name = "proc-macro2" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "569e259cd132eb8cec5df8b672d187c5260f82ad352156b5da9549d4472e64b0" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ - "indexmap", - "pep440_rs", - "pep508_rs", - "serde", - "toml", + "unicode-ident", ] [[package]] -name = "quick-junit" -version = "0.3.3" +name = "quick-xml" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf780b59d590c25f8c59b44c124166a2a93587868b619fb8f5b47fb15e9ed6d" +checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" dependencies = [ - "chrono", - "indexmap", - "nextest-workspace-hack", - "quick-xml", - "thiserror", - "uuid", + "memchr", ] [[package]] -name = "quick-xml" -version = "0.29.0" +name = "quote" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ - "memchr", + "proc-macro2", ] [[package]] -name = "quote" -version = "1.0.33" +name = "rand" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "proc-macro2", + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", ] [[package]] @@ -1840,8 +2005,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", - "rand_core", + "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", ] [[package]] @@ -1851,7 +2026,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core", + "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", ] [[package]] @@ -1860,45 +2044,43 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.8", ] [[package]] -name = "rayon" -version = "1.8.0" +name = "rand_hc" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "either", - "rayon-core", + "rand_core 0.5.1", ] [[package]] -name = "rayon-core" -version = "1.12.0" +name = "rand_pcg" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" dependencies = [ - "crossbeam-deque", - "crossbeam-utils", + "rand_core 0.5.1", ] [[package]] -name = "redox_syscall" -version = "0.2.16" +name = "raw-window-handle" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" dependencies = [ - "bitflags 1.3.2", + "cty", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -1907,21 +2089,20 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom", - "redox_syscall 0.2.16", + "getrandom 0.2.8", + "redox_syscall", "thiserror", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-syntax", ] [[package]] @@ -1930,1086 +2111,813 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.5", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "result-like" -version = "0.4.6" +name = "remove_dir_all" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc7ce6435c33898517a30e85578cd204cbb696875efb93dec19a2d31294f810" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "result-like-derive", + "winapi", ] [[package]] -name = "result-like-derive" -version = "0.4.6" +name = "rfd" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fabf0a2e54f711c68c50d49f648a1a8a37adcb57353f518ac4df374f0788f42" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" dependencies = [ - "pmutil 0.5.3", - "proc-macro2", - "quote", - "syn 1.0.109", - "syn-ext", + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "lazy_static", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.37.0", ] [[package]] -name = "ring" -version = "0.16.20" +name = "rustc_version" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", + "semver 0.11.0", ] [[package]] -name = "ruff_benchmark" -version = "0.0.0" +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "codspeed-criterion-compat", - "criterion", - "mimalloc", - "once_cell", - "ruff_linter", - "ruff_python_ast", - "ruff_python_formatter", - "ruff_python_index", - "ruff_python_parser", - "serde", - "serde_json", - "tikv-jemallocator", - "ureq", - "url", + "semver 1.0.14", ] [[package]] -name = "ruff_cache" -version = "0.0.0" -dependencies = [ - "filetime", - "glob", - "globset", - "itertools 0.11.0", - "regex", - "ruff_macros", - "seahash", -] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" [[package]] -name = "ruff_cli" -version = "0.0.292" -dependencies = [ - "annotate-snippets 0.9.1", - "anyhow", - "argfile", - "assert_cmd", - "bincode", - "bitflags 2.4.0", - "cachedir", - "chrono", - "clap", - "clap_complete_command", - "clearscreen", - "colored", - "filetime", - "glob", - "ignore", - "insta", - "insta-cmd", - "is-macro", - "itertools 0.11.0", - "itoa", - "log", - "mimalloc", - "notify", - "path-absolutize", - "rayon", - "regex", - "ruff_cache", - "ruff_diagnostics", - "ruff_formatter", - "ruff_linter", - "ruff_macros", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_formatter", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "ruff_workspace", - "rustc-hash", - "serde", - "serde_json", - "shellexpand", - "similar", - "strum", - "tempfile", - "test-case", - "thiserror", - "tikv-jemallocator", - "tracing", - "ureq", - "walkdir", - "wild", -] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] -name = "ruff_dev" -version = "0.0.0" -dependencies = [ - "anyhow", - "clap", - "ignore", - "imara-diff", - "indicatif", - "indoc", - "itertools 0.11.0", - "libcst", - "once_cell", - "pretty_assertions", - "rayon", - "regex", - "ruff_cli", - "ruff_diagnostics", - "ruff_formatter", - "ruff_linter", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_codegen", - "ruff_python_formatter", - "ruff_python_literal", - "ruff_python_parser", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_workspace", - "schemars", - "serde", - "serde_json", - "similar", - "strum", - "strum_macros", - "tempfile", - "toml", - "tracing", - "tracing-indicatif", - "tracing-subscriber", -] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] -name = "ruff_diagnostics" -version = "0.0.0" +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" dependencies = [ - "anyhow", - "log", - "ruff_text_size", - "serde", + "winapi-util", ] [[package]] -name = "ruff_formatter" -version = "0.0.0" +name = "schannel" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ - "drop_bomb", - "insta", - "ruff_cache", - "ruff_macros", - "ruff_text_size", - "rustc-hash", - "schemars", - "serde", - "static_assertions", - "tracing", - "unicode-width", + "lazy_static", + "windows-sys 0.36.1", ] [[package]] -name = "ruff_index" -version = "0.0.0" -dependencies = [ - "ruff_macros", - "static_assertions", -] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] -name = "ruff_linter" -version = "0.0.292" -dependencies = [ - "aho-corasick", - "annotate-snippets 0.9.1", - "anyhow", - "bitflags 2.4.0", - "chrono", - "clap", - "colored", - "fern", - "glob", - "globset", - "imperative", - "insta", - "is-macro", - "itertools 0.11.0", - "libcst", - "log", - "memchr", - "natord", - "once_cell", - "path-absolutize", - "pathdiff", - "pep440_rs", - "pretty_assertions", - "pyproject-toml", - "quick-junit", - "regex", - "result-like", - "ruff_cache", - "ruff_diagnostics", - "ruff_index", - "ruff_macros", - "ruff_notebook", - "ruff_python_ast", - "ruff_python_codegen", - "ruff_python_index", - "ruff_python_literal", - "ruff_python_parser", - "ruff_python_semantic", - "ruff_python_stdlib", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "schemars", - "semver", - "serde", - "serde_json", - "similar", - "smallvec", - "strum", - "strum_macros", - "tempfile", - "test-case", - "thiserror", - "toml", - "typed-arena", - "unicode-width", - "unicode_names2", - "wsl", -] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "ruff_macros" -version = "0.0.0" +name = "security-framework" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" dependencies = [ - "itertools 0.11.0", - "proc-macro2", - "quote", - "ruff_python_trivia", - "syn 2.0.37", + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", ] [[package]] -name = "ruff_notebook" -version = "0.0.0" +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" dependencies = [ - "anyhow", - "insta", - "itertools 0.11.0", - "once_cell", - "ruff_diagnostics", - "ruff_source_file", - "ruff_text_size", - "serde", - "serde_json", - "serde_with", - "test-case", - "thiserror", - "uuid", + "core-foundation-sys", + "libc", ] [[package]] -name = "ruff_python_ast" -version = "0.0.0" +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" dependencies = [ - "bitflags 2.4.0", - "insta", - "is-macro", - "itertools 0.11.0", - "memchr", - "once_cell", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "serde", + "bitflags", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen", + "precomputed-hash", + "servo_arc", "smallvec", - "static_assertions", + "thin-slice", ] [[package]] -name = "ruff_python_codegen" -version = "0.0.0" +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "once_cell", - "ruff_python_ast", - "ruff_python_literal", - "ruff_python_parser", - "ruff_source_file", + "semver-parser", ] [[package]] -name = "ruff_python_formatter" -version = "0.0.0" +name = "semver" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" dependencies = [ - "anyhow", - "bitflags 2.4.0", - "clap", - "countme", - "insta", - "itertools 0.11.0", - "memchr", - "once_cell", - "ruff_cache", - "ruff_formatter", - "ruff_macros", - "ruff_python_ast", - "ruff_python_index", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "schemars", "serde", - "serde_json", - "similar", - "smallvec", - "static_assertions", - "thiserror", - "tracing", - "unicode-width", -] - -[[package]] -name = "ruff_python_index" -version = "0.0.0" -dependencies = [ - "itertools 0.11.0", - "ruff_python_ast", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", -] - -[[package]] -name = "ruff_python_literal" -version = "0.0.0" -dependencies = [ - "bitflags 2.4.0", - "hexf-parse", - "is-macro", - "itertools 0.11.0", - "lexical-parse-float", - "rand", - "unic-ucd-category", -] - -[[package]] -name = "ruff_python_parser" -version = "0.0.0" -dependencies = [ - "anyhow", - "bitflags 2.4.0", - "insta", - "is-macro", - "itertools 0.11.0", - "lalrpop", - "lalrpop-util", - "ruff_python_ast", - "ruff_text_size", - "rustc-hash", - "static_assertions", - "tiny-keccak", - "unicode-ident", - "unicode_names2", -] - -[[package]] -name = "ruff_python_resolver" -version = "0.0.0" -dependencies = [ - "env_logger", - "insta", - "log", - "tempfile", ] [[package]] -name = "ruff_python_semantic" -version = "0.0.0" -dependencies = [ - "bitflags 2.4.0", - "is-macro", - "ruff_index", - "ruff_python_ast", - "ruff_python_parser", - "ruff_python_stdlib", - "ruff_source_file", - "ruff_text_size", - "rustc-hash", - "smallvec", -] - -[[package]] -name = "ruff_python_stdlib" -version = "0.0.0" +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" dependencies = [ - "unicode-ident", + "pest", ] [[package]] -name = "ruff_python_trivia" -version = "0.0.0" +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ - "insta", - "itertools 0.11.0", - "ruff_python_ast", - "ruff_python_parser", - "ruff_source_file", - "ruff_text_size", - "unicode-ident", + "serde_derive", ] [[package]] -name = "ruff_shrinking" -version = "0.1.0" +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ - "anyhow", - "clap", - "fs-err", - "regex", - "ruff_python_ast", - "ruff_python_parser", - "ruff_text_size", - "shlex", - "tracing", - "tracing-subscriber", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "ruff_source_file" -version = "0.0.0" +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ - "insta", - "memchr", - "once_cell", - "ruff_text_size", + "itoa 1.0.4", + "ryu", "serde", ] [[package]] -name = "ruff_text_size" -version = "0.0.0" +name = "serde_repr" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ - "schemars", - "serde", - "serde_test", - "static_assertions", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "ruff_wasm" -version = "0.0.0" +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ - "console_error_panic_hook", - "console_log", - "js-sys", - "log", - "ruff_diagnostics", - "ruff_formatter", - "ruff_linter", - "ruff_python_ast", - "ruff_python_codegen", - "ruff_python_formatter", - "ruff_python_index", - "ruff_python_parser", - "ruff_python_trivia", - "ruff_source_file", - "ruff_text_size", - "ruff_workspace", + "form_urlencoded", + "itoa 1.0.4", + "ryu", "serde", - "serde-wasm-bindgen", - "wasm-bindgen", - "wasm-bindgen-test", ] [[package]] -name = "ruff_workspace" -version = "0.0.0" +name = "serde_with" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ - "anyhow", - "colored", - "dirs 5.0.1", - "glob", - "globset", - "ignore", - "itertools 0.11.0", - "log", - "once_cell", - "path-absolutize", - "pep440_rs", - "regex", - "ruff_cache", - "ruff_formatter", - "ruff_linter", - "ruff_macros", - "ruff_python_ast", - "ruff_python_formatter", - "ruff_source_file", - "rustc-hash", - "schemars", "serde", - "shellexpand", - "strum", - "tempfile", - "toml", + "serde_with_macros", ] [[package]] -name = "rust-stemmers" -version = "1.2.0" +name = "serde_with_macros" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ - "serde", - "serde_derive", + "darling", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.10" +name = "serialize-to-javascript" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", + "serde", + "serde_json", + "serialize-to-javascript-impl", ] [[package]] -name = "rustls" -version = "0.21.7" +name = "serialize-to-javascript-impl" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "rustls-webpki" -version = "0.101.4" +name = "servo_arc" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" dependencies = [ - "ring", - "untrusted", + "nodrop", + "stable_deref_trait", ] [[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.15" +name = "sha2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ - "winapi-util", + "cfg-if", + "cpufeatures", + "digest", ] [[package]] -name = "schemars" -version = "0.8.15" +name = "sharded-slab" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", + "lazy_static", ] [[package]] -name = "schemars_derive" -version = "0.8.15" +name = "shared_child" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.109", + "libc", + "winapi", ] [[package]] -name = "scoped-tls" -version = "1.0.1" +name = "siphasher" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] -name = "scopeguard" -version = "1.2.0" +name = "slab" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" dependencies = [ - "ring", - "untrusted", + "autocfg", ] [[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "semver" -version = "1.0.19" +name = "smallvec" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] -name = "serde" -version = "1.0.188" +name = "soup2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" dependencies = [ - "serde_derive", + "bitflags", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", ] [[package]] -name = "serde-wasm-bindgen" -version = "0.6.0" +name = "soup2-sys" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c9933e5689bd420dc6c87b7a1835701810cbc10cd86a26e4da45b73e6b1d78" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", + "bitflags", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", ] [[package]] -name = "serde_derive" -version = "1.0.188" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "serde_derive_internals" -version = "0.26.0" +name = "state" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "loom", ] [[package]] -name = "serde_json" -version = "1.0.107" +name = "string_cache" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" dependencies = [ - "itoa", - "ryu", + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", "serde", ] [[package]] -name = "serde_spanned" -version = "0.6.3" +name = "string_cache_codegen" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ - "serde", + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", ] [[package]] -name = "serde_test" -version = "1.0.176" +name = "strsim" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab" -dependencies = [ - "serde", -] +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "serde_with" -version = "3.3.0" +name = "strum" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" +checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" dependencies = [ - "serde", - "serde_with_macros", + "strum_macros", ] [[package]] -name = "serde_with_macros" -version = "3.3.0" +name = "strum_macros" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" +checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ - "darling", + "heck 0.3.3", "proc-macro2", "quote", - "syn 2.0.37", + "syn", ] [[package]] -name = "sharded-slab" -version = "0.1.4" +name = "syn" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ - "lazy_static", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] -name = "shellexpand" -version = "3.1.0" +name = "system-deps" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" dependencies = [ - "dirs 5.0.1", + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml", + "version-compare 0.0.11", ] [[package]] -name = "shlex" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" - -[[package]] -name = "similar" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "smallvec" -version = "1.11.1" +name = "system-deps" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +dependencies = [ + "cfg-expr 0.11.0", + "heck 0.4.0", + "pkg-config", + "toml", + "version-compare 0.1.1", +] [[package]] -name = "string_cache" -version = "0.8.7" +name = "tao" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +checksum = "a1fa15735311b4816d030ff54da58560b047daca0970e1031aed5502e84231a8" dependencies = [ - "new_debug_unreachable", + "bitflags", + "cairo-rs", + "cc", + "cocoa", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dirs-next", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libappindicator", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", "once_cell", "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", + "paste", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "unicode-segmentation", + "uuid 1.2.2", + "windows 0.39.0", + "windows-implement", + "x11-dl", ] [[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.25.0" +name = "tar" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" dependencies = [ - "strum_macros", + "filetime", + "libc", + "xattr", ] [[package]] -name = "strum_macros" -version = "0.25.2" +name = "tauri" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "5b48820ee3bb6a5031a83b2b6e11f8630bdc5a2f68cb841ab8ebc7a15a916679" dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.37", + "anyhow", + "attohttpc", + "base64", + "cocoa", + "dirs-next", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "glib", + "glob", + "gtk", + "heck 0.4.0", + "http", + "ignore", + "minisign-verify", + "notify-rust", + "objc", + "once_cell", + "open", + "os_info", + "os_pipe", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "regex", + "rfd", + "semver 1.0.14", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "shared_child", + "state", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "time", + "tokio", + "url", + "uuid 1.2.2", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip", ] [[package]] -name = "syn" -version = "1.0.109" +name = "tauri-build" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "8807c85d656b2b93927c19fe5a5f1f1f348f96c2de8b90763b3c2d561511f9b4" dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", + "anyhow", + "cargo_toml", + "heck 0.4.0", + "json-patch", + "semver 1.0.14", + "serde_json", + "tauri-utils", + "winres", ] [[package]] -name = "syn" -version = "2.0.37" +name = "tauri-codegen" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" dependencies = [ + "base64", + "brotli", + "ico", + "json-patch", + "plist", + "png", "proc-macro2", "quote", - "unicode-ident", + "regex", + "semver 1.0.14", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time", + "uuid 1.2.2", + "walkdir", ] [[package]] -name = "syn-ext" -version = "0.4.0" +name = "tauri-macros" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b86cb2b68c5b3c078cac02588bc23f3c04bb828c5d3aedd17980876ec6a7be6" +checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" dependencies = [ - "syn 1.0.109", + "heck 0.4.0", + "proc-macro2", + "quote", + "syn", + "tauri-codegen", + "tauri-utils", ] [[package]] -name = "tempfile" -version = "3.8.0" +name = "tauri-runtime" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b" dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.0", + "gtk", + "http", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "uuid 1.2.2", + "webview2-com", + "windows 0.39.0", ] [[package]] -name = "term" -version = "0.7.0" +name = "tauri-runtime-wry" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30" dependencies = [ - "dirs-next", - "rustversion", - "winapi", + "cocoa", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid 1.2.2", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "tauri-utils" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "5abbc109a6eb45127956ffcc26ef0e875d160150ac16cfa45d26a6b2871686f1" dependencies = [ - "winapi-util", + "brotli", + "ctor", + "glob", + "heck 0.4.0", + "html5ever", + "infer", + "json-patch", + "kuchiki", + "memchr", + "phf 0.10.1", + "proc-macro2", + "quote", + "semver 1.0.14", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows 0.39.0", ] [[package]] -name = "terminfo" -version = "0.8.0" +name = "tauri-winrt-notification" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" +checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b" dependencies = [ - "dirs 4.0.0", - "fnv", - "nom", - "phf", - "phf_codegen", + "quick-xml", + "strum", + "windows 0.39.0", ] [[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "test-case" -version = "3.2.1" +name = "tempfile" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "test-case-macros", + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", ] [[package]] -name = "test-case-core" -version = "3.2.1" +name = "tendril" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" dependencies = [ - "cfg-if", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.37", + "futf", + "mac", + "utf-8", ] [[package]] -name = "test-case-macros" -version = "3.2.1" +name = "thin-slice" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.37", - "test-case-core", -] +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ - "cfg-if", "once_cell", ] [[package]] -name = "tikv-jemalloc-sys" -version = "0.5.4+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.5.4" +name = "time" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ - "libc", - "tikv-jemalloc-sys", + "itoa 1.0.4", + "serde", + "time-core", + "time-macros", ] [[package]] -name = "tiny-keccak" -version = "2.0.2" +name = "time-core" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] -name = "tinytemplate" -version = "1.2.1" +name = "time-macros" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" dependencies = [ - "serde", - "serde_json", + "time-core", ] [[package]] @@ -3023,42 +2931,31 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "toml" -version = "0.7.8" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] -name = "toml_datetime" -version = "0.6.3" +name = "tokio" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" dependencies = [ - "serde", + "autocfg", + "bytes", + "memchr", + "num_cpus", + "pin-project-lite", + "windows-sys 0.42.0", ] [[package]] -name = "toml_edit" -version = "0.19.15" +name = "toml" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ - "indexmap", "serde", - "serde_spanned", - "toml_datetime", - "winnow", ] [[package]] @@ -3068,7 +2965,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3076,38 +2972,26 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", "valuable", ] [[package]] -name = "tracing-indicatif" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e05fe4a1c906d94b275d8aeb8ff8b9deaca502aeb59ae8ab500a92b8032ac8" -dependencies = [ - "indicatif", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] name = "tracing-log" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3120,9 +3004,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ "matchers", "nu-ansi-term", @@ -3137,64 +3021,37 @@ dependencies = [ ] [[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "unic-char-property" -version = "0.9.0" +name = "treediff" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff" dependencies = [ - "unic-char-range", + "serde_json", ] [[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" +name = "typenum" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0" -dependencies = [ - "matches", - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] -name = "unic-ucd-version" -version = "0.9.0" +name = "ucd-trie" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "unicode-normalization" @@ -3206,52 +3063,16 @@ dependencies = [ ] [[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" +name = "unicode-segmentation" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_names2" -version = "0.6.0" -source = "git+https://github.com/youknowone/unicode_names2.git?rev=4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" -dependencies = [ - "phf", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" -dependencies = [ - "base64", - "flate2", - "log", - "once_cell", - "rustls", - "rustls-webpki", - "url", - "webpki-roots", -] +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" [[package]] name = "url" -version = "2.4.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", @@ -3260,32 +3081,24 @@ dependencies = [ ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "utf-8" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.4.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" -dependencies = [ - "getrandom", - "rand", - "uuid-macro-internal", - "wasm-bindgen", -] +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] -name = "uuid-macro-internal" -version = "1.4.1" +name = "uuid" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", + "getrandom 0.2.8", ] [[package]] @@ -3295,74 +3108,57 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] -name = "version_check" -version = "0.9.4" +name = "vcpkg" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] -name = "vt100" -version = "0.15.2" +name = "version-compare" +version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de" -dependencies = [ - "itoa", - "log", - "unicode-width", - "vte", -] - -[[package]] -name = "vte" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" -dependencies = [ - "arrayvec", - "utf8parse", - "vte_generate_state_changes", -] +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" [[package]] -name = "vte_generate_state_changes" +name = "version-compare" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] -name = "wait-timeout" -version = "0.2.0" +name = "version_check" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", + "winapi", "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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3370,24 +3166,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ "cfg-if", "js-sys", @@ -3397,9 +3193,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3407,81 +3203,116 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] -name = "wasm-bindgen-test" -version = "0.3.37" +name = "web-sys" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" dependencies = [ - "console_error_panic_hook", "js-sys", - "scoped-tls", "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", ] [[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.37" +name = "webkit2gtk" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" dependencies = [ - "proc-macro2", - "quote", + "bitflags", + "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 = "web-sys" -version = "0.3.64" +name = "webkit2gtk-sys" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" dependencies = [ - "js-sys", - "wasm-bindgen", + "atk-sys", + "bitflags", + "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.0.3", ] [[package]] -name = "webpki-roots" -version = "0.25.2" +name = "webview2-com" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement", +] [[package]] -name = "which" -version = "4.4.0" +name = "webview2-com-macros" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" dependencies = [ - "either", - "libc", - "once_cell", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "wild" -version = "2.2.0" +name = "webview2-com-sys" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" dependencies = [ - "glob", + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", ] [[package]] @@ -3517,180 +3348,313 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" dependencies = [ - "windows-targets 0.48.5", + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", ] [[package]] -name = "windows-sys" -version = "0.45.0" +name = "windows" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" dependencies = [ - "windows-targets 0.42.2", + "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-sys" -version = "0.48.0" +name = "windows-bindgen" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" dependencies = [ - "windows-targets 0.48.5", + "windows-metadata", + "windows-tokens", ] [[package]] -name = "windows-targets" -version = "0.42.2" +name = "windows-implement" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" 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", + "syn", + "windows-tokens", ] [[package]] -name = "windows-targets" -version = "0.48.5" +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.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" 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", + "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_aarch64_gnullvm" -version = "0.42.2" +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows-tokens" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[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" -version = "0.42.2" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[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" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" +name = "windows_x86_64_gnu" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" [[package]] -name = "winnow" -version = "0.5.15" +name = "windows_x86_64_msvc" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "winres" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" dependencies = [ - "memchr", + "toml", ] [[package]] -name = "wsl" -version = "0.1.0" +name = "wry" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4" +checksum = "9ae300cf3ac1abd15037d0956d25d084077c8d67a075d7ef6971426a04f6fdd1" +dependencies = [ + "base64", + "block", + "cocoa", + "core-graphics", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http", + "kuchiki", + "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 = "yaml-rust" -version = "0.4.5" +name = "x11" +version = "2.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "c2638d5b9c17ac40575fb54bb461a4b1d2a8d1b4ffcc4ff237d254ec59ddeb82" dependencies = [ - "linked-hash-map", + "libc", + "pkg-config", ] [[package]] -name = "yansi" -version = "0.5.1" +name = "x11-dl" +version = "2.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" +dependencies = [ + "lazy_static", + "libc", + "pkg-config", +] [[package]] -name = "yansi-term" -version = "0.1.2" +name = "xattr" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" dependencies = [ - "winapi", + "libc", +] + +[[package]] +name = "xml-rs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" + +[[package]] +name = "zip" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", ] diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 2dbe74d3b34e7..9777dca11c59f 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -9,28 +9,37 @@ , dbus , glib , glib-networking +, libayatana-appindicator , webkitgtk , makeDesktopItem }: rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; - version = "2.2.6"; + version = "3.1.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; rev = "v${version}"; - hash = "sha256-RW6LeItIAHJk1e7qMa1MLIGb3jHvJ/KM8E9l1qR48w8="; + hash = "sha256-v5D0/EHVQ2xo7TGo+jZoRDBVFczkaZu2ka6QpwV4dpw="; }; sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-Iab/icQ9hFVh/o6egZVPa2zeKgO5WxzkluhRckcayvw="; + # modififying $cargoDepsCopy requires the lock to be vendored + cargoLock.lockFile = ./Cargo.lock; - postPatch = '' + postPatch = let + cinny' = + assert lib.assertMsg (cinny.version == version) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; + cinny; + in '' substituteInPlace tauri.conf.json \ - --replace '"distDir": "../cinny/dist",' '"distDir": "${cinny}",' + --replace '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",' + + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" ''; postInstall = '' @@ -50,6 +59,7 @@ rustPlatform.buildRustPackage rec { dbus glib glib-networking + libayatana-appindicator webkitgtk ]; @@ -67,7 +77,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Yet another matrix client for desktop"; homepage = "https://github.com/cinnyapp/cinny-desktop"; - maintainers = [ maintainers.aveltras ]; + maintainers = [ ]; license = licenses.agpl3Only; platforms = platforms.linux; mainProgram = "cinny"; diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index ae8bc922bb468..db3b48e4a2a37 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -18,16 +18,16 @@ let in buildNpmPackage rec { pname = "cinny"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-BFovEmT4RgdzlSYi1p0324PW7+2rvw3n5+jKWTV2FF4="; + hash = "sha256-GcygxK9NcGlv4rwxQCJqi0BhNlOTFxjGB8mbfTaBMOk="; }; - npmDepsHash = "sha256-E+VBs66chBeiK40DZZ1hWTTISKaBN1RA+Uyr1iHqfus="; + npmDepsHash = "sha256-4R+To2LhcnEM9x1noo6MhCckyBKgPWiAi7zgDqAmaN0="; nativeBuildInputs = [ jq diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index 0439a1d2eb919..61a85ae4f7c3d 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -6,13 +6,13 @@ let aarch64-linux = "arm64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - amd64-linux_hash = "sha256-Oai5z6/CE/R2rH9LBVhY7eaKpF8eIIYI+3vjJPbq+rw="; - arm64-linux_hash = "sha256-bRJTktwnyZgCow8oRZNhTK8FgOhIcjrbESVlYfeaa8E="; + amd64-linux_hash = "sha256-ZCyAz+XVp2NJVUuMWyv5ubjMaoYBsjPAye/1vO2jv/w="; + arm64-linux_hash = "sha256-prdVwEn6eynzjLQ+aw2CS4PJ/JgG4QFKs9WDbzjV5oo="; }."${arch}-linux_hash"; in mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.4.1"; + version = "6.6.0"; 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/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 2f065612c08f7..74b34d4d3e980 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - sha256 = "sha256-9CtE29bcE4CIWZmwSbSa/MxuDdwn0vlQT0wOYAoNkcg="; + sha256 = "sha256-6fnO/e5lFrY5t2sCbrrYHck29NKt2Y+FH0N2cxunvZs="; }; desktopItem = (makeDesktopItem { @@ -31,6 +31,8 @@ appimageTools.wrapType2 { install -Dm644 ${desktopItem}/share/applications/* $out/share/applications ''; + extraPkgs = pkgs: with pkgs; [ procps ]; + meta = with lib; { description = "Workspace Simplifier - a cross-platform application organizing web services into Workspaces similar to browser profiles"; homepage = "https://rambox.app"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d6118db16f3c5..d0c3a2145aac8 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.34.1"; - hash = "sha256-1kffRXPQmtxIsLZVOgPXDnxUmY59q+1umy25cditRhw="; + version = "6.36.0"; + hash = "sha256-zoeRBBu+eYWibpCUiyDOcDVKFQSRI+l1dZgUlESdUsk="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.35.0-beta.2"; - hash = "sha256-TgzqKGt3ojkjq+mIu0EtqXfnnZ/xulWjiuS5/0dlwIM="; + version = "6.36.0-beta.2"; + hash = "sha256-LOfKdyXosU0bJB35+TSszfHROPhLvMtngzy4zFeVVmI="; }; } diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index d4a8045d79c50..266c843931b64 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.105.0.208"; + version = "8.106.0.212"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-P1H9BSXHDmrE8x2kq4Mw5A7r2jVZGSHJh84Hn5EX2lk="; + sha256 = "sha256-TlqhCj5nyL8SEo3M6ahPLYOTDrEjHvxtu1qFSR8LtkM="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 2307c4db01e30..92fc2a96623ea 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -8,7 +8,7 @@ , nodejs , fetchYarnDeps , fixup_yarn_lock -, electron_24 +, electron , libpulseaudio , pipewire , alsa-utils @@ -52,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: { yarn --offline electron-builder \ --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ - -c.electronDist=${electron_24}/libexec/electron \ - -c.electronVersion=${electron_24.version} + -c.electronDist=${electron}/libexec/electron \ + -c.electronVersion=${electron.version} runHook postBuild ''; @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { popd # Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing - makeWrapper '${electron_24}/bin/electron' "$out/bin/teams-for-linux" \ + makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \ ${lib.optionalString stdenv.isLinux '' --prefix PATH : ${lib.makeBinPath [ alsa-utils which ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \ 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 edf88f542ad03..cbfcad3ed4db2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -1,6 +1,8 @@ { lib , fetchFromGitHub +, fetchurl , fetchpatch +, fetchpatch2 , callPackage , pkg-config , cmake @@ -26,6 +28,7 @@ , libopus , alsa-lib , libpulseaudio +, perlPackages , pipewire , range-v3 , tl-expected @@ -55,6 +58,7 @@ , libpsl , brotli , microsoft-gsl +, mm-common , rlottie , stdenv , nix-update-script @@ -73,17 +77,41 @@ let cxxStandard = "20"; }; }; + glibmm = glibmm_2_68.overrideAttrs (attrs: { + version = "2.78.0"; + src = fetchurl { + url = "mirror://gnome/sources/glibmm/2.78/glibmm-2.78.0.tar.xz"; + hash = "sha256-XS6HJWSZbwKgbYu6w2d+fDlK+LAN0VJq69R6+EKj71A="; + }; + patches = [ + # Revert "Glib, Gio: Add new API from glib 2.77.0" + (fetchpatch2 { + url = "https://github.com/GNOME/glibmm/commit/5b9032c0298cbb49c3ed90d5f71f2636751fa638.patch"; + revert = true; + hash = "sha256-UzrzIOnXh9pxuTDQsp6mnunDNNtc86hE9tCe1NgKsyo="; + }) + ]; + mesonFlags = [ + "-Dmaintainer-mode=true" + "-Dbuild-documentation=false" + ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ + mm-common + perlPackages.perl + perlPackages.XMLParser + ]; + }); in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.8.4"; + version = "4.11.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-DRVFngQ4geJx2/7pT1VJzkcBZnVGgDvcGGUr9r38gSU="; + hash = "sha256-tWUdSFr93plCuQkA8SE+GZeAyZcYPUoFd0sIOyEuobs="; }; patches = [ @@ -94,13 +122,6 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch"; hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y="; }) - # lib_base: Add missing include for Qt 6.6 - (fetchpatch { - url = "https://github.com/desktop-app/lib_base/commit/5ca91dbb811c84591780236abc31431e313faf39.patch"; - stripLen = 1; - extraPrefix = "Telegram/lib_base/"; - hash = "sha256-eZkyMnPaAmUFYXiCmPhLRTw2Xdx0lylY+UVOckCsiaA="; - }) ]; postPatch = '' @@ -150,7 +171,7 @@ stdenv.mkDerivation rec { range-v3 tl-expected hunspell - glibmm_2_68 + glibmm webkitgtk_6_0 jemalloc rnnoise 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 73437d73015f1..4853dc8b2cf2e 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 @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-08-15"; + version = "unstable-2023-10-17"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "0532942ac6176a66ef184fb728a4cbb02958fc0b"; - sha256 = "sha256-FcRXxu0Nc8qHQl8PoA92MeuhpV+vgl658uILEpmDy3A="; + rev = "be153adaa363b2b13242466ad5b7b87f61301639"; + sha256 = "sha256-/hZNMV+IG00YzxH66Gh/BW9JdGFfsfnM93eD6oB3tlI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 23bfb324c1ae7..952ca75bb6af8 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.1.0"; + version = "4.1.1"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-AwSC5bjw9pxr/Upja2+m12tkqeweF58auqNbGrONHhA="; + hash = "sha256-d0I4YU2OY+TT1ac6bLZA7Hb+BsyYK4eoySNlFXkndnU="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 @@ -90,10 +90,10 @@ let meta = { homepage = "https://weechat.org/"; changelog = "https://weechat.org/files/doc/weechat/ChangeLog-${version}.html"; - description = "A fast, light and extensible chat client"; + description = "Fast, light and extensible chat client"; longDescription = '' You can find more documentation as to how to customize this package - (eg. adding python modules for scripts that would require them, etc.) + (e.g. adding python modules for scripts that would require them, etc.) on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = lib.licenses.gpl3; diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix index 12a2437121a53..ea59ad817249a 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -3,21 +3,32 @@ , stdenv , fetchFromGitHub , rustPlatform +, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "notmuch-mailmover"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "michaeladler"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b2Q1JcXIp56Niv5kdPgQSM91e8hPPdyhWIG4f7kQn78="; + hash = "sha256-12eDCqer13GJS0YjJDleJbkP4o7kZfof6HlLG06qZW0="; }; + cargoHash = "sha256-B5VSkhY4nNXSG2SeCl22pSkl6SXEEoYj99wEsNhs/bQ="; + + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ notmuch ]; - cargoSha256 = "sha256-AW0mCdQN3WJhSErJ/MqnNIsRX+C6Pb/zHCQh7v/70MU="; + postInstall = '' + installManPage share/notmuch-mailmover.1 + installShellCompletion --cmd notmuch-mailmover \ + --bash share/notmuch-mailmover.bash \ + --fish share/notmuch-mailmover.fish \ + --zsh share/_notmuch-mailmover + ''; meta = with lib; { description = "Application to assign notmuch tagged mails to IMAP folders"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 20562e846346b..634e9ef358890 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "115.3.2"; + version = "115.4.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/af/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/af/thunderbird-115.4.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "abbdac387f40f5479e40b5818d646982330e9e71cfd97230aa7c1f1d4c015177"; + sha256 = "984a5d9cd2f6ae70548c8b0453b7a3e0b50c18723215c158d20694d89027c85b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/ar/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ar/thunderbird-115.4.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "fc9231f1439f205569d82b7ffa772f7812c0534382e2526a15d0cd66b46f101f"; + sha256 = "9faa60b0ac4fbf396f4124113832024324a927bd1ad01275b8b11df27c75d29e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/ast/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ast/thunderbird-115.4.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "18cb631b00f887fcd35efbb0b13d0db02ab2c0b35c51c53469f8cd9ab9909eb3"; + sha256 = "aa855f0d40993560f643c22d7781ce2587788e7e7f6aca1612180fe54dbdc11d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/be/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/be/thunderbird-115.4.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f10b82632a1ef6413872a0a8d11f3d7f6372f25650bca53048cc278b73eb64aa"; + sha256 = "654ddfb82edbfedd07a83947fe1d0c9d08456841cbaefc6abc042203bc25cd24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/bg/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/bg/thunderbird-115.4.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "75806d7a3e10b2677b3cdcabebded26158ed0e4656cee589c50d228074c3cf3b"; + sha256 = "59904cc762ff431031a9de37267bd1610a0adbc8adb2300b98636d7c2fb1e7fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/br/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/br/thunderbird-115.4.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f9826b6f79fe891a59dcd49c5e2831a4849c702408e2e166e6f6f4834b7e10d3"; + sha256 = "6fd568603e1672f415a3c96cb81491281156c4ab3c1c49a1b8798a1a7c3d92b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/ca/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ca/thunderbird-115.4.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "a3963a851f236189dfad601b00b06fd711aa4d618bf6f1e5ca8553237f462d4a"; + sha256 = "c1387f5c9b51c4a30269f72a65b6bb525e9c61db9c78bfd02e09ee8a3d94f250"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/cak/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/cak/thunderbird-115.4.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "34e678c45635c0125e672a8db7d80aca50d5f8348c1967a0f785f30d7da419c2"; + sha256 = "bfc5c46c935df1c6fe5c407b0b92adf35b00b31e3689ecefaefac59a0f7f9903"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/cs/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/cs/thunderbird-115.4.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "00b06a314f6df6f692531e1084ac57efe59ce0a8baec282c1424f8557cf10e76"; + sha256 = "3eeb5619ec3804fabe40c6a8c68df9a28f41dc40f250fb4ca0e825595825bb34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/cy/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/cy/thunderbird-115.4.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c22f9e68c37d15953efa2e7e971a1fe46701dab6eb8e57b4cd1399a4a76f239f"; + sha256 = "71e11762188bd2f4476b722e8ac8302792ef6d1b4c07eb54affbc1e161376fd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/da/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/da/thunderbird-115.4.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8f06b3e7a6b91dafc05451a5967785650b6c8f71eff9e5fe73470b99943f6729"; + sha256 = "108dd7e1910fe0773ba08250b7d6e09a63ae805b596da9ecdeb23c93cd25f4c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/de/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/de/thunderbird-115.4.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c4360ec6034747b17c26e892700a4665f46438d0fea312fc703a73e5135b5e33"; + sha256 = "8632aaec06d4f41403631c7d8a777c151aa2ca78c6342e49bbda1551316812c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/dsb/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/dsb/thunderbird-115.4.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "350a83d144fb2e0fee431ffda69a7724c0843797e741e65533f71e51362b29ba"; + sha256 = "20334b09cbdcf1ce0c9a7a3545283d69952976adc363856394209e34fd0802c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/el/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/el/thunderbird-115.4.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c13254b14a504002b04a84485494c34b1351c8a338b0d5116ec0b1d6283b6bfb"; + sha256 = "c519b753f81f92f437cfd4bb9d11423c69195ca4de6dfce227af4408f26d09f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/en-CA/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/en-CA/thunderbird-115.4.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "db9edc64ef4c3bd7b98267c1c29b442d59ceb3ba175f9fc204f6265014a79e5b"; + sha256 = "1a899fd1bbf89adc9e149cb16fccf46c1881ee1f36b75f62fd70f9af1db5faaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/en-GB/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/en-GB/thunderbird-115.4.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e5e3c2a6333e9407587c6dd5e24d9a6c3a47a7151673842f250c5fd2a6e7ab1b"; + sha256 = "156d6dcac9653b69875c751cad090d77adc35118df051ca5ce1cb384f28ff7a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/en-US/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/en-US/thunderbird-115.4.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "96d661adf9a4118e1b42cdbca9eedef180264140ebc0628d740132c231c15350"; + sha256 = "80f9534e18ab00956410374b800db21e7a79eab4f9e452b2a908b4e29d708f1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/es-AR/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/es-AR/thunderbird-115.4.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e5d6b055e1e1025a255bf772ac91db8bef8e3a73bb8e4eb666747b96a2ec1d08"; + sha256 = "606ce30a8f0005953791ba1a3c612809e1d875ebe1cc257afd4d6a0447ce557d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/es-ES/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/es-ES/thunderbird-115.4.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "d1aca735e7a50c9e3aa279e750667d4014ceb43c5cb5496ec9ec9bbd04e3df21"; + sha256 = "fa41210efdd8f7086db9fbebb54730079e555a3a316b3d5fea3fb015ad4696fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/es-MX/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/es-MX/thunderbird-115.4.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "826170d1a2f951fa8373b85b7862a3848126e7eea21dc30a04c1cd16e0c70b2b"; + sha256 = "d5d8c3e7daed458c0445cfb42d046e3d81f65b84f0510348d42f17651e3e598a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/et/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/et/thunderbird-115.4.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "8d717d09a6e1eb0d73954b1ee407d6605dd9dab99dde9e24ca92dbdc366a88a4"; + sha256 = "e94ba80c70ad4a6dd11257b2a456226c96df4f8da7908618b0460625932e3276"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/eu/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/eu/thunderbird-115.4.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "888cc390d5d91fa6df418bb7a71cef558d647479eb1b9ca13641c83b6af21b7f"; + sha256 = "2055513d9741fcef221308ce61354df4d22276e088ccd9ae6430ccf82368252a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/fi/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/fi/thunderbird-115.4.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "f8c27d320690cc30586786924d70994488ae124db046a6ec656c80e7862ad6d4"; + sha256 = "c916c8dc7a3d064cb7d6036722e3f2a010dc12e6564608cdad329628691c3e83"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/fr/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/fr/thunderbird-115.4.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4805bff97f9b5706666f252670069dd0775056f610697f0ed553962791deed10"; + sha256 = "2b6e1711762e8c00b87f37461df628e0d45d15f1ac1b19ffdd94ef6c470c9caa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/fy-NL/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/fy-NL/thunderbird-115.4.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "02271686a1873b33362209348d5b725da5035f9fa2ad0877a8c05586bc406a71"; + sha256 = "1a44264af2d0bedfe930ee09b1036f76fc7f6612f3852ef9b2cfd7ac0dc66fff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/ga-IE/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ga-IE/thunderbird-115.4.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "272ab8568be7355843b87ffd977d0601029a8da9595a43637a3be7db262f24a6"; + sha256 = "fbb59c517f4e24e18da62eecb5f4bb9312d6987fbba472b3d7c095b42f5658ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/gd/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/gd/thunderbird-115.4.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "9fc41912b342a608fb5b3ea91c044d74fc7fef77016670313f1723a726a251a3"; + sha256 = "220f166ef4b1cc5d2e36e4a8cf5ae0ee4ad529e97442e9f41c3efac7a09f486c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/gl/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/gl/thunderbird-115.4.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "9c57de323a569314333d6fed1f1debe802d37e973d14ba01f240a210eb3258bd"; + sha256 = "b73e8ae380b8f659d6a96afde2d9c63b280c0741201311abe9b3ba244700a46f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/he/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/he/thunderbird-115.4.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "faac72eede3fe4d599a6df7a1047a9e66aa2ae4ddd8b755fa2c48e30d843fd95"; + sha256 = "4a286adf9815f199e9cf0d10f3ba5e1fcb55e44a7e7b7945baa4196458968c3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/hr/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/hr/thunderbird-115.4.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "bf826da99307813c1dd5d5c4fc5ae8e19b238401605e184ca303acf37c5333b3"; + sha256 = "a362008a5e567e2f17f1236c661356ff9a366d014e7449b5fd4dab68f69dfaa6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/hsb/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/hsb/thunderbird-115.4.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "ecc94128403635d05e90702d27654682d16a70dde830964053161a5d2e7bf3c2"; + sha256 = "e2cfa6ea00d866ea019184f97ae4aa2c390849a135924852aa03dc0feb980c2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/hu/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/hu/thunderbird-115.4.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "04108be734eb77bd114ab1321b951f7ffa12065e894fd08c98a4edcf77821546"; + sha256 = "ddb3f51aa4c597a0162ff3f84cde69b885fed79ba641bba29e18016d8f2214e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/hy-AM/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/hy-AM/thunderbird-115.4.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c87caa6de393dec305a3108590c26aafa97543626d6a764c7a9ab1fbfa372339"; + sha256 = "f08d5845354b7fc90aabfe363b4b4f4b4c7f07c9f5d982942647677f78be0fa6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/id/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/id/thunderbird-115.4.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "6e0c3ca52134b52ef4997a7a5a12ff07329047af904078ccfa908a3e0da311a5"; + sha256 = "61ae2261379a7e31c0ee9c6a949a03bb4853bcf813eb647eb2f30239516085d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/is/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/is/thunderbird-115.4.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "cc6da6574f3f9fe8b201b414d3dee455ef6da1ccbffa8da9bc82021dc31d9327"; + sha256 = "ffb985a0f75c9bd56ae7e344791e86fd2a9f17007050b62fda2886547cd56334"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/it/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/it/thunderbird-115.4.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "067c1647f97cb4a63dd45c6e54202ab2296cdfd4f935705bd271ec1c54a85b3d"; + sha256 = "e8dc54db11815ae9e891f2c79c5e5218147d6694bc7055e933a0397c1619fd61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/ja/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ja/thunderbird-115.4.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "76e157919fb061fdbf7c5a9aec301de41804dcf5b3f1418707a6015bac2e76f0"; + sha256 = "a510a719215362a33ada3a29641a3999656fa73c5f2ea1cdc2c5c3b2b539f9ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/ka/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ka/thunderbird-115.4.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "be1ddb3f71ac0176f3cd4d82e4ecc96f6ba201a08b2920aebcadf4a0636048ae"; + sha256 = "6b4d0240dc65f3544f2b3c32876720783f179298fa575f8445b4d45449485742"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/kab/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/kab/thunderbird-115.4.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "478efa8b58d79247d1a1669e55806f84c806fc19cfb43d471075736273520e27"; + sha256 = "fa672dbdf6aa3ab56f1ec4ca741d01a0a0fa7ddbf0f1195824775a8990a65d33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/kk/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/kk/thunderbird-115.4.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "caa3242c6095d603dc017fe0043c1771c3fb2490a173c26da0d8a050cad825ae"; + sha256 = "f7cbf9147a4a7bed00e9dc52a6bba898b49aabe9e4daf0154a28662b4d16683b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/ko/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ko/thunderbird-115.4.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "48f7f992d8d158129935aa404aa6d10b9a1a6cf9d0941b869c10f063332b2737"; + sha256 = "d95727839f9d348d67371c01dec0eb2ee874d36631fb1fcf5441774fdc2bcd9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/lt/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/lt/thunderbird-115.4.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2f94410bfa04893bf08c6a87aee365f72339839a682d43eb979cf39649854201"; + sha256 = "cf87612f4d8ddddd0c1ce141c0edcec1bdd15ab73d51d5e83855694bc76e1a8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/lv/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/lv/thunderbird-115.4.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "0d39a48597467d586bd6d22acfb2c0cbd64c5ddd91a73e23b7e1224238eaaddb"; + sha256 = "228523902e069aef7c50a2a72fc5d7cdd987e896b263f91583ee8b5dfed36c49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/ms/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ms/thunderbird-115.4.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9ce0df4ba35f72d31982af5a4eeb2aec6060effd0def6ee9bc81754c22b0226e"; + sha256 = "ab13e157ffcf8949e23c704726ebcc656debb259deebe3897b7d9d4ad8b45464"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/nb-NO/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/nb-NO/thunderbird-115.4.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "0a55fffe830c57c4514560746704b917fa2d0644933e87b94cc9ddb8000b5c41"; + sha256 = "d64a6286e3ce5a3dd28e43bfd7ba483587d42bfe9037e478a286af704b7cfb88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/nl/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/nl/thunderbird-115.4.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "54386b45ba025981bfc87ecaab278524115a08958699f667871471a24bc6313c"; + sha256 = "3fa698cc239ae0bb0bd5d0984600f8b274e83528c42a62f20815245990fbdf4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/nn-NO/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/nn-NO/thunderbird-115.4.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "ef987a6e5c6dc8b024bfbf56133a8b61ce40de2982628e9c1918b9988e74c2ee"; + sha256 = "a811b1113f8490c7cf92bca1df2895d7253a07c7f59e3f70d26b3929b7c9b8a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/pa-IN/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/pa-IN/thunderbird-115.4.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "95fc00c7a58db674086910245ac387196b443a9a5cd13be969474fc4628f0fc3"; + sha256 = "766e77b7a863d6db6b8da29d351650a921bc34742a6a1e389101ed74b41d7e45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/pl/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/pl/thunderbird-115.4.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "aabe34619384cd8fdcaf39f1d552300e595bb2a72f34f5340182115673f5e751"; + sha256 = "7dff7fb5255688e75cdde4189de8c8b2e0c0c9f94e6928819282669b35f4b2fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/pt-BR/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/pt-BR/thunderbird-115.4.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "de1e210275cd1b40c222459b61455e9930573472529e4c2addb20824983874c8"; + sha256 = "5c55931aad41a8a801805b9b59d6698ede34cf4613205cac7591e112051e29d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/pt-PT/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/pt-PT/thunderbird-115.4.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "3ba07b58308d410486abe20f60b8748b9d2347c57232ff9eb366205f7dc6cfb7"; + sha256 = "ea4cc3fd7cffa2d18e66dc1137da283157ebfda7fe4289059bc2fa0506385582"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/rm/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/rm/thunderbird-115.4.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a5318ceea1711a4fdea1cf4236f314caf115e41ddb18793001d33887cfbc5384"; + sha256 = "aa04eb51601d0d777ae785acac0a6e573fb92d2f3d0fed0d2c4bcc7b54384f9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/ro/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ro/thunderbird-115.4.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c1c001218d4037be09db4f77f7eb03ecb3a0fd701eb342e8d60daab6c0dfb5ae"; + sha256 = "478109fd6564c4dd08629fdae951331c0c1e49f245a3ee9fd875ae4bfeba39eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/ru/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/ru/thunderbird-115.4.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "47221f5bb04731fd81e2bea8dc986304cbe92861e748aebc56b283af8c215cc0"; + sha256 = "708f01aa9736c21bc261054b4b71114752621ddabfc6b373c76411fa777cdc46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/sk/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/sk/thunderbird-115.4.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "127415be4ef276d6b0601ec2dcb534a6178e2d3b84db9d191135491a7c76597a"; + sha256 = "bdeee131a254dded4975e613d66f3c127736c4fd982a63d5c2de1fd3ab08c14e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/sl/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/sl/thunderbird-115.4.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f51172080bdb26aa30366ccb0132183bb8e4b670ae4eab586dcbb03ffb2fa06c"; + sha256 = "38e9e1b964a599d46143a2255ef7d01e97f1e519b333e578cb5c6f8f1b48e7cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/sq/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/sq/thunderbird-115.4.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "504bbafdca219027b3318a9957eaa7c842e92e2276d319522e2905cc94f104d1"; + sha256 = "1b6c3b84b123655088a49785bb7347ae8b4014677e12aa5e0a591f380962c7a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/sr/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/sr/thunderbird-115.4.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "276ce27d338e9f2bc1ecce9f1ddcdfdbda88022aa976eacc8a5b4f7cb18fddad"; + sha256 = "17bdc9c1bfaa2c320f196c6847606c0085c92fc15c2870b00f15481f1db7f119"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/sv-SE/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/sv-SE/thunderbird-115.4.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d91cd25880e6d809618b3f3a9354ffb8eef009aeac1940fdb6dd1c7c4c70e072"; + sha256 = "371b7bb4c3c2870c8cf61fafe42b281e3de960d26c83de3d07b55e68bf2e9ff5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/th/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/th/thunderbird-115.4.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "935e55a2cb94b9ce678ae235d4762fc8783a6f8b4ab3a48e981bf22afe9f00b7"; + sha256 = "c2e73af892e0e8fe968017e8337980c33ca2e960b607db7e8d2c5c3479e4103f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/tr/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/tr/thunderbird-115.4.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "90031892a6f843af09ac2e77e90f26eb65d0f2b2075db505668274a86dad39a4"; + sha256 = "58fe07598a46b89f88bb6f543c2627cec64a27adf8cf8c067e2c9cd313823529"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/uk/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/uk/thunderbird-115.4.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "63640c61ac2cae9c20ef1f8ba2ec655da599e7bbfebeb41a1abd662545eed876"; + sha256 = "d9471d2dab40fad2cc860c1c8d61e447a22c896b1e55b2fc6fd9371d0ddbbe2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/uz/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/uz/thunderbird-115.4.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "bccc6cde4779ac9cea16d4b8635af68b70607bfb6b2c4029cf00529cb0ae54cd"; + sha256 = "7208f963139afb6bdc6a31a5c756876e25b75dd729a759913abfaaa2ffb3c6a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/vi/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/vi/thunderbird-115.4.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "441ab3749d2c04d099eec5bc85117cee45f611e958b0c93b74bdad022f8ee435"; + sha256 = "3001fb66160dc7a4d919e3ceabaf3e1c1edde6e3adfff69ea258d3e4092ae545"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/zh-CN/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/zh-CN/thunderbird-115.4.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "7becd014b14997eb24487a1895447bab952c2ebe009862c60f1fa8fe44fa00bf"; + sha256 = "f10c31a9f5516035b40699512205c14fb52be0bb0bbfabc6f2ef36536c1699df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-x86_64/zh-TW/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-x86_64/zh-TW/thunderbird-115.4.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "28343b2ab133287cc63e307e0b54fa6620265ad76a2e1d41ce92f6ddd153b09e"; + sha256 = "c7554050509eb446a1c0de17f8f2417009ac5185080daf60e40f7cddf48cc08f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/af/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/af/thunderbird-115.4.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "f1d24ef4abb84c081faff0339be086c83b788957b86e3a015794e009176d642b"; + sha256 = "340b2e82108e0d0ab8980b0df0995fb90ef7869ffe54496cc3538699efb54c6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/ar/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ar/thunderbird-115.4.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e604ea0f8dee4c12b5b7d0505e0c127f753f9298828cf7245bcc2d38e348b44b"; + sha256 = "a3577d6224ad9b4f71dbc28e93fe867843804e2c2e506ab83cf9fdb4915fa965"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/ast/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ast/thunderbird-115.4.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1f36d5e02a3d93e2f4ebc4a51afa94861be1a190f48efe798ebba675f485f0fa"; + sha256 = "1d4bba1671d23e9cb66622b8a1db264bd142c6ba4573be090bad847bae96a99c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/be/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/be/thunderbird-115.4.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "4e0e24c9a43f28f7ccc858a84c8c054431663384bb9d17b4925783f54b0ec92b"; + sha256 = "9535fcc380a092fcb580f172ae72b4616e5a68005b4e8b72b7bfd0e25d19446f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/bg/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/bg/thunderbird-115.4.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f73f7b7c19c1fd771d662947f3d955f3d5f18d08ed4a6a835f91654eca756cec"; + sha256 = "7851ef4d8c8ffe3c39b87c75408d5aa2c48dad9bad066308316f9770c75420aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/br/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/br/thunderbird-115.4.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "45e0b45be17f8e4d4163f38490fcddaf19779818783ff85fd0ffbbbe6d09d9b8"; + sha256 = "d1928d7d1dadeab49cef49efd55df4c652fb55cbf8f1e91dace8d9aec4bbdeb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/ca/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ca/thunderbird-115.4.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "02b8272058d6c4d0738cc02cbd4f41866c2044e499968f929aa9e76564307009"; + sha256 = "3f9cb1b1335686428a2b38bee4de95da2fe45c31e6c5417789611797413f5bd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/cak/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/cak/thunderbird-115.4.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "535009c94f902c2a87324c7ad30b11605a9199b8237a6c4fb10ec6d53a7bde9c"; + sha256 = "6d01411ae87372d8f3ff108166c513fc3dc28d7475c32ba9077ada8699da6ac3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/cs/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/cs/thunderbird-115.4.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1812171fc55af5eb41056d0da27176d8e3dcd38bcab3dd2b7979cf22e181e067"; + sha256 = "4854ea58c23f3ff702ce55a2f7159e3383beb2a4df468d164e831e999d54d3ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/cy/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/cy/thunderbird-115.4.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5a76107a8e49d7b154449beff01a6a0d7ecba88806a376aee2cde9c2aee231c3"; + sha256 = "42255d0c90bc56f3c580f2a195ed4802eecb0a860d8181e31920c5615019baa1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/da/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/da/thunderbird-115.4.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d5c72cef228c2d1edb0781a76ca33bae061431e8075f04174a1bf94fb118e1f9"; + sha256 = "21e793bc846402a5633caf336386281bee63b553954a98e52cab85c134d9c9a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/de/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/de/thunderbird-115.4.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f0dbeef62cad6d2e5a74440fed961a85d370f473330f12523e28deb07ff89444"; + sha256 = "a5b87277e4fb238fe3db244aa75bd77cb20f9c964d7a4eaca92252cef0b1d4b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/dsb/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/dsb/thunderbird-115.4.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "7a41d558403b0f46f2128ae9a1f6b8a93913723740820dc9fbd3767c1b03a3cb"; + sha256 = "e0c9d4d7e32a677a51dd0211bcb42ab1545b3580dc0f9d9abb6e3be9a750cc31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/el/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/el/thunderbird-115.4.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "824923b59362e4e1d499cabec5fa11ba9514530ec853fa4ab08b81ee32a58bb4"; + sha256 = "7cc4762d51133a6c9b80a4ece730c98f21e39ce89d8a66a433a503816a5d2e89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/en-CA/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/en-CA/thunderbird-115.4.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a1167c95b458620fdb5856022eeabb283d25903c2ec650dd63e20723f7a7f8cb"; + sha256 = "b1eda5622f414ba75c5972d6653dcfed7a54ec3eeab7a1fe0eafb07c0998865c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/en-GB/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/en-GB/thunderbird-115.4.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "471f55152886b240041bb57997d02682d49506b17a611ad0a75869eba0cb9fe6"; + sha256 = "d97bad986e68254c3f92c00ea6c517bd42bb0b8ac2c0a5e39df88543a329e277"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/en-US/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/en-US/thunderbird-115.4.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ab9da54ca5265f714fe9aee854b1a4200dd770432b6425bc83e00ae21bc109e2"; + sha256 = "2e5807f8c6610aa871b79ea62fc063c5655bad70d019a9525845396b7f85b3b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/es-AR/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/es-AR/thunderbird-115.4.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f67f7e478bfe9b6b5a7378e7255c849dae2b8c9b77332d72aa98625dd8c03a3f"; + sha256 = "ff1def53d0391a96aba158dd9b967c303bedf71b4e78419290c745e0a88496c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/es-ES/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/es-ES/thunderbird-115.4.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "f32e4dc965c92670355173ae2d364de1e0297c179d88c4481ff17043614068fa"; + sha256 = "bce7dc0d2ac514f1f66f8441a3229920239265c01e3f6a999441c0f0f9806644"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/es-MX/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/es-MX/thunderbird-115.4.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9523a37dd4c425cbcf8e5326116af101fa1715009b7856380ccb0b3cedf93c39"; + sha256 = "a0c6da966679f3eaa93eca1d347b0d221fa26d20b6c01a3544ec5a7519020e26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/et/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/et/thunderbird-115.4.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f45f27e599c2a3daa6f96d183856ba53db38e3dd3f1b4d54d02ac067fc2a408e"; + sha256 = "6d7f2d67053e5479e2f4f6fb1184901a7fe6f0100f8a8675dde0139195e32da2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/eu/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/eu/thunderbird-115.4.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "bea576eb1bf5204932a6d9a64e65e3b9ec83383f606d9ce68301bd3197f2d870"; + sha256 = "3b4e08d9eccea42976b07b80a9d84a9c2aee4223a83b128c9aa65357cba0d11f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/fi/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/fi/thunderbird-115.4.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "3f93721a0dc124a10346d00760a28d153ce3c39cebb6c01a1cbd36561cdf9085"; + sha256 = "bad3c5047dc9d4283723a6f24113fa93434fd44cbb139dd9420a69a759606675"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/fr/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/fr/thunderbird-115.4.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f075ed5f4059a7dfade2dd76482e46d0fc3ab2ddf67cd76ba5bd901b7ce63228"; + sha256 = "e656c0fe050a4e3c772514f60c6452e8de1f7b14b11b814f20044d32e4bae916"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/fy-NL/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/fy-NL/thunderbird-115.4.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8557f768822b60bca926fbe49b1c61bc5f0258d8981281e2376ed274d70ec8ef"; + sha256 = "2a93d49f76354071f43f549a04b035dd1eb47c1b7c4f4c87de1ad6b519e989b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/ga-IE/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ga-IE/thunderbird-115.4.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2ed32b67740e8595b0dd7c06c6c726a6d5eacec9cee4d1d37199600b38838f62"; + sha256 = "c65a11178928b4ddb9febe35e514a8233a7d6560ef3366cf3fd2141ab19735bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/gd/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/gd/thunderbird-115.4.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "bce2db97e057799871485dc7b8133b89ffa30b40886611251f97650791bc4917"; + sha256 = "36ef04774e588691c7722e460c6ac95db528bbad29dde07b3e1d5a569889aaef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/gl/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/gl/thunderbird-115.4.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "40d0873e76a062a43f97461e4df1c684947bf32101515cee8d231571e5d3f72a"; + sha256 = "84c9327c3bd811ab722371a396064689486b36083d36e89fb6f6364670d3d94a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/he/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/he/thunderbird-115.4.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "eb2e19dd9072b5b4ffddf67f29d2541c8e956bd1c5955d8ecdba8e137081abae"; + sha256 = "abd1a3650e46ffdee5edd3d8b450644b2169650ffd9d75fa0b47c4c5567ebd2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/hr/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/hr/thunderbird-115.4.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "11d88de2c4e21fa774943fd83df559aa1b8764e13e786b418d33675892f179bf"; + sha256 = "0daf5e121293462df3b86018bab57e658602d4fdcd67faf8d7ea8f21aaf7632b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/hsb/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/hsb/thunderbird-115.4.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7dcd340876e1e9f247714e5607630db048f5105c99268f61320be946dd76b879"; + sha256 = "4a4e81cee163c24773f7bc03c218611134e1004222ce3573e551f6293d8efd58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/hu/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/hu/thunderbird-115.4.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "220b4b59b64576b1e20c16d9d75636a1e8371471d86234a77cdd9cec8f140ac2"; + sha256 = "f7e8e917827e9c3e52ef48879765258b92fead33bc0e2147a1df6728f6764831"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/hy-AM/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/hy-AM/thunderbird-115.4.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "8d12f76230f1b8062cce3189d7060016fda3f7e9a09c87777f9e453fd4b622dd"; + sha256 = "4c9cbfd06984815fc61ea98e0c17639c8fca7ebe701a407e841966bb05aa09d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/id/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/id/thunderbird-115.4.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "076c0bae1376130bf4e69f3b21f4e523e07c82b035c4b7401b3f62f67fc86bd4"; + sha256 = "d3d9eedf96670bb449646b17f5a8a9385855b3854b30b6ba05767b309ba381e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/is/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/is/thunderbird-115.4.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4784948831c6ffbaadd343bcc0e738765f7cd21c09a422bb48a84b8b69f2692c"; + sha256 = "ee64b52c00a78b4bba3ff14277cee29ce098e2aa28440d034c57769faea9351e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/it/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/it/thunderbird-115.4.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "208384c6457024fe9976191ff8f36c4ff1dc0b8fd52f05c5d10a3ef46bc1820a"; + sha256 = "4c26187f7eb32ee878ca9df24b8416b7f0fa23d739adb9bf4e58bc9d3cb3fe70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/ja/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ja/thunderbird-115.4.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "73c4774d1d6763aefb2750032a1b330c9351f1690b0e99c70c19ddb43ff9dfd5"; + sha256 = "1d65c17a94131fc651ca3b9db0e5968434ec60096758f1f2ab5f4ebf4e845a26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/ka/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ka/thunderbird-115.4.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "cd539ebfad4343e7626fc963f12f2591861197398f7dd2dec19cc9b035a32547"; + sha256 = "da40fa8bc0f1b1dd4f0d3c062cc79e7179d6e9a29a4f80323b9da8b3e5a38727"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/kab/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/kab/thunderbird-115.4.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "e78b4433da1a3fcc7dccae274bf954ec0568134d2ec8631f17c1c5909214bb74"; + sha256 = "fbdfc11b4cc9cb0c92e32e2ab1eba6bfc010a84c964c63a05b3672095f6be438"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/kk/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/kk/thunderbird-115.4.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "5258f1d16475b23770f1c5a625c051b2e68bdd95c098c675e2856ab5cbbc8630"; + sha256 = "dd1419aabe279cbf1c182425b8aa57d97d510fd2586a9f63d6619bf52902dc93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/ko/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ko/thunderbird-115.4.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "29da7d5b39e6d6196ea4732eb0078040add625d2fda0d4058d17d8751c693a6e"; + sha256 = "9901570e3cb732036b430493cb1a21fa645d33c1ada119e65b434ff481c1e732"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/lt/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/lt/thunderbird-115.4.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "962f60e1d9c97870e1662ace5ceff36db6c81227449177a50f7d296e613b63c5"; + sha256 = "0066a94f77ac6c4602137bef783f45c36b5a0f845c0ad48e7b158c0bd282fd2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/lv/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/lv/thunderbird-115.4.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "b7cc3ec52b6d02285e4632f03bc8a9d740ede08eff9817d3b3cef3757adcb85d"; + sha256 = "6abf69968fe1d37096c39f083241afd3e5d2389c929d1939bd8dda6473474044"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/ms/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ms/thunderbird-115.4.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0c176ed3c551c7f5e6babddcf0e08ce6b010ec65edefcb729b339d85102f9242"; + sha256 = "afe39f70b1ba61e4e3260e629dc60adc3430a8478f3508645c4ab1e6353ca6a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/nb-NO/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/nb-NO/thunderbird-115.4.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "54d390ef94481efa7e04ce99c4bb9c2cafabcf6e7e12a066829141687e13dec9"; + sha256 = "703c9509e2965b5cd9b20204e1e390530896aefc61afada60ceec46657b5c052"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/nl/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/nl/thunderbird-115.4.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "dacfa1474f5ae1a7bebc34a40b787003346c220f2399b040bc478ac9d48217ac"; + sha256 = "f8901735d4ac97a8e64fb22ac98f1e249399023853761f404e06ed5bb557d6af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/nn-NO/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/nn-NO/thunderbird-115.4.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e2444478ce4e06ca442991f41f8648b8abc3caa9b8df51821f5ca564bff0bfe0"; + sha256 = "74f7767af5fc88adc4e65bc14794d193069572378a9314bcb1224a90e4991d0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/pa-IN/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/pa-IN/thunderbird-115.4.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "5110317c5227955116f1e6a8f851d1b518e567763e75c34d5ce35c345c039846"; + sha256 = "d427a7712ed85b24418f95f8dfbf35c2888bc4f774dddd9594895c3eb30fbbe2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/pl/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/pl/thunderbird-115.4.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "9f099333e148edccdec20fb8c05c094976a3693cb4da600dc6d852c2ea4a7b0f"; + sha256 = "5dbb18db564a047556eecf848e9c42d39b28dd3b3b4f94be01aba52ed6d09a83"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/pt-BR/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/pt-BR/thunderbird-115.4.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f58d41ad35652ae87a53808bac13c793d1851f5193fcc3ee74119ddb4f13b5fc"; + sha256 = "44097bbfaa7c70687d0ebdab94a3ec1c8db326c4d333ff7167c93f65122d2717"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/pt-PT/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/pt-PT/thunderbird-115.4.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "347f4a46c08576af832cfba4f96164bc81b5653350299d416fb91f18107f9e03"; + sha256 = "b4195c7c92d18fcc350925ff867515c2ee619d76ca40d16de18e77a504e7e3a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/rm/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/rm/thunderbird-115.4.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "bab2cd31ff27512ae03720d4baf475ad5e33e82e6bf07e06f3f02cac0c645b3c"; + sha256 = "b5b1bde8faf2de0e2027b98e2adcaa1cb85b0402c9a4a1fcdebaa2933b5076c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/ro/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ro/thunderbird-115.4.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "69763904dffb09d37df2cfd6a6c71c45dba6c9725a4703c56fb7884cd15fa37a"; + sha256 = "8e0b8e83a86ccde5530604f89ce989d5e701dc2bf07bf57b2637e3a6cbbb28ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/ru/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/ru/thunderbird-115.4.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e68d2ad8c07eb01449fdd0a705a75c7f45d4d367dd990c38322f4e9ee08398f7"; + sha256 = "347ccd0bdc999131b5ed6cfc3c3c74d522644c918673d19d1b919a07f778bb80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/sk/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/sk/thunderbird-115.4.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "fe8aa6bf3dfd0a14577b1b45f2bb0b35b1f1b3b533a5f9978972aff29c72d01c"; + sha256 = "3e0bf1d75d822b5646774d36432d861fea1c8daf848ca434357ac05c49a501be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/sl/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/sl/thunderbird-115.4.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "487056a83091d524c56f726cc96066ba7e035e7af3545e7664a859557289e62b"; + sha256 = "88eaaacd0b1f0d1096acfa6a7c9e79b6b1268da35e299fdbe435386323564275"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/sq/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/sq/thunderbird-115.4.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5ea91c8599be87b08ff3fe328454f1629ba655ac059baca20aa38cf08990530b"; + sha256 = "d95fe0d8a6f960809f85507cf22f6283d97177aa57f802f731519d5c8286502b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/sr/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/sr/thunderbird-115.4.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "599d44feab73393230ccecd219139e6eda2206771f71b8890f1be09f8176e4ea"; + sha256 = "85382234c67e5d4756f2c8d1e69a51918391b361e9bbabfd4509755d3e9bbb57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/sv-SE/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/sv-SE/thunderbird-115.4.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0e7c08a019f5c5eabe38a7e17c4f280c894f71ff1cf2a90b34ac102816f93984"; + sha256 = "85f536a1a1fea39bada579df14024228b369daff04cb334e5121df26e9dc9abb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/th/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/th/thunderbird-115.4.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "9b2fa7e157567b7ea6dc506dfb9bea32e1e0b1301053801caf2e4cafa1593a7a"; + sha256 = "16aa164a8a874a5e29490e802d081a0ac0e0cc8308294fb7718b84b2f1907dd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/tr/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/tr/thunderbird-115.4.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "34884d791dc0d816aff110be2b111ee2c14ba0cc29227b56b8fe782bcd3441f8"; + sha256 = "33361a2b058ce97605d6cc49bd8d5f98ff906a033d3d6690a9ead68c5c112a80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/uk/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/uk/thunderbird-115.4.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "68e2211308375061f06e8c620a6cef35cc3785d27ad2fb33f90c6e2cbc8cc51b"; + sha256 = "be242d2c67e1bfa8f0a982fdb468ba895e4c20e4048f4558846ef15b3370d9a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/uz/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/uz/thunderbird-115.4.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "cdae055179025410d371c8023fc99a3689f215fae88f3b3e14ce1217455517b5"; + sha256 = "a1ce3c9ba4348e87d91b058d9c86d9f069efce0fdcbde74cb301b97de2cbc0db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/vi/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/vi/thunderbird-115.4.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "0306b2f943819cc9a0050fbc9e5bc2c0bd343795eeaa22d4f1e0325fb55cb6de"; + sha256 = "a7215f92ac980a5dc0d09ecb52185dfd28cb2295cce0f6f443f8820958e6de3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/zh-CN/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/zh-CN/thunderbird-115.4.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "40fabd734552a7af0762fd828de2810d6fdd8b76a26b2f18db22a301d0c631ca"; + sha256 = "d1c0b04516aed697a4b93c88a60f3cb0b2ce8479818334b29a262d72afb485d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.2/linux-i686/zh-TW/thunderbird-115.3.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.4.1/linux-i686/zh-TW/thunderbird-115.4.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0a363a15cce9fc984b9eb49ce9e9be43bded85d68e66a74db89b364040c315ec"; + sha256 = "f689bd01e5a43475247b61c4fc3d0699c13a2ba5cafa13bb8c8eeaa669c29951"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 6b164969a3981..d778bebd12ff6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -44,13 +44,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.3.3"; + version = "115.4.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "631042a3cdbcbae91d93eb71c0d4f6a1122e8bc7000d75fcc7d3cbdd0e82a4b31abac590c75771e77ab08d5700582b6dedacf62ce8e21a91e9ea81aedf1bbeaa"; + sha512 = "ccf48a5376027b1e0182d4040a0571e5f34c2378349c0d11cb4e14c75f10247e2522e8d8d2a0a45022ff1a463a49f59b1cf611c70951cf5e1b383051c0573164"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index d7ee8754c91c6..44eba5bc021e7 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.118.8"; + version = "3.118.13"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - hash = "sha256-12R8g5U8p2lXNaSeJiCvEb6AgCC40jDXDKO8kyEvM6w="; + hash = "sha256-3kpfF/XG7w6qUooS5UsntMKnggG1LhmV9f+R35kkmb0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix index 739c3013e5261..a915e3fed8e06 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnunet-gtk"; - version = "0.19.0"; + version = "0.20.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-MwAWs1rHXYlRUcAWX8LnCLTwEOSI68aA0s7uZGgYR3w="; + sha256 = "sha256-6ZHlDIKrTmr/aRz4k5FtRVxZ7B9Hlh2w42QT4YRsVi0="; }; nativeBuildInputs= [ diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 038d904f453b0..50143013b88f0 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "qv2ray"; - version = "unstable-2023-06-09"; + version = "unstable-2023-07-11"; src = fetchFromGitHub { owner = "Qv2ray"; repo = "Qv2ray"; - rev = "aea9981cc28fe25de55207b93d86036b30d467d2"; - hash = "sha256-ySXAF6fkkKsafuSa3DxkOuRjSyiCDUZRevcfJRp7LPM="; + rev = "b3080564809dd8aef864a54ca1b79f0984fe986b"; + hash = "sha256-LwBjuX5x3kQcdEfPLEirWpkMqOigkhNoh/VNmBfPAzw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index a86d80d9ae672..26343f6a76efc 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -63,6 +63,7 @@ buildGoModule rec { homepage = "https://rclone.org"; changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md"; license = licenses.mit; + mainProgram = "rclone"; maintainers = with maintainers; [ marsam SuperSandro2000 ]; }; } diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index a3cbcfc340c88..a0e95b62edfe1 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.3.5"; + version = "0.3.6"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-NKoRsT8UQ1IHS95KATHNzbAYWCi6zwwmRZvR+U7MVhk="; + hash = "sha256-MH5NLppwe/W5d0duNwyQtUBryqDzfV3u0LqWI40GqLQ="; stripRoot = false; }; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 166210704aa33..b7d53507c4cf6 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -23,6 +23,10 @@ mkDerivation rec { substituteInPlace app/src/views/mainWindow/MainWindow.cpp \ --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png" + + # https://github.com/xintrea/mytetra_dev/issues/164 + substituteInPlace thirdParty/mimetex/mimetex.c \ + --replace "const char *strcasestr" "char *strcasestr" ''; postFixup = '' diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 2d9148b482139..c576319643f5b 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "6.3.0"; + version = "6.5.0"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256-axdkoqCLg0z1kLa/S0kS4d8yGFuKJRDPRte9c8PYniU="; + sha256 = "sha256-RO8PhEjvDye6p6vgqNexIJ1ymTlVtF8yWQAUbJGaZYk="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index 321e78ce9138d..00b47c43eb039 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "direwolf"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; rev = version; - sha256 = "0xmz64m02knbrpasfij4rrq53ksxna5idxwgabcw4n2b1ig7pyx5"; + hash = "sha256-Vbxc6a6CK+wrBfs15dtjfRa1LJDKKyHMrg8tqsF7EX4="; }; patches = [ ./fix-strlcpy-usage.patch ]; diff --git a/pkgs/applications/radio/direwolf/fix-strlcpy-usage.patch b/pkgs/applications/radio/direwolf/fix-strlcpy-usage.patch index 9f43415114cbe..e4061b6287f9e 100644 --- a/pkgs/applications/radio/direwolf/fix-strlcpy-usage.patch +++ b/pkgs/applications/radio/direwolf/fix-strlcpy-usage.patch @@ -75,15 +75,15 @@ index ff18800..b1cb443 100644 -} - diff --git a/src/direwolf.h b/src/direwolf.h -index efc329b..22eb748 100644 +index 69b0952..6f9ec1a 100644 --- a/src/direwolf.h +++ b/src/direwolf.h -@@ -294,7 +294,7 @@ char *strcasestr(const char *S, const char *FIND); - #define HAVE_STRLCPY 1 +@@ -328,7 +328,7 @@ char *strcasestr(const char *S, const char *FIND); + #endif + #endif +-#define DEBUG_STRL 1 // Extra Debug version when using our own strlcpy, strlcat. ++#define DEBUG_STRL 0 // Extra Debug version when using our own strlcpy, strlcat. + // Should be ignored if not supplying our own. --#define DEBUG_STRL 1 -+#define DEBUG_STRL 0 - - #if DEBUG_STRL - + #ifndef HAVE_STRLCPY // Need to supply our own. diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index c2aa051e70f19..e660f0c9da7ba 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.03"; + version = "2.0.04"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "sha256-/5hOryoupl7MYWekx2hL3q+2GMXA6rohjvYy2XTkJBI="; + sha256 = "sha256-+AcQ7l1RXFDVVraYySBUE/+ZCyCOMiM2L4LyRXFquUc="; }; buildInputs = [ diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 1a4f1c5aa2c25..66a932b9c99df 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -25,16 +25,18 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-tlkD8Kem4HPwrk3E98UKcPoBNoFucqarEBo+oihnQSU="; + hash = "sha256-3SQ3a1gg4/cXy8BJXazTgh6nkS/KQpM0fCA6JcbHOPc="; }; postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace "-Wl,-ld_classic" "" substituteInPlace src/CMakeLists.txt \ --replace "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler" sed -i "/hdiutil/d" src/CMakeLists.txt diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 5d47712f4426b..dc8df16838456 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -27,13 +27,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradioMinimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.17.2"; + version = "2.17.3"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - hash = "sha256-dwqb/TYNkaXSLXQ0QJEQpy1es0hgNrkNnZww9RpfTt8="; + hash = "sha256-dHbDy/aIsqBQG1raeN9nM/QtiFgy+Qhoj/ThN8LV6gI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index a08293c8ef731..c7f1891e2c543 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchFromGitHub, cmake -, fetchpatch , sqlite, wxGTK32, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk , GLUT @@ -8,25 +7,15 @@ stdenv.mkDerivation rec { pname = "limesuite"; - version = "22.09.1"; + version = "23.10.0"; src = fetchFromGitHub { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "sha256-t3v2lhPZ1L/HRRBwA3k1KfIpih6R4TUmBWaIm8sVGdY="; + sha256 = "sha256-o58UNc4r+MQbH00727YTV17M7D29BbH8CgUXCORKk7E="; }; - patches = [ - # Pull gcc-13 fix pending upstream inclusion: - # https://github.com/myriadrf/LimeSuite/pull/384 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/myriadrf/LimeSuite/commit/4ab51835d0fde4ffe6b7be2ac3dfa915e7d4d26e.patch"; - hash = "sha256-53nLeluMtTPXxchbpftPE8Z1QMyi0UKp+0nRF4ufUgo="; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/applications/science/biology/deeptools/default.nix index eaf0b59327260..a199e41d50aaa 100644 --- a/pkgs/applications/science/biology/deeptools/default.nix +++ b/pkgs/applications/science/biology/deeptools/default.nix @@ -2,15 +2,17 @@ with python.pkgs; buildPythonApplication rec { pname = "deepTools"; - version = "3.5.1"; + version = "3.5.4"; src = fetchFromGitHub { owner = "deeptools"; repo = "deepTools"; rev = version; - sha256 = "07v8vb2x4b0mgw0mvcj91vj1fqbcwizwsniysl2cvmv93gad8gbp"; + sha256 = "sha256-A8YdlMptmJyxWW0EYLjXFIWjIO/mttEC7VYdlCe9MaI="; }; + format = "pyproject"; + propagatedBuildInputs = [ numpy numpydoc @@ -21,9 +23,10 @@ buildPythonApplication rec { matplotlib plotly deeptoolsintervals + importlib-metadata ]; - nativeCheckInputs = [ nose ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { homepage = "https://deeptools.readthedocs.io/en/develop"; @@ -36,7 +39,7 @@ buildPythonApplication rec { publication-ready visualizations to identify enrichments and for functional annotations of the genome. ''; - license = licenses.gpl3; + license = with licenses; [ mit bsd3 ]; maintainers = with maintainers; [ scalavision ]; }; } diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/applications/science/biology/dssp/default.nix index 78f226350f604..febfde548fd7a 100644 --- a/pkgs/applications/science/biology/dssp/default.nix +++ b/pkgs/applications/science/biology/dssp/default.nix @@ -3,6 +3,7 @@ , cmake , eigen , fetchFromGitHub +, fetchpatch , libcifpp , libmcfp , zlib @@ -15,18 +16,26 @@ let inherit (oldAttrs.src) owner repo rev; hash = "sha256-Sj10j6HxUoUvQ66cd2B8CO7CVBRd7w9CTovxkwPDOvs="; }; + patches = [ + (fetchpatch { + # https://github.com/PDB-REDO/libcifpp/issues/51 + name = "fix-build-on-darwin.patch"; + url = "https://github.com/PDB-REDO/libcifpp/commit/641f06a7e7c0dc54af242b373820f2398f59e7ac.patch"; + hash = "sha256-eWNfp9nA/+2J6xjZR6Tj+5OM3L5MxdfRi0nBzyaqvS0="; + }) + ]; }); in stdenv.mkDerivation (finalAttrs: { pname = "dssp"; - version = "4.4.3"; + version = "4.4.4.1"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-zPmRR7sxVNErwabLqA5CNMO4K1qHdmC9FBPjcx91KuM="; + hash = "sha256-sy6GBCnTGRD1YP00dKIolkr1RMboLGcd0f4kU8gCOnA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index d02d472662976..0cc20b0635036 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "RAxML${lib.optionalString useMpi "-mpi"}"; - version = "8.2.12"; + version = "8.2.13"; src = fetchFromGitHub { owner = "stamatak"; repo = "standard-RAxML"; rev = "v${version}"; - sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; + sha256 = "sha256-w+Eqi0GhVira1H6ZnMNeZGBMzDjiGT7JSFpQEVXONyk="; }; buildInputs = lib.optionals useMpi [ mpi ]; diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index bb306fa322fee..5bc0dddd79b67 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -146,7 +146,8 @@ stdenv.mkDerivation rec { -fopenmp -ftree-vectorize -funroll-loops \ -I${lib.getDev libint}/include ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} \ -I${lib.getDev sirius}/include/sirius \ - -I${lib.getDev libxc}/include -I${lib.getDev libxsmm}/include + -I${lib.getDev libxc}/include -I${lib.getDev libxsmm}/include \ + -fallow-argument-mismatch LIBS = -lfftw3 -lfftw3_threads \ -lscalapack -lblas -llapack \ -lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \ diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index f80085278e0aa..0b99c9a849d0d 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.1.41"; + version = "16.1.43"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-91vPipS5FTqCl7BUSu47aApIfq2e8dD1SW/LEGQWWio="; + hash = "sha256-lqHlnAeJKbj2Xs9AeAKqdWMWkmD8xWR7f3+nJsBx2YE="; }; patchPhase = '' diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index 0ce67ec4dbb1c..593e9d9187b74 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "qucs-s"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; rev = version; - sha256 = "sha256-9/1sgxFqn9d9zlwrzjQosFO3m+2lC83qVcCtzfqY5XY="; + sha256 = "sha256-C7TLOuC0CHredDiWFIAFmOlV8ivX0j4bs3b8IB8FsqE="; }; nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ]; diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index 8abcd96f08d22..603a3c4f60bf9 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "unstable-2023-08-03"; + version = "unstable-2023-10-26"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "f202cf0c342e54e994c4d416daecc1b1dc8b9c98"; - hash = "sha256-kp4zWTPYt2DiuPgTK+ib8NbKg2BJVxJDDCvIlWNuwgs="; + rev = "043895fbaed27a4baace7c7c0c1f69ea5a9f3d1a"; + hash = "sha256-roPyRaT89I3HbyvBK/owiigMus1EeKEhhKHFsgfzp10="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/pkgs/applications/version-management/ghr/default.nix b/pkgs/applications/version-management/ghr/default.nix index 0b460b14a9b3f..a2abe04fea9ae 100644 --- a/pkgs/applications/version-management/ghr/default.nix +++ b/pkgs/applications/version-management/ghr/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "ghr"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "tcnksm"; repo = "ghr"; rev = "v${version}"; - sha256 = "sha256-aD1HEdoAPFFpJL++fLZIk+pIs+qDNYbTGDMlcRjV6M4="; + sha256 = "sha256-swu+hj8fL/xIC3KdhGQ2Ezdt7aj9L8sU/7q/AXM2i98="; }; - vendorHash = "sha256-pqwJPo3ZhsXU1RF4BKPOWQS71+9EitSSTE1+sKlc9+s="; + vendorHash = "sha256-Wzzg66yJaHJUCfC2aH3Pk+B0d5l/+L7/bcNhQxo8ro0="; # Tests require a Github API token, and networking doCheck = false; diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 5e82daa496fd3..7a1179dba3015 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-DzlCy8Y3OW3FiXO45wuUh3t87Za2jWQ4rnztZGRySYA="; + hash = "sha256-OK2eoWlqlpf/X8EGMnWTv9Gs5FkYvW5rmQDB/Mkbp60="; }; - cargoHash = "sha256-+XyZqxjiOAIyc+FmnexIdV1RMzc+iqmo8nPahzUo43E="; + cargoHash = "sha256-gtkpZKOaG5p79uJ9cbbGdiOX57bDFTf2/Bd8+WToJrw="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix index 986d491935b5c..20183c5fada39 100644 --- a/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "git-credential-keepassxc"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Frederick888"; repo = "git-credential-keepassxc"; rev = "v${version}"; - hash = "sha256-eu4Ff+7670gCO+j3WSRnvQ1aFXIx0nw1jAZXNuni2bU="; + hash = "sha256-AvnnzLiDQEdfAHPns8ufhdiPPn9d23AnI8Aq2DQS+To="; }; - cargoHash = "sha256-DVMQLsiiaxMZtDqzqnMJQl91NCuMRSPEb8B6AttB4lE="; + cargoHash = "sha256-c2YucWs0UzyWDKWS5KebT3ps+XvWzlI0+ziJ8JX6oiQ="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index b198fb1dd4743..ad9ae30cda5ae 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.12.166"; + version = "5.12.167"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-9+Ya0vQVDP8LNlHogRko3wOahOXwGVSS2gVZHZMMFLo="; + hash = "sha256-tselj673Zkur0IAuOt0l/RffJiA6x2PYkdV+dCrNx+M="; }; - cargoHash = "sha256-nYy3oB+0uZk1ArfImtfxkoxDPgg55wpOuOtrg+sYzfs="; + cargoHash = "sha256-t2u8umPy8fJLjbUEpkufE96n+FXcV0ZCVYrK0lNBhHA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-nomad/default.nix b/pkgs/applications/version-management/git-nomad/default.nix index 15534fc01bb36..e1c55676da091 100644 --- a/pkgs/applications/version-management/git-nomad/default.nix +++ b/pkgs/applications/version-management/git-nomad/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-nomad"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "rraval"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A="; + sha256 = "sha256-N+iPr389l9PDfJIhvRL6ziGSPI6pgvfdGX6wxmapLhA="; }; - cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0="; + cargoHash = "sha256-7CZC29y9dLpyanolO+epKd0KwmRc1iGY+sPM9f/j5hk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 52aef7a8af618..edf05ff03f816 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.38"; + version = "2.39"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-o3uNFGnccFU3ZSc8BZLh8JTc8517bho/qX6otC5oC5s="; + hash = "sha256-Qw0x/YiXMDrlTy6boembfqVRvEYiMWOALJtaMrr7/WI="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index 0c20b51fbc558..40b8a9b207c79 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-qNLVbhVXITbMRI2x/0q5enJgjL3EAcXBwqWeH6MPfZs="; + hash = "sha256-XqS2oG3/dPHBC/sWN9B7BliSv4IJ1iskrQRTh8vQNd4="; }; - cargoHash = "sha256-UrzJGEASGaDqKUrPiNcjldevCqCPaNXJXNYecbHodOc="; + cargoHash = "sha256-0mUkXez+5Z8UGKMrUUjt+aF4zv3EJKgnFoQ068gTlX0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch b/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch new file mode 100644 index 0000000000000..6bdfcf2c2d2a4 --- /dev/null +++ b/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch @@ -0,0 +1,28 @@ +diff --git a/AniLibria.pro b/AniLibria.pro +index 407dbde..ae69502 100644 +--- a/AniLibria.pro ++++ b/AniLibria.pro +@@ -21,17 +21,17 @@ windows { + DEFINES += NO_NEED_STANDART_PLAYER + } + +-#unix { +-# LIBS += -lvlc ++unix { ++ LIBS += -lvlc + + # INCLUDEPATH += /usr/include/ + # DEPENDPATH += /usr/include/ + +-# INCLUDEPATH += /usr/include/vlc/plugins +-# DEPENDPATH += /usr/include/vlc/plugins ++ INCLUDEPATH += @VLC_PATH@/vlc/plugins ++ DEPENDPATH += @VLC_PATH@/vlc/plugins + +-# CONFIG += buildwithvlc +-#} ++ CONFIG += buildwithvlc ++} + + buildwithvlc { + DEFINES += USE_VLC_PLAYER diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index 76cc3565d1fd1..4b5102f25c276 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -10,17 +10,18 @@ , wrapQtAppsHook , makeDesktopItem , copyDesktopItems +, libvlc }: mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.10"; + version = "1.2.11"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - sha256 = "sha256-mCDw8V/Uzewm32rj+mkkm5atS5nJAFJ3ry1boTn+gqI="; + sha256 = "sha256-N5caLFM6YJtarMaA7Ps5uWXmOtKM2KvHneDkN8ooJpw="; }; sourceRoot = "source/src"; @@ -30,11 +31,13 @@ mkDerivation rec { patches = [ ./0001-fix-installation-paths.patch ./0002-disable-version-check.patch + ./0003-build-with-vlc.patch ]; preConfigure = '' substituteInPlace AniLibria.pro \ - --replace "\$\$PREFIX" '${placeholder "out"}' + --replace "\$\$PREFIX" '${placeholder "out"}' \ + --replace '@VLC_PATH@' '${libvlc}/include' ''; qtWrapperArgs = [ @@ -58,6 +61,7 @@ mkDerivation rec { qtquickcontrols2 qtwebsockets qtmultimedia + libvlc ] ++ (with gst_all_1; [ gst-plugins-bad gst-plugins-good diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index ea7ba432a4a42..856bc95a477d6 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -93,5 +93,13 @@ stdenv.mkDerivation rec { # "CPU not supported" errors on AArch64 platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl2; + # Downstream we experience: + # + # https://github.com/NixOS/nixpkgs/issues/239424 + # + # Upstream doesn't have a contact page / Bug tracker, so it's not easy to + # notify them about it. Using firejail might help, as some commented + # downstream. + broken = true; }; } diff --git a/pkgs/applications/video/dra-cla/default.nix b/pkgs/applications/video/dra-cla/default.nix index d83c57ae9fffd..3a097d3e130f4 100644 --- a/pkgs/applications/video/dra-cla/default.nix +++ b/pkgs/applications/video/dra-cla/default.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation { pname = "dra-cla"; - version = "unstable-2023-03-10"; + version = "unstable-2023-10-10"; src = fetchFromGitHub { owner = "CoolnsX"; repo = "dra-cla"; - rev = "fd5e43bb32b5bc9013382917d1efacda9c3071a8"; - hash = "sha256-SMtuflVsxe0PWmzabSDy+vhIN2bTqyiYAT/T1ChY+xY="; + rev = "12e9557fb8dfdff7350e0102a625170bb69acf01"; + hash = "sha256-cGY/FRV2BAS4fzJqIfD7FlIPIS0fCIIBenQYjB2dEsc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index 9334dbfa28324..1bc68436decc3 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "arteplussept"; namespace = "plugin.video.arteplussept"; - version = "1.4.0"; + version = "1.4.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - hash = "sha256-m7DHQVg0pcLGCHTdecCTGfanUWhuPMHdllbg+47hxEI="; + hash = "sha256-4lPJIFBF4zXr1bEyv9tVUPXw9JFt2by/tcOwihib6aQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix index f219a3fd1fdfb..e5d26ef4a64c3 100644 --- a/pkgs/applications/video/kodi/addons/invidious/default.nix +++ b/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -1,18 +1,13 @@ -{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: buildKodiAddon rec { pname = "invidious"; namespace = "plugin.video.invidious"; - version = "unstable-2022-11-28"; + version = "0.2.6"; - # video search doesn't work for the version on kodi.tv - # if the result contains channels - # https://github.com/TheAssassin/kodi-invidious-plugin/issues/17 - src = fetchFromGitHub { - owner = "TheAssassin"; - repo = "kodi-invidious-plugin"; - rev = "85b66525632d94630c9301d9c490fc002a335d77"; - hash = "sha256-DpsAQUOUYCs3rpWwsk82+00KME4J+Iocu/v781dyyws="; + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/nexus/plugin.video.invidious/plugin.video.invidious-${version}+nexus.0.zip"; + sha256 = "sha256-XnlnhvtHMh4uQTupW/SSOmaEV8xZrL61/6GoRpyKR0o="; }; propagatedBuildInputs = [ @@ -23,10 +18,13 @@ buildKodiAddon rec { passthru = { pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.invidious"; + }; }; meta = with lib; { - homepage = "https://github.com/TheAssassin/kodi-invidious-plugin"; + homepage = "https://github.com/petterreinholdtsen/kodi-invidious-plugin"; description = "A privacy-friendly way of watching YouTube content"; license = licenses.mit; maintainers = teams.kodi.members; diff --git a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index 4c83d73f50bdb..ba6470af873fc 100644 --- a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "20.11.0"; + version = "20.11.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-58Dma0UtD6Uy4zu4aQT2FY0emLiQpA4RChhnneMzFZI="; + sha256 = "sha256-Dvnuy+2xW9hPjPVqN7X057B/1zWqIPbkS90kjexJvio="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/radioparadise/default.nix b/pkgs/applications/video/kodi/addons/radioparadise/default.nix new file mode 100644 index 0000000000000..3100325ddd20c --- /dev/null +++ b/pkgs/applications/video/kodi/addons/radioparadise/default.nix @@ -0,0 +1,30 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests }: + +buildKodiAddon rec { + pname = "radioparadise"; + namespace = "script.radioparadise"; + version = "1.0.5"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/nexus/script.radioparadise/script.radioparadise-${version}.zip"; + sha256 = "sha256-/X/8Q741piNHue5i/kgV+UYpBECyGzkFuN+PUzdeQnA="; + }; + + propagatedBuildInputs = [ + requests + ]; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.radioparadise"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/alxndr42/script.radioparadise"; + description = "Radio Paradise addon for Kodi"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/somafm/default.nix b/pkgs/applications/video/kodi/addons/somafm/default.nix new file mode 100644 index 0000000000000..4ffc69791298b --- /dev/null +++ b/pkgs/applications/video/kodi/addons/somafm/default.nix @@ -0,0 +1,26 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "somafm"; + namespace = "plugin.audio.somafm"; + version = "2.0.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/nexus/plugin.audio.somafm/plugin.audio.somafm-${version}.zip"; + sha256 = "sha256-auPLm7QFabU4tXJPjTl17KpE+lqWM2Edbd2HrXPRx40="; + }; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.somafm"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/Soma-FM-Kodi-Add-On/plugin.audio.somafm"; + description = "SomaFM addon for Kodi"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/mov-cli/default.nix b/pkgs/applications/video/mov-cli/default.nix index 35789cb395f38..23954a05c5aae 100644 --- a/pkgs/applications/video/mov-cli/default.nix +++ b/pkgs/applications/video/mov-cli/default.nix @@ -1,24 +1,34 @@ { lib , python3 , fetchFromGitHub +, mpv }: python3.pkgs.buildPythonPackage rec { pname = "mov-cli"; - version = "unstable-2022-06-30"; + version = "1.5.4"; + format = "pyproject"; src = fetchFromGitHub { owner = "mov-cli"; repo = "mov-cli"; - rev = "b89e807e8ffc830b0b18c8e98712441c03774b8e"; - sha256 = "sha256-D+OeXcLdkbG4ASbPQYIWf7J1CRZ9jH3UXxfTL4WleY0="; + rev = version; + sha256 = "sha256-WhoP4FcoO9+O9rfpC3oDQkVIpVOqxfdLRygHgf1O01g="; }; + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.getBin mpv}/bin" + ]; - propagatedBuildInputs = with python3.pkgs; [ setuptools httpx click beautifulsoup4 colorama ]; - - postPatch = '' - substituteInPlace setup.py --replace "bs4" "beautifulsoup4" - ''; + propagatedBuildInputs = with python3.pkgs; [ + poetry-core + krfzf-py + pycrypto + setuptools + httpx + click + beautifulsoup4 + colorama + ]; meta = with lib; { homepage = "https://github.com/mov-cli/mov-cli"; diff --git a/pkgs/applications/video/mpv/scripts/chapterskip.nix b/pkgs/applications/video/mpv/scripts/chapterskip.nix new file mode 100644 index 0000000000000..c147da8d45984 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/chapterskip.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, nix-update-script +, stdenvNoCC }: + +stdenvNoCC.mkDerivation { + pname = "chapterskip"; + passthru.scriptName = "chapterskip.lua"; + + version = "unstable-2022-09-08"; + src = fetchFromGitHub { + owner = "po5"; + repo = "chapterskip"; + rev = "b26825316e3329882206ae78dc903ebc4613f039"; + hash = "sha256-OTrLQE3rYvPQamEX23D6HttNjx3vafWdTMxTiWpDy90="; + }; + + dontBuild = true; + preferLocalBuild = true; + installPhase = "install -Dt $out/share/mpv/scripts chapterskip.lua"; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = with lib; { + homepage = "https://github.com/po5/chapterskip"; + platforms = platforms.all; + maintainers = with maintainers; [ nicoo ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 8b928e7085bc1..2866f80f5652e 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -9,6 +9,7 @@ lib.recurseIntoAttrs autocrop = callPackage ./autocrop.nix { }; autodeint = callPackage ./autodeint.nix { }; autoload = callPackage ./autoload.nix { }; + chapterskip = callPackage ./chapterskip.nix { }; convert = callPackage ./convert.nix { }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix index e78472ee29c15..b6b577790cfb6 100644 --- a/pkgs/applications/video/qmplay2/default.nix +++ b/pkgs/applications/video/qmplay2/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qmplay2"; - version = "23.08.22"; + version = "23.10.22"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-Ug7WAqZ+BxspQUXweL/OnVBGCsU60DOWNexbi0GpDo0="; + hash = "sha256-yDymUXuILgT4AFTt302GniPi/WNwrTCOuOfdUiKOIyk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index 0b4412432ab0e..3196c846a2c1b 100644 --- a/pkgs/applications/virtualization/ddev/default.nix +++ b/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.22.3"; + version = "1.22.4"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-KxBnnNs7dmNGZR048FSDoCZ7+P1IXnhH6iy7e0y+2f8="; + hash = "sha256-ml7SrUmpZubKeDChmNOCHzboR/OBQsr6R8H9peqABek="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 983e788adc855..34cb0cc757cba 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.76.0"; + version = "1.78.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-Ex+vYbOdD/AyCMgYF0xBKSxEM3lhBSRR80bx35t6tSA="; + hash = "sha256-/FppBl25AgwZhNcwWmUc0ThaTm1U4lhaoCTTJ/R/srI="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 5b27bb933dd84..9c19818b2f660 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ulzSxS5yukkLCykdsxl9nNRnakQ1UitJAHlB9CwLhsM="; + sha256 = "sha256-GmIrz23z/vV6Ut31pajUmPfT9V37Ajs5JaIMD1Ociu8="; }; - cargoHash = "sha256-nNnFbvHsew7jtTBpD3eKXgjkc1arzjWMZWwj96Qmgcw="; + cargoHash = "sha256-AwDaIHuD/0H/SkhxT/V0/4K/5yp+s5DI34e8JQgajgc="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 078c786ae23e1..9c3f3f74e6a62 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "open-vm-tools"; - version = "12.3.0"; + version = "12.3.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${finalAttrs.version}"; - hash = "sha256-YVpWomLED5sBKXKdJtuDjb7/aKB2flVIm2ED3xSsccE="; + hash = "sha256-OuESPenXVDKLckIZ3sQCtQXZXCL6xSLZOxZWVEX2XMk="; }; sourceRoot = "${finalAttrs.src.name}/open-vm-tools"; diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index 89dc9fd568347..ae1130fd146d9 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "1.6.0"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz"; - sha256 = "1n052nwsccc3sr0jqnvhyl0six8wi46vysxjchwrdm8brnsdpf84"; + sha256 = "sha256-uDNB49HF++WTV28VkfZCt32zkp+h0W5xXAuqtaFTmPI="; }; sourceRoot = "."; diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix index 17f53883424c5..8761d615c0306 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -91,5 +91,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ fufexan ]; platforms = wayland.meta.platforms; + mainProgram = "hyprpicker"; }; }) diff --git a/pkgs/build-support/fetchbittorrent/default.nix b/pkgs/build-support/fetchtorrent/default.nix index 916c7e7d8c94f..beb2415df707b 100644 --- a/pkgs/build-support/fetchbittorrent/default.nix +++ b/pkgs/build-support/fetchtorrent/default.nix @@ -30,13 +30,13 @@ let jsonConfig = (formats.json {}).generate "jsonConfig" config; in runCommand name { - nativeBuildInputs = [ cacert ] ++ (if (backend == "transmission" ) then [ transmission_noSystemd ] else if (backend == "rqbit") then [ rqbit ] else throw "rqbit or transmission are the only available backends for fetchbittorrent"); + nativeBuildInputs = [ cacert ] ++ (if (backend == "transmission" ) then [ transmission_noSystemd ] else if (backend == "rqbit") then [ rqbit ] else throw "rqbit or transmission are the only available backends for fetchtorrent"); outputHashAlgo = if hash != "" then null else "sha256"; outputHash = hash; outputHashMode = if recursiveHash then "recursive" else "flat"; # url will be written to the derivation, meaning it can be parsed and utilized - # by external tools, such as tools that may want to seed fetchBittorrent calls + # by external tools, such as tools that may want to seed fetchtorrent calls # in nixpkgs inherit url; } diff --git a/pkgs/build-support/fetchbittorrent/tests.nix b/pkgs/build-support/fetchtorrent/tests.nix index fce1b3933a729..b36c82c6326f5 100644 --- a/pkgs/build-support/fetchbittorrent/tests.nix +++ b/pkgs/build-support/fetchtorrent/tests.nix @@ -1,22 +1,22 @@ -{ testers, fetchFromBittorrent, ... }: +{ testers, fetchtorrent, ... }: { - http-link = testers.invalidateFetcherByDrvHash fetchFromBittorrent { + http-link = testers.invalidateFetcherByDrvHash fetchtorrent { url = "https://webtorrent.io/torrents/wired-cd.torrent"; hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; backend = "transmission"; }; - magnet-link = testers.invalidateFetcherByDrvHash fetchFromBittorrent { + magnet-link = testers.invalidateFetcherByDrvHash fetchtorrent { url = "magnet:?xt=urn:btih:a88fda5954e89178c372716a6a78b8180ed4dad3&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fwired-cd.torrent"; hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; backend = "transmission"; }; - http-link-rqbit = testers.invalidateFetcherByDrvHash fetchFromBittorrent { + http-link-rqbit = testers.invalidateFetcherByDrvHash fetchtorrent { url = "https://webtorrent.io/torrents/wired-cd.torrent"; hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; backend = "rqbit"; }; - magnet-link-rqbit = testers.invalidateFetcherByDrvHash fetchFromBittorrent { + magnet-link-rqbit = testers.invalidateFetcherByDrvHash fetchtorrent { url = "magnet:?xt=urn:btih:a88fda5954e89178c372716a6a78b8180ed4dad3&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share&tr=udp%3A%2F%2Fexplodie.org%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.empire-js.us%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2F&xs=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fwired-cd.torrent"; hash = "sha256-OCsC22WuanqoN6lPv5wDT5ZxPcEHDpZ1EgXGvz1SDYo="; backend = "rqbit"; diff --git a/pkgs/by-name/ab/aba/package.nix b/pkgs/by-name/ab/aba/package.nix new file mode 100644 index 0000000000000..4e62d4da8d0ce --- /dev/null +++ b/pkgs/by-name/ab/aba/package.nix @@ -0,0 +1,53 @@ +{ fetchFromSourcehut +, just +, lib +, nix-update-script +, rustPlatform +, scdoc +}: +let + version = "0.7.0"; +in +rustPlatform.buildRustPackage { + pname = "aba"; + inherit version; + + src = fetchFromSourcehut { + owner = "~onemoresuza"; + repo = "aba"; + rev = version; + hash = "sha256-YPE5HYa90BcNy5jdYbzkT81KavJcbSeGrsWRILnIiEE="; + domain = "sr.ht"; + }; + + cargoSha256 = "sha256-wzI+UMcVeFQNFlWDkyxk8tjpU7beNRKoPYbid8b15/Q="; + + nativeBuildInputs = [ + just + scdoc + ]; + + # There are no tests + doCheck = false; + + dontUseJustBuild = true; + dontUseJustCheck = true; + dontUseJustInstall = true; + + postInstall = '' + just --set PREFIX $out install-doc + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "An address book for aerc"; + homepage = "https://sr.ht/~onemoresuza/aba/"; + changelog = "https://git.sr.ht/~onemoresuza/aba/tree/main/item/CHANGELOG.md"; + downloadPage = "https://git.sr.ht/~onemoresuza/aba/refs/${version}"; + maintainers = with lib.maintainers; [ onemoresuza ]; + license = lib.licenses.isc; + platforms = lib.platforms.unix; + mainProgram = "aba"; + }; +} diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index b884eb9ed06af..4816ac1bdc734 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -40,13 +40,13 @@ let in buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.2.1630.0"; + version = "3.2.1705.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; rev = "refs/tags/${version}"; - hash = "sha256-0tN0rBfz2VZ4UkYLFDGg9218O9vyyRT2Lrppu9TETao="; + hash = "sha256-4KhDD5G/fS1rHitQdbYqIz6RSQ3PTMZsUENC202a/Do="; }; vendorHash = null; diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix new file mode 100644 index 0000000000000..ae21cc0e50074 --- /dev/null +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +}: + +buildGoModule rec { + pname = "c2FmZQ"; + version = "0.4.9"; + + src = fetchFromGitHub { + owner = "c2FmZQ"; + repo = "c2FmZQ"; + rev = "v${version}"; + hash = "sha256-xrQBL/Xjzsg0jZ7cFuDfjCQhmt/dTD8FoCSlw0sX5MQ="; + }; + + ldflags = [ "-s" "-w" ]; + + sourceRoot = "source/c2FmZQ"; + + vendorHash = "sha256-Hz6P+ptn1i+8Ek3pp8j+iB8NN5Xks50jyZuT8Ullxbo="; + + subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ]; + + passthru.tests = { inherit (nixosTests) c2fmzq; }; + + meta = with lib; { + description = "Securely encrypt, store, and share files, including but not limited to pictures and videos"; + homepage = "https://github.com/c2FmZQ/c2FmZQ"; + license = licenses.gpl3Only; + mainProgram = "c2FmZQ-server"; + maintainers = with maintainers; [ hmenke ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/cardboard/default.nix b/pkgs/by-name/ca/cardboard/package.nix index 2afb89ad62167..4bed07f0bc574 100644 --- a/pkgs/applications/window-managers/cardboard/default.nix +++ b/pkgs/by-name/ca/cardboard/package.nix @@ -71,6 +71,8 @@ stdenv.mkDerivation { src = allSources.cardboard; + outputs = [ "out" "dev" "lib" "man" ]; + nativeBuildInputs = [ meson ninja @@ -117,13 +119,18 @@ stdenv.mkDerivation { (lib.mesonEnable "wlroots:libseat" false) ]; - # gcc12 + # gcc12 env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ]; + passthru = { + providedSessions = [ "cardboard" ]; + }; + meta = { homepage = "https://gitlab.com/cardboardwm/cardboard"; description = "A scrollable, tiling Wayland compositor inspired on PaperWM"; license = lib.licenses.gpl3Only; + mainProgram = "cardboard"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; }; diff --git a/pkgs/by-name/ce/certspotter/package.nix b/pkgs/by-name/ce/certspotter/package.nix new file mode 100644 index 0000000000000..53909d61786fa --- /dev/null +++ b/pkgs/by-name/ce/certspotter/package.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, lowdown +}: + +buildGoModule rec { + pname = "certspotter"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "SSLMate"; + repo = "certspotter"; + rev = "v${version}"; + hash = "sha256-6ghS+9b8FZiYdiTk54XRHP46lOq98sN1RDYvRYTt6eU="; + }; + + vendorHash = "sha256-6dV9FoPV8UfS0z5RuuopE99fHcT3RAWCdDi7jpHzVRE="; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ lowdown ]; + + postInstall = '' + cd man + make + mkdir -p $out/share/man/man8 + mv *.8 $out/share/man/man8 + ''; + + meta = with lib; { + description = "Certificate Transparency Log Monitor"; + homepage = "https://github.com/SSLMate/certspotter"; + changelog = "https://github.com/SSLMate/certspotter/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mpl20; + mainProgram = "certspotter"; + maintainers = with maintainers; [ chayleaf ]; + }; +} diff --git a/pkgs/by-name/gu/guile-disarchive/package.nix b/pkgs/by-name/di/disarchive/package.nix index a81157db614e0..9bc24e531552d 100644 --- a/pkgs/by-name/gu/guile-disarchive/package.nix +++ b/pkgs/by-name/di/disarchive/package.nix @@ -6,12 +6,13 @@ , guile-gcrypt , guile-lzma , guile-quickcheck +, makeWrapper , pkg-config , zlib }: stdenv.mkDerivation rec { - pname = "guile-disarchive"; + pname = "disarchive"; version = "0.5.0"; src = fetchurl { @@ -24,6 +25,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook guile + guile-gcrypt + guile-lzma + makeWrapper pkg-config ]; @@ -37,14 +41,23 @@ stdenv.mkDerivation rec { guile-lzma ]; - nativeCheckInputs = [ guile-quickcheck ]; - doCheck = !stdenv.isDarwin; + nativeCheckInputs = [ + guile-quickcheck + ]; + + postInstall = '' + wrapProgram $out/bin/disarchive \ + --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" + ''; + meta = with lib; { description = "Disassemble software into data and metadata"; homepage = "https://ngyro.com/software/disarchive.html"; license = licenses.gpl3Plus; + mainProgram = "disarchive"; maintainers = with maintainers; [ foo-dogsquared ]; platforms = guile.meta.platforms; }; diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 91f98463a85cb..a670490ef0adb 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.161.0"; + version = "0.163.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-hlHwzZ0U3G6IGJjeHZPlO2+thJ1UKxHhRb28EQ39pZk="; + hash = "sha256-rpyLjoHMSgEHTILeEQpUKD7BOJHn/uT3GK6Fquirzdk="; }; - vendorHash = "sha256-9rT2zkgwxDQlxTWF1zHpYOOI7uK5Q/GYFWIrKgP2GaQ="; + vendorHash = "sha256-NOhssVWEkvoXpmnsCVVT7Li0ePGWDSGIlB2MyFtMnpI="; doCheck = false; diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 804446d6fe7a6..5b7817330cb76 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-52vBN/EdO0R2Lt/Iv33Odl437I8kgUhxXwtUuiaAcAU="; + hash = "sha256-GovkmMjxHWP9nl0z1LwQrIgT6TkMaYY1wEwAABAYNK0="; }; - cargoHash = "sha256-j6FsI6FpBXtaNcVDY84UBcqifXuJxBRW5Gdln8pq7Iw="; + cargoHash = "sha256-7mhGAXfrHfOKdcnCPtYNbNGRVCfVHni80zEAUATPRLk="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/by-name/fc/fcitx5-material-color/package.nix b/pkgs/by-name/fc/fcitx5-material-color/package.nix new file mode 100644 index 0000000000000..0385c33e7045d --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-material-color/package.nix @@ -0,0 +1,41 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-material-color"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "hosxy"; + repo = "Fcitx5-Material-Color"; + rev = finalAttrs.version; + hash = "sha256-i9JHIJ+cHLTBZUNzj9Ujl3LIdkCllTWpO1Ta4OT1LTc="; + }; + + installPhase = '' + runHook preInstall + + # https://gitlab.archlinux.org/archlinux/packaging/packages/fcitx5-material-color/-/blob/main/PKGBUILD?ref_type=heads#L16 + install -Dm644 arrow.png radio.png -t $out/share/${finalAttrs.pname}/ + for _variant in black blue brown deepPurple indigo orange pink red sakuraPink teal; do + _variant_name=Material-Color-$_variant + install -dm755 $_variant_name $out/share/fcitx5/themes/$_variant_name + ln -sv ../../../$pname/arrow.png $out/share/fcitx5/themes/$_variant_name/ + ln -sv ../../../$pname/radio.png $out/share/fcitx5/themes/$_variant_name/ + install -Dm644 theme-$_variant.conf $out/share/fcitx5/themes/$_variant_name/theme.conf + sed -i "s/^Name=.*/Name=$_variant_name/" $out/share/fcitx5/themes/$_variant_name/theme.conf + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Fcitx5 themes based on Material color"; + homepage = "https://github.com/hosxy/Fcitx5-Material-Color"; + license = licenses.asl20; + maintainers = with maintainers; [ Cryolitia h7x4 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/fc/fcitx5-nord/package.nix b/pkgs/by-name/fc/fcitx5-nord/package.nix new file mode 100644 index 0000000000000..6ab7fc15f0a20 --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-nord/package.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +}: + +stdenvNoCC.mkDerivation { + pname = "fcitx5-nord"; + version = "unstable-2021-07-27"; + + src = fetchFromGitHub { + owner = "tonyfettes"; + repo = "fcitx5-nord"; + rev = "bdaa8fb723b8d0b22f237c9a60195c5f9c9d74d1"; + hash = "sha256-qVo/0ivZ5gfUP17G29CAW0MrRFUO0KN1ADl1I/rvchE="; + }; + + installPhase = '' + runHook preInstall + + mkdir -pv $out/share/fcitx5/themes/ + cp -rv Nord* $out/share/fcitx5/themes/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Fcitx5 theme based on Nord color"; + homepage = "https://github.com/tonyfettes/fcitx5-nord"; + license = licenses.mit; + maintainers = with maintainers; [ Cryolitia ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index c3e76a5f0c61a..a5aee58a28612 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fortune-kind"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "cafkafk"; repo = "fortune-kind"; rev = "v${version}"; - hash = "sha256-bpQ1cPsgKgOU3stnUwGrMnY9RZGZnuoR6B05LyARtVY="; + hash = "sha256-GWsDauFPyiZA6gY7yuEkAeIZrmrvZyJQnP6+ZkdaQSw="; }; - cargoHash = "sha256-2hL4vbbfvzJk73cvMU+eau+UHDFtokt4v8GBXyNkjbw="; + cargoHash = "sha256-1swDHofUuVQx5J7jwmEyRC9REgv4Jg0r0BHBKmkt5Wc="; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/gu/guile-avahi/package.nix b/pkgs/by-name/gu/guile-avahi/package.nix index 3ad6ff9dd2c37..c75d4ee0f079e 100644 --- a/pkgs/by-name/gu/guile-avahi/package.nix +++ b/pkgs/by-name/gu/guile-avahi/package.nix @@ -3,6 +3,7 @@ , fetchgit , avahi , gmp +, buildPackages , autoreconfHook , pkg-config , texinfo @@ -20,6 +21,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ]; buildInputs = [ guile ]; propagatedBuildInputs = [ avahi gmp ]; diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix new file mode 100644 index 0000000000000..e20a969f8347d --- /dev/null +++ b/pkgs/by-name/gu/guix/package.nix @@ -0,0 +1,138 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +, disarchive +, git +, glibcLocales +, guile +, guile-avahi +, guile-gcrypt +, guile-git +, guile-gnutls +, guile-json +, guile-lib +, guile-lzlib +, guile-lzma +, guile-semver +, guile-ssh +, guile-sqlite3 +, guile-zlib +, guile-zstd +, help2man +, makeWrapper +, pkg-config +, po4a +, scheme-bytestructures +, texinfo +, bzip2 +, libgcrypt +, sqlite +}: + +stdenv.mkDerivation rec { + pname = "guix"; + version = "1.4.0"; + + src = fetchurl { + url = "mirror://gnu/guix/guix-${version}.tar.gz"; + hash = "sha256-Q8dpy/Yy7wVEmsH6SMG6FSwzSUxqvH5HE3u6eyFJ+KQ="; + }; + + postPatch = '' + sed nix/local.mk -i -E \ + -e "s|^sysvinitservicedir = .*$|sysvinitservicedir = $out/etc/init.d|" \ + -e "s|^openrcservicedir = .*$|openrcservicedir = $out/etc/openrc|" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + disarchive + git + glibcLocales + guile + guile-avahi + guile-gcrypt + guile-git + guile-gnutls + guile-json + guile-lib + guile-lzlib + guile-lzma + guile-semver + guile-ssh + guile-sqlite3 + guile-zlib + guile-zstd + help2man + makeWrapper + pkg-config + po4a + scheme-bytestructures + texinfo + ]; + + buildInputs = [ + bzip2 + guile + libgcrypt + sqlite + ]; + + propagatedBuildInputs = [ + disarchive + guile-avahi + guile-gcrypt + guile-git + guile-gnutls + guile-json + guile-lib + guile-lzlib + guile-lzma + guile-semver + guile-ssh + guile-sqlite3 + guile-zlib + guile-zstd + scheme-bytestructures + ]; + + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + "--with-bash-completion-dir=$(out)/etc/bash_completion.d" + ]; + + enableParallelBuilding = true; + + postInstall = '' + for f in $out/bin/*; do + wrapProgram $f \ + --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" + done + ''; + + meta = with lib; { + description = "Functional package manager with a Scheme interface"; + longDescription = '' + GNU Guix is a purely functional package manager for the GNU system, and a distribution thereof. + In addition to standard package management features, Guix supports + transactional upgrades and roll-backs, unprivileged package management, + per-user profiles, and garbage collection. + It provides Guile Scheme APIs, including high-level embedded + domain-specific languages (EDSLs), to describe how packages are built + and composed. + A user-land free software distribution for GNU/Linux comes as part of + Guix. + Guix is based on the Nix package manager. + ''; + homepage = "http://www.gnu.org/software/guix"; + license = licenses.gpl3Plus; + mainProgram = "guix"; + maintainers = with maintainers; [ cafkafk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/in/incus-unwrapped/package.nix b/pkgs/by-name/in/incus-unwrapped/package.nix index dd23b6c0a3b87..051527357ca68 100644 --- a/pkgs/by-name/in/incus-unwrapped/package.nix +++ b/pkgs/by-name/in/incus-unwrapped/package.nix @@ -10,21 +10,21 @@ , sqlite , udev , installShellFiles -, gitUpdater +, nix-update-script }: buildGoModule rec { pname = "incus-unwrapped"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "lxc"; repo = "incus"; rev = "refs/tags/incus-${version}"; - hash = "sha256-DCNMhfSzIpu5Pdg2TiFQ7GgLEScqt/Xqm2X+VSdeaME="; + hash = "sha256-WhprzGzTeB8sEMMTYN5j1Zrwg0GiGLlXTqCkcPq0XVo="; }; - vendorHash = "sha256-Pk0/SfGCqXdXvNHbokSV8ajFHeOv0+Et0JytRCoBLU4="; + vendorHash = "sha256-4fxQHtvRULTyKJTGdo42qwWQUSIWqbqOO1Wf8daBP/s="; postPatch = '' substituteInPlace internal/usbid/load.go \ @@ -54,10 +54,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; tags = [ "libsqlite3" ]; - preBuild = '' - # required for go-cowsql. - export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" - ''; + # required for go-cowsql. + CGO_LDFLAGS_ALLOW = "(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"; postBuild = '' make incus-agent incus-migrate @@ -81,9 +79,11 @@ buildGoModule rec { ''; passthru = { - updateScript = gitUpdater { - rev-prefix = "incus-"; - }; + updateScript = nix-update-script { + extraArgs = [ + "-vr" "incus-\(.*\)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/kd/kdsingleapplication/package.nix b/pkgs/by-name/kd/kdsingleapplication/package.nix new file mode 100644 index 0000000000000..22522dd6dc97c --- /dev/null +++ b/pkgs/by-name/kd/kdsingleapplication/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qt6 +}: + +stdenv.mkDerivation rec { + pname = "KDSingleApplication"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "KDAB"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-5YprRbfiFI2UGMJqDf+3VDwXV904USEpMEpoNm0g7KY="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt6.qtbase ]; + + cmakeFlags = [ "-DKDSingleApplication_QT6=true" ]; + dontWrapQtApps = true; + + meta = with lib; { + description = "KDAB's helper class for single-instance policy applications"; + homepage = "https://www.kdab.com/"; + maintainers = with maintainers; [ hellwolf ]; + platforms = platforms.unix; + license = licenses.mit; + changelog = "https://github.com/KDAB/KDSingleApplication/releases/tag/v${version}"; + }; +} diff --git a/pkgs/by-name/la/lanzaboote-tool/package.nix b/pkgs/by-name/la/lanzaboote-tool/package.nix new file mode 100644 index 0000000000000..919ab7d68f2ce --- /dev/null +++ b/pkgs/by-name/la/lanzaboote-tool/package.nix @@ -0,0 +1,55 @@ +{ systemd +, stdenv +, makeWrapper +, binutils-unwrapped +, sbsigntool +, rustPlatform +, fetchFromGitHub +, lib +}: +rustPlatform.buildRustPackage rec { + pname = "lanzaboote-tool"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "lanzaboote"; + rev = "v${version}"; + hash = "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs="; + }; + + sourceRoot = "source/rust/tool"; + cargoHash = "sha256-g4WzqfH6DZVUuNb0jV3MFdm3h7zy2bQ6d3agrXesWgc="; + + env.TEST_SYSTEMD = systemd; + doCheck = lib.meta.availableOn stdenv.hostPlatform systemd; + + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = '' + # Clean PATH to only contain what we need to do objcopy. + # This is still an unwrapped lanzaboote tool lacking of the + # UEFI stub location. + mv $out/bin/lzbt $out/bin/lzbt-unwrapped + wrapProgram $out/bin/lzbt-unwrapped \ + --set PATH ${lib.makeBinPath [ binutils-unwrapped sbsigntool ]} + ''; + + nativeCheckInputs = [ + binutils-unwrapped + sbsigntool + ]; + + meta = with lib; { + description = "Lanzaboote UEFI tooling for SecureBoot enablement on NixOS systems"; + homepage = "https://github.com/nix-community/lanzaboote"; + license = licenses.gpl3Only; + mainProgram = "lzbt"; + maintainers = with maintainers; [ raitobezarius nikstur ]; + # Broken on aarch64-linux and any other architecture for now. + # Wait for 0.4.0. + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix index 31412e72ec985..5fc90574d40f7 100644 --- a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix +++ b/pkgs/by-name/li/libre-graph-api-cpp-qt-client/package.nix @@ -2,8 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, qtbase -, wrapQtAppsHook +, qt6 }: stdenv.mkDerivation rec { @@ -19,15 +18,14 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/client"; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ qtbase ]; - - cmakeFlags = [ ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qt6.qtbase ]; + dontWrapQtApps = true; meta = with lib; { description = "C++ Qt API for Libre Graph, a free API for cloud collaboration inspired by the MS Graph API"; homepage = "https://owncloud.org"; - maintainers = with maintainers; [ qknight hellwolf ]; + maintainers = with maintainers; [ hellwolf ]; platforms = platforms.unix; license = licenses.asl20; changelog = "https://github.com/owncloud/libre-graph-api-cpp-qt-client/releases/tag/v${version}"; diff --git a/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch b/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch new file mode 100644 index 0000000000000..ea3d240da879b --- /dev/null +++ b/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch @@ -0,0 +1,25 @@ +From d7f7ae55a54437616174f80fb8faa80ae4ffcda4 Mon Sep 17 00:00:00 2001 +From: Adam Stephens <adam@valkor.net> +Date: Fri, 27 Oct 2023 13:26:11 -0400 +Subject: [PATCH] lxd-to-incus: query systemd instead of assuming service file + path + +Signed-off-by: Adam Stephens <adam@valkor.net> +--- + cmd/lxd-to-incus/targets.go | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmd/lxd-to-incus/targets.go b/cmd/lxd-to-incus/targets.go +index f2b405e0e4..ed84d3ebce 100644 +--- a/cmd/lxd-to-incus/targets.go ++++ b/cmd/lxd-to-incus/targets.go +@@ -25,7 +25,8 @@ func (s *targetSystemd) Present() bool { + return false + } + +- if !util.PathExists("/lib/systemd/system/incus.service") { ++ _, err := subprocess.RunCommand("systemctl", "list-unit-files", "incus.service") ++ if err != nil { + return false + } + diff --git a/pkgs/by-name/lx/lxd-to-incus/package.nix b/pkgs/by-name/lx/lxd-to-incus/package.nix index 0b9c34fb046d1..8e58ede27c009 100644 --- a/pkgs/by-name/lx/lxd-to-incus/package.nix +++ b/pkgs/by-name/lx/lxd-to-incus/package.nix @@ -1,32 +1,36 @@ { lib , buildGoModule , fetchFromGitHub -, gitUpdater +, nix-update-script }: buildGoModule rec { pname = "lxd-to-incus"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "lxc"; repo = "incus"; - # use commit which fixes 0.1 versioning, use tags for > 0.1 - rev = "253a06bd8506bf42628d32ccbca6409d051465ec"; - hash = "sha256-LXCTrZEDnFTJpqVH+gnG9HaV1wcvTFsVv2tAWabWYmg="; + rev = "refs/tags/incus-${version}"; + hash = "sha256-WhprzGzTeB8sEMMTYN5j1Zrwg0GiGLlXTqCkcPq0XVo="; }; + patches = [ + ./d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch + ]; + modRoot = "cmd/lxd-to-incus"; - vendorHash = "sha256-Kk5sx8UYuip/qik5ez/pxi+DmzjkPIHNYUHVvBm9f9g="; + vendorHash = "sha256-J95b4fm+VwndoxS8RQF8V8ufI3RjclqzAskEd3ut4bU="; - # required for go-cowsql. - CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"; + CGO_ENABLED = 0; passthru = { - updateScript = gitUpdater { - rev-prefix = "incus-"; - }; + updateScript = nix-update-script { + extraArgs = [ + "-vr" "incus-\(.*\)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index 5bf90c7d90cd7..85810054da076 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -1,17 +1,17 @@ -{ lib, buildNpmPackage, fetchFromGitHub }: +{ lib, buildNpmPackage, fetchFromGitHub, mystmd, testers }: buildNpmPackage rec { pname = "mystmd"; - version = "1.1.22"; + version = "1.1.23"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-jx/UCC/Cl5kqAbMzeikTmrx9xWS02OCp3rn0pvtIAPY="; + hash = "sha256-+zgAm3v7XcNhhVOFueRqJijteQqMCZmE33hDyR4d5bA="; }; - npmDepsHash = "sha256-1qQ19iB7N+KvO1uUdEMU1iN91FMQs4wzfTCdv6wfn30="; + npmDepsHash = "sha256-8brgDSV0BBggYUnizV+24RQMXxPd6HUBDYrw9fJtL+M="; dontNpmInstall = true; @@ -23,6 +23,11 @@ buildNpmPackage rec { runHook postInstall ''; + passthru.tests.version = testers.testVersion { + package = mystmd; + version = "v${version}"; + }; + meta = with lib; { description = "Command line tools for working with MyST Markdown"; homepage = "https://github.com/executablebooks/mystmd"; diff --git a/pkgs/by-name/ne/net-news-wire/package.nix b/pkgs/by-name/ne/net-news-wire/package.nix new file mode 100644 index 0000000000000..95873d5da0c64 --- /dev/null +++ b/pkgs/by-name/ne/net-news-wire/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: + +stdenvNoCC.mkDerivation rec { + pname = "net-news-wire"; + version = "6.1.4"; + + src = fetchurl { + url = "https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-${version}/NetNewsWire${version}.zip"; + hash = "sha256-dNdbniXGre8G2/Ac0GB3GHJ2k1dEiHmAlTX3dJOEC7s="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ + unzip + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -R NetNewsWire.app $out/Applications/ + runHook postInstall + ''; + + meta = with lib; { + description = "RSS reader for macOS and iOS"; + longDescription = '' + It's like podcasts — but for reading. + NetNewsWire shows you articles from your favorite blogs and news sites and keeps track of what you've read. + ''; + homepage = "https://github.com/Ranchero-Software/NetNewsWire"; + changelog = + "https://github.com/Ranchero-Software/NetNewsWire/releases/tag/mac-${version}"; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ jakuzure ]; + }; +} diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index 33d72747be66d..029fd53cdc077 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "netclient"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "gravitl"; repo = "netclient"; rev = "v${version}"; - hash = "sha256-68/BmVoAFaIg4vgjzhedSBqm6H9VDu3M7JemfPEcpjQ="; + hash = "sha256-r5Du9Gwt+deeUe6AJDN85o4snybvzZIIsyt+cfgMq2Q="; }; - vendorHash = "sha256-CsW4tW6+INw93A7uXtHeVnxRrE5unHXhm2SOmQkJwYA="; + vendorHash = "sha256-/RNteV+Ys7TVTJtQsWcGK/1C6mf/sQUahIeEzefBe3A="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ++ lib.optional stdenv.isLinux libX11; diff --git a/pkgs/by-name/ni/nix-health/package.nix b/pkgs/by-name/ni/nix-health/package.nix new file mode 100644 index 0000000000000..5a5179cfcd0a3 --- /dev/null +++ b/pkgs/by-name/ni/nix-health/package.nix @@ -0,0 +1,38 @@ +{ lib, stdenv +, rustPlatform +, fetchCrate +, libiconv +, openssl +, pkg-config +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "nix-health"; + version = "0.2.3"; + + src = fetchCrate { + inherit version; + pname = "nix_health"; + hash = "sha256-WdzzEFk9VPld6AFTNRsaQbMymw1+mNn/TViGO/Qv0so="; + }; + + cargoHash = "sha256-xmuosy9T/52D90uXMQAIxtaYDOlCekNCtzpu/3GyQXE="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libiconv openssl ] + # Use a newer SDK for CoreFoundation, because the sysinfo crate requires + # it, https://github.com/GuillaumeGomez/sysinfo/issues/915 + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; + [ IOKit + CoreFoundation + ]); + + meta = with lib; { + description = "Check the health of your Nix setup"; + homepage = "https://zero-to-flakes.com/health/"; + license = licenses.asl20; + maintainers = with maintainers; [ srid ]; + mainProgram = "nix-health"; + }; +} diff --git a/pkgs/tools/package-management/nixops/deps.nix b/pkgs/by-name/ni/nixops-dns/deps.nix index 7da38f83e7fe0..7da38f83e7fe0 100644 --- a/pkgs/tools/package-management/nixops/deps.nix +++ b/pkgs/by-name/ni/nixops-dns/deps.nix diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/by-name/ni/nixops-dns/package.nix index cf633a65ca53b..cf633a65ca53b 100644 --- a/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/pkgs/by-name/ni/nixops-dns/package.nix diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/by-name/ow/owncloud-client/package.nix index 7da1a368d8455..5edbd5d0f6b80 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/by-name/ow/owncloud-client/package.nix @@ -1,38 +1,49 @@ { lib , stdenv , fetchFromGitHub -, mkDerivation , pkg-config , cmake , extra-cmake-modules -, callPackage -, qtbase -, qtkeychain -, wrapQtAppsHook -, qttools +, qt6 +, qt6Packages , sqlite , libsecret +, libre-graph-api-cpp-qt-client +, kdsingleapplication +# darwin only: +, libinotify-kqueue +, sparkleshare }: stdenv.mkDerivation rec { pname = "owncloud-client"; - version = "4.2.0"; - - libregraph = callPackage ./libre-graph-api-cpp-qt-client.nix { }; + version = "5.0.0"; src = fetchFromGitHub { owner = "owncloud"; repo = "client"; rev = "refs/tags/v${version}"; - hash = "sha256-dPNVp5DxCI4ye8eFjHoLGDlf8Ap682o1UB0k2VNr2rs="; + hash = "sha256-SSMNmWrCT1sGa38oY8P84QNedNkQPcIRWrV9B65B5X8="; }; - nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ]; - buildInputs = [ qtbase qtkeychain sqlite libsecret libregraph ]; + nativeBuildInputs = [ + pkg-config + cmake + extra-cmake-modules + qt6.qttools + qt6.wrapQtAppsHook + ]; - cmakeFlags = [ - "-UCMAKE_INSTALL_LIBDIR" - "-DNO_SHIBBOLETH=1" + buildInputs = [ + sqlite + libsecret + qt6.qtbase + qt6.qtsvg # Needed for the systray icon + qt6Packages.qtkeychain + libre-graph-api-cpp-qt-client + kdsingleapplication + ] ++ lib.optionals stdenv.isDarwin [ + libinotify-kqueue sparkleshare ]; meta = with lib; { @@ -40,7 +51,6 @@ stdenv.mkDerivation rec { homepage = "https://owncloud.org"; maintainers = with maintainers; [ qknight hellwolf ]; platforms = platforms.unix; - broken = stdenv.isDarwin; license = licenses.gpl2Plus; changelog = "https://github.com/owncloud/client/releases/tag/v${version}"; }; diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix new file mode 100644 index 0000000000000..84fe0583f267c --- /dev/null +++ b/pkgs/by-name/ph/phel/package.nix @@ -0,0 +1,27 @@ +{ lib +, fetchFromGitHub +, php +}: + +php.buildComposerProject (finalAttrs: { + pname = "phel"; + version = "0.11.0-dev"; + + src = fetchFromGitHub { + owner = "phel-lang"; + repo = "phel-lang"; + rev = "83d9d81b6c7daae361c0f1f68462083027b81581"; + hash = "sha256-B2IozL/nJE4C1Gq54/64TJEySC1STroG1poCBzd3j3I="; + }; + + vendorHash = "sha256-83GX/dxHa6w1E34wnJshg7yxlVyRkDT5jmAPCCqPdtA="; + + meta = { + changelog = "https://github.com/phel-lang/phel-lang/releases/tag/v${finalAttrs.version}"; + description = "Phel is a functional programming language that compiles to PHP. A Lisp dialect inspired by Clojure and Janet."; + homepage = "https://github.com/phel-lang/phel-lang"; + license = lib.licenses.mit; + mainProgram = "phel"; + maintainers = with lib.maintainers; [ drupol ]; + }; +}) diff --git a/pkgs/by-name/pr/prox/package.nix b/pkgs/by-name/pr/prox/package.nix new file mode 100644 index 0000000000000..7c49551423f7e --- /dev/null +++ b/pkgs/by-name/pr/prox/package.nix @@ -0,0 +1,31 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "prox"; + # While upstream did release a v1.0.0, v0.5.2 is actually newer: https://github.com/fgrosse/prox/releases/tag/v0.5.2 + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "fgrosse"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mqx8ICne0NnyW0N1Jeu+PJXWDBr12OASLxlePI6v6Bc="; + }; + + vendorHash = "sha256-4gZfEbyAzAzxtOR6FhP7eUSdln+fANn87+duCq1aq5A="; + + postPatch = '' + substituteInPlace cmd/prox/version.go \ + --replace '0.0.0-unknown' '${version}' + ''; + + meta = with lib; { + homepage = "https://github.com/fgrosse/prox"; + description = "A process runner for Procfile-based applications "; + license = licenses.bsd2; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix new file mode 100644 index 0000000000000..5af31a41de88d --- /dev/null +++ b/pkgs/by-name/py/pyprland/package.nix @@ -0,0 +1,40 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "pyprland"; + version = "1.4.1"; + format = "pyproject"; + + disabled = python3Packages.pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "hyprland-community"; + repo = "pyprland"; + rev = version; + hash = "sha256-x/Rar80jwBX64pW+uv0edhlC44OP1b1e2vnJLFGlIms="; + }; + + nativeBuildInputs = with python3Packages; [ poetry-core ]; + + postInstall = '' + # file has shebang but cant be run due to a relative import, has proper entrypoint in /bin + chmod -x $out/${python3Packages.python.sitePackages}/pyprland/command.py + ''; + + pythonImportsCheck = [ + "pyprland" + "pyprland.common" + "pyprland.plugins" + "pyprland.plugins.interface" + "pyprland.plugins.ironbar" + ]; + + meta = with lib; { + mainProgram = "pypr"; + description = "An hyperland plugin system"; + homepage = "https://github.com/hyprland-community/pyprland"; + license = licenses.mit; + maintainers = with maintainers; [ iliayar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/pz/pzip/package.nix b/pkgs/by-name/pz/pzip/package.nix new file mode 100644 index 0000000000000..f2797c6791c8d --- /dev/null +++ b/pkgs/by-name/pz/pzip/package.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, unzip +}: + +buildGoModule rec { + pname = "pzip"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "ybirader"; + repo = "pzip"; + rev = "v${version}"; + hash = "sha256-bb2TSSyA7TwgoV53M/7WkNcTq8F0EjCA7ObHfnGL9l0="; + }; + + vendorHash = "sha256-MRZlv4eN1Qbu+QXr//YexTDYSK4pCXAPO7VvGqZhjho="; + + nativeBuildInputs = [ + unzip + ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "A fast concurrent zip archiver and extractor"; + homepage = "https://github.com/ybirader/pzip"; + changelog = "https://github.com/ybirader/pzip/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "pzip"; + }; +} diff --git a/pkgs/by-name/sv/svix-server/Cargo.lock b/pkgs/by-name/sv/svix-server/Cargo.lock new file mode 100644 index 0000000000000..2510e29c9d44f --- /dev/null +++ b/pkgs/by-name/sv/svix-server/Cargo.lock @@ -0,0 +1,5198 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +dependencies = [ + "generic-array", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "serde", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "aide" +version = "0.10.0" +source = "git+https://github.com/svix/aide?rev=e6e9af3#e6e9af320757130074ca9cd537d342b5496d527d" +dependencies = [ + "aide-macros", + "axum", + "bytes", + "cfg-if", + "http", + "indexmap 1.9.3", + "schemars", + "serde", + "serde_json", + "serde_qs", + "thiserror", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "aide-macros" +version = "0.6.0" +source = "git+https://github.com/svix/aide?rev=e6e9af3#e6e9af320757130074ca9cd537d342b5496d527d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "amq-protocol" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d40d8b2465c7959dd40cee32ba6ac334b5de57e9fca0cc756759894a4152a5d" +dependencies = [ + "amq-protocol-tcp", + "amq-protocol-types", + "amq-protocol-uri", + "cookie-factory", + "nom", + "serde", +] + +[[package]] +name = "amq-protocol-tcp" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cb2100adae7da61953a2c3a01935d86caae13329fadce3333f524d6d6ce12e2" +dependencies = [ + "amq-protocol-uri", + "tcp-stream", + "tracing", +] + +[[package]] +name = "amq-protocol-types" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "156ff13c8a3ced600b4e54ed826a2ae6242b6069d00dd98466827cef07d3daff" +dependencies = [ + "cookie-factory", + "nom", + "serde", + "serde_json", +] + +[[package]] +name = "amq-protocol-uri" +version = "7.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "751bbd7d440576066233e740576f1b31fdc6ab86cfabfbd48c548de77eca73e4" +dependencies = [ + "amq-protocol-types", + "percent-encoding", + "url", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 1.9.0", + "futures-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-global-executor-trait" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33dd14c5a15affd2abcff50d84efd4009ada28a860f01c14f9d654f3e81b3f75" +dependencies = [ + "async-global-executor", + "async-trait", + "executor-trait", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix 0.37.23", + "slab", + "socket2 0.4.9", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-reactor-trait" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6012d170ad00de56c9ee354aef2e358359deb1ec504254e0e5a3774771de0e" +dependencies = [ + "async-io", + "async-trait", + "futures-core", + "reactor-trait", +] + +[[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.29", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "async-trait" +version = "0.1.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-http 0.3.5", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-server" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197b070de3ae5fc503d531d4dc7680e016438c2ffc848a1fefebc5c53f35cc17" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "openssl", + "pin-project-lite", + "tokio", + "tokio-openssl", + "tower-service", +] + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base-encode" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17bd29f7c70f32e9387f4d4acfa5ea7b7749ef784fb78cf382df97069337b8c" + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bb8" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98b4b0f25f18bcdc3ac72bdb486ed0acf7e185221fd4dc985bc15db5800b0ba2" +dependencies = [ + "async-trait", + "futures-channel", + "futures-util", + "parking_lot", + "tokio", +] + +[[package]] +name = "bb8-redis" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd456361ba8e4e7f5fe58e1697ce078a149c85ebce13bf9c6b483d3f566fc9c3" +dependencies = [ + "async-trait", + "bb8", + "redis", +] + +[[package]] +name = "binstring" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e0d60973d9320722cb1206f412740e162a33b8547ea8d6be75d7cff237c7a85" + +[[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.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +dependencies = [ + "serde", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand 1.9.0", + "futures-lite", + "log", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "bytecount" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher 0.4.4", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +dependencies = [ + "cfg-if", + "cipher 0.3.0", + "cpufeatures", + "zeroize", +] + +[[package]] +name = "chacha20poly1305" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +dependencies = [ + "aead", + "chacha20", + "cipher 0.3.0", + "poly1305", + "zeroize", +] + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "cipher" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +dependencies = [ + "generic-array", +] + +[[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 = "clap" +version = "4.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "coarsetime" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354" +dependencies = [ + "libc", + "once_cell", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util 0.7.8", +] + +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-oid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + +[[package]] +name = "cookie-factory" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + +[[package]] +name = "crc16" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-bigint" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ct-codecs" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "serde", + "uuid", +] + +[[package]] +name = "der" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +dependencies = [ + "const-oid", + "pem-rfc7468 0.6.0", + "zeroize", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468 0.7.0", + "zeroize", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "des" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" +dependencies = [ + "cipher 0.4.4", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "dyn-clone" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" + +[[package]] +name = "ecdsa" +version = "0.16.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +dependencies = [ + "der 0.7.8", + "digest", + "elliptic-curve", + "rfc6979", + "signature 2.1.0", + "spki 0.7.2", +] + +[[package]] +name = "ed25519-compact" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e18997d4604542d0736fae2c5ad6de987f0a50530cbcc14a7ce5a685328a252d" +dependencies = [ + "ct-codecs", + "getrandom", +] + +[[package]] +name = "ed25519-compact" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a3d382e8464107391c8706b4c14b087808ecb909f6c15c34114bc42e53a9e4c" +dependencies = [ + "ct-codecs", + "getrandom", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +dependencies = [ + "serde", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468 0.7.0", + "pkcs8 0.10.2", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-as-inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enum_dispatch" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "executor-trait" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a1052dd43212a7777ec6a69b117da52f5e52f07aec47d00c1a2b33b85d06b08" +dependencies = [ + "async-trait", +] + +[[package]] +name = "fancy-regex" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766" +dependencies = [ + "bit-set", + "regex", +] + +[[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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "figment" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5" +dependencies = [ + "atomic", + "parking_lot", + "pear", + "serde", + "tempfile", + "toml", + "uncased", + "version_check", +] + +[[package]] +name = "findshlibs" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" +dependencies = [ + "cc", + "lazy_static", + "libc", + "winapi", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "pin-project", + "spin 0.9.8", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fraction" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aa5de57a62c2440ece64342ea59efb7171aa7d016faf8dfcb8795066a17146b" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-lite" +version = "1.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-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "h2" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util 0.7.8", + "tracing", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +dependencies = [ + "hashbrown 0.14.0", +] + +[[package]] +name = "headers" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +dependencies = [ + "base64 0.13.1", + "bitflags 1.3.2", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[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" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "hmac-sha1-compact" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9d405ec732fa3fcde87264e54a32a84956a377b3e3107de96e59b798c84a7" + +[[package]] +name = "hmac-sha256" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3688e69b38018fec1557254f64c8dc2cc8ec502890182f395dbb0aa997aa5735" +dependencies = [ + "digest", +] + +[[package]] +name = "hmac-sha512" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ce1f4656bae589a3fab938f9f09bf58645b7ed01a2c5f8a3c238e01a4ef78a" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.23" +source = "git+https://github.com/svix/hyper/?rev=b901ca7c#b901ca7c7772c427d63d150e1bf1c2ce7ce0d733" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-openssl" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" +dependencies = [ + "http", + "hyper", + "linked_hash_set", + "once_cell", + "openssl", + "openssl-sys", + "parking_lot", + "tokio", + "tokio-openssl", + "tower-layer", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[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.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "inherent" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2 0.5.3", + "widestring", + "windows-sys", + "winreg 0.50.0", +] + +[[package]] +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +dependencies = [ + "serde", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.4", + "windows-sys", +] + +[[package]] +name = "iso8601" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "296af15e112ec6dc38c9fd3ae027b5337a75466e8eed757bd7d5cf742ea85eb6" +dependencies = [ + "nom", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jsonschema" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ca9e2b45609132ae2214d50482c03aeee78826cd6fd53a8940915b81acedf16" +dependencies = [ + "ahash", + "anyhow", + "base64 0.13.1", + "bytecount", + "clap", + "fancy-regex", + "fraction", + "iso8601", + "itoa", + "lazy_static", + "memchr", + "num-cmp", + "parking_lot", + "percent-encoding", + "regex", + "reqwest", + "serde", + "serde_json", + "time 0.3.23", + "url", + "uuid", +] + +[[package]] +name = "jwt-simple" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733741e7bcd1532b56c9ba6c698c069f274f3782ad956f0d2c7f31650cedaa1b" +dependencies = [ + "anyhow", + "binstring", + "coarsetime", + "ct-codecs", + "ed25519-compact 2.0.4", + "hmac-sha1-compact", + "hmac-sha256", + "hmac-sha512", + "k256", + "p256", + "p384", + "rand", + "rsa 0.7.2", + "serde", + "serde_json", + "spki 0.6.0", + "thiserror", + "zeroize", +] + +[[package]] +name = "k256" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", + "signature 2.1.0", +] + +[[package]] +name = "lapin" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f3067a1fcfbc3fc46455809c023e69b8f6602463201010f4ae5a3b572adb9dc" +dependencies = [ + "amq-protocol", + "async-global-executor-trait", + "async-reactor-trait", + "async-trait", + "executor-trait", + "flume", + "futures-core", + "futures-io", + "parking_lot", + "pinky-swear", + "reactor-trait", + "serde", + "tracing", + "waker-fn", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[package]] +name = "libsqlite3-sys" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linked_hash_set" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" +dependencies = [ + "linked-hash-map", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-cmp" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa" + +[[package]] +name = "num-complex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +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", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openssl" +version = "0.10.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "opentelemetry" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "js-sys", + "lazy_static", + "percent-encoding", + "pin-project", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "opentelemetry-http" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "449048140ee61e28f57abe6e9975eedc1f3a29855c7407bd6c12b18578863379" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1a6ca9de4c8b00aa7f1a153bd76cb263287155cec642680d79d98706f3d28a" +dependencies = [ + "async-trait", + "futures", + "futures-util", + "http", + "opentelemetry", + "prost", + "thiserror", + "tokio", + "tonic", + "tonic-build", +] + +[[package]] +name = "ordered-float" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +dependencies = [ + "num-traits", +] + +[[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "serde", + "winapi", +] + +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p12" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4873306de53fe82e7e484df31e1e947d61514b6ea2ed6cd7b45d63006fd9224" +dependencies = [ + "cbc", + "cipher 0.4.4", + "des", + "getrandom", + "hmac", + "lazy_static", + "rc2", + "sha1", + "yasna", +] + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pear" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a386cd715229d399604b50d1361683fe687066f42d56f54be995bc6868f71c" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f0f13dac8069c139e8300a6510e3f4143ecf5259c60b116a9b271b4ca0d54" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "pem-rfc7468" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +dependencies = [ + "base64ct", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap 1.9.3", +] + +[[package]] +name = "pin-project" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pinky-swear" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d894b67aa7a4bf295db5e85349078c604edaa6fa5c8721e8eca3c7729a27f2ac" +dependencies = [ + "doc-comment", + "flume", + "parking_lot", + "tracing", +] + +[[package]] +name = "pkcs1" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" +dependencies = [ + "der 0.6.1", + "pkcs8 0.9.0", + "spki 0.6.0", + "zeroize", +] + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der 0.7.8", + "pkcs8 0.10.2", + "spki 0.7.2", +] + +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der 0.6.1", + "spki 0.6.0", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der 0.7.8", + "spki 0.7.2", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys", +] + +[[package]] +name = "poly1305" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +dependencies = [ + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "primeorder" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +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.29", + "version_check", + "yansi", +] + +[[package]] +name = "prost" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +dependencies = [ + "bytes", + "heck 0.3.3", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prost", + "prost-types", + "regex", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" +dependencies = [ + "bytes", + "prost", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rc2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62c64daa8e9438b84aaae55010a93f396f8e60e3911590fcba770d04643fc1dd" +dependencies = [ + "cipher 0.4.4", +] + +[[package]] +name = "reactor-trait" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "438a4293e4d097556730f4711998189416232f009c137389e0f961d2bc0ddc58" +dependencies = [ + "async-trait", + "futures-core", + "futures-io", +] + +[[package]] +name = "redis" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ea8c51b5dc1d8e5fd3350ec8167f464ec0995e79f2e90a075b63371500d557f" +dependencies = [ + "async-trait", + "bytes", + "combine", + "crc16", + "futures", + "futures-util", + "itoa", + "log", + "native-tls", + "percent-encoding", + "pin-project-lite", + "rand", + "ryu", + "sha1_smol", + "tokio", + "tokio-native-tls", + "tokio-util 0.7.8", + "url", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +dependencies = [ + "base64 0.21.2", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tower-service", + "trust-dns-resolver", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.22.6", + "winreg 0.10.1", +] + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rsa" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c" +dependencies = [ + "byteorder", + "digest", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1 0.4.1", + "pkcs8 0.9.0", + "rand_core", + "signature 1.6.4", + "smallvec", + "subtle", + "zeroize", +] + +[[package]] +name = "rsa" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +dependencies = [ + "byteorder", + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", + "pkcs1 0.7.5", + "pkcs8 0.10.2", + "rand_core", + "signature 2.1.0", + "spki 0.7.2", + "subtle", + "zeroize", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys", +] + +[[package]] +name = "rustls" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-connector" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "060bcc1795b840d0e56d78f3293be5f652aa1611d249b0e63ffe19f4a8c9ae23" +dependencies = [ + "log", + "rustls", + "rustls-native-certs", + "rustls-webpki", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.2", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "schemars" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +dependencies = [ + "chrono", + "dyn-clone", + "indexmap 1.9.3", + "schemars_derive", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "schemars_derive" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 1.0.109", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sea-bae" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bd3534a9978d0aa7edd2808dc1f8f31c4d0ecd31ddf71d997b3c98e9f3c9114" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "sea-orm" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f6c7daef05dde3476d97001e11fca7a52b655aa3bf4fd610ab2da1176a2ed5" +dependencies = [ + "async-stream", + "async-trait", + "chrono", + "futures", + "log", + "ouroboros", + "sea-orm-macros", + "sea-query", + "sea-query-binder", + "serde", + "serde_json", + "sqlx", + "strum 0.25.0", + "thiserror", + "time 0.3.23", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "sea-orm-macros" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd90e73d5f5b184bad525767da29fbfec132b4e62ebd6f60d2f2737ec6468f62" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "sea-bae", + "syn 2.0.29", + "unicode-ident", +] + +[[package]] +name = "sea-query" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aeb899964df7038e7274306b742951b82a04f835bca8a4683a4c254a6bf35fa" +dependencies = [ + "chrono", + "derivative", + "inherent", + "ordered-float", + "serde_json", +] + +[[package]] +name = "sea-query-binder" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9" +dependencies = [ + "chrono", + "sea-query", + "serde_json", + "sqlx", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der 0.7.8", + "generic-array", + "pkcs8 0.10.2", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + +[[package]] +name = "sentry" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b0ad16faa5d12372f914ed40d00bda21a6d1bdcc99264c5e5e1c9495cf3654" +dependencies = [ + "httpdate", + "native-tls", + "reqwest", + "sentry-backtrace", + "sentry-contexts", + "sentry-core", + "sentry-debug-images", + "sentry-panic", + "sentry-tracing", + "tokio", + "ureq", +] + +[[package]] +name = "sentry-backtrace" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11f2ee8f147bb5f22ac59b5c35754a759b9a6f6722402e2a14750b2a63fc59bd" +dependencies = [ + "backtrace", + "once_cell", + "regex", + "sentry-core", +] + +[[package]] +name = "sentry-contexts" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcd133362c745151eeba0ac61e3ba8350f034e9fe7509877d08059fe1d7720c6" +dependencies = [ + "hostname", + "libc", + "os_info", + "rustc_version", + "sentry-core", + "uname", +] + +[[package]] +name = "sentry-core" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7163491708804a74446642ff2c80b3acd668d4b9e9f497f85621f3d250fd012b" +dependencies = [ + "once_cell", + "rand", + "sentry-types", + "serde", + "serde_json", +] + +[[package]] +name = "sentry-debug-images" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5003d7ff08aa3b2b76994080b183e8cfa06c083e280737c9cee02ca1c70f5e" +dependencies = [ + "findshlibs", + "once_cell", + "sentry-core", +] + +[[package]] +name = "sentry-panic" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4dfe8371c9b2e126a8b64f6fefa54cef716ff2a50e63b5558a48b899265bccd" +dependencies = [ + "sentry-backtrace", + "sentry-core", +] + +[[package]] +name = "sentry-tracing" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aca8b88978677a27ee1a91beafe4052306c474c06f582321fde72d2e2cc2f7f" +dependencies = [ + "sentry-backtrace", + "sentry-core", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sentry-types" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e7a88e0c1922d19b3efee12a8215f6a8a806e442e665ada71cc222cab72985f" +dependencies = [ + "debugid", + "getrandom", + "hex", + "serde", + "serde_json", + "thiserror", + "time 0.3.23", + "url", + "uuid", +] + +[[package]] +name = "serde" +version = "1.0.185" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.185" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "serde_derive_internals" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "serde_json" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c679fa27b429f2bb57fd4710257e643e86c966e716037259f8baa33de594a1b6" +dependencies = [ + "axum", + "futures", + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "sha2" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +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", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der 0.6.1", +] + +[[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der 0.7.8", +] + +[[package]] +name = "sqlformat" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +dependencies = [ + "itertools", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "dotenvy", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.0.0", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots 0.24.0", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +dependencies = [ + "dotenvy", + "either", + "heck 0.4.1", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +dependencies = [ + "atoi", + "base64 0.21.2", + "bitflags 2.3.3", + "byteorder", + "bytes", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa 0.9.2", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +dependencies = [ + "atoi", + "base64 0.21.2", + "bitflags 2.3.3", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stringprep" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "svix" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4a0071892c06482d6585e7b15146b088f777d4da18aa924d9f960d59b7e4f4" +dependencies = [ + "base64 0.13.1", + "hmac-sha256", + "http", + "reqwest", + "serde", + "serde_derive", + "serde_json", + "thiserror", + "time 0.3.23", + "url", +] + +[[package]] +name = "svix-ksuid" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c0c2b19ae442a1842ba35f7eeff46e684bb24cb4a9571f41b48e5181e5eadd5" +dependencies = [ + "base-encode", + "byteorder", + "chrono", + "getrandom", +] + +[[package]] +name = "svix-server" +version = "1.13.0" +dependencies = [ + "aide", + "anyhow", + "axum", + "axum-server", + "base64 0.13.1", + "bb8", + "bb8-redis", + "blake2", + "bytes", + "chacha20poly1305", + "chrono", + "clap", + "dotenv", + "ed25519-compact 1.0.16", + "enum_dispatch", + "figment", + "form_urlencoded", + "futures", + "hmac-sha256", + "http", + "hyper", + "hyper-openssl", + "indexmap 1.9.3", + "ipnet", + "jsonschema", + "jwt-simple", + "lapin", + "num_enum", + "once_cell", + "openssl", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-otlp", + "rand", + "redis", + "regex", + "reqwest", + "schemars", + "sea-orm", + "sentry", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha2", + "sqlx", + "strum 0.24.1", + "strum_macros", + "svix", + "svix-ksuid", + "svix-server_derive", + "thiserror", + "tikv-jemallocator", + "time 0.3.23", + "tokio", + "tower", + "tower-http 0.4.3", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber", + "trust-dns-resolver", + "url", + "urlencoding", + "validator", +] + +[[package]] +name = "svix-server_derive" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "tcp-stream" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4da30af7998f51ee1aa48ab24276fe303a697b004e31ff542b192c088d5630a5" +dependencies = [ + "cfg-if", + "p12", + "rustls-connector", + "rustls-pemfile", +] + +[[package]] +name = "tempfile" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +dependencies = [ + "cfg-if", + "fastrand 2.0.0", + "redox_syscall", + "rustix 0.38.4", + "windows-sys", +] + +[[package]] +name = "thiserror" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.5.4+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +dependencies = [ + "autocfg", + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.4.9", + "tokio-macros", + "windows-sys", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-openssl" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" +dependencies = [ + "futures-util", + "openssl", + "openssl-sys", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tonic" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" +dependencies = [ + "async-stream", + "async-trait", + "base64 0.13.1", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "prost-derive", + "tokio", + "tokio-stream", + "tokio-util 0.6.10", + "tower", + "tower-layer", + "tower-service", + "tracing", + "tracing-futures", +] + +[[package]] +name = "tonic-build" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" +dependencies = [ + "proc-macro2", + "prost-build", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util 0.7.8", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags 1.3.2", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +dependencies = [ + "bitflags 2.3.3", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", + "uuid", +] + +[[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.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lazy_static", + "lru-cache", + "parking_lot", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] + +[[package]] +name = "uncased" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "universal-hash" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "ureq" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +dependencies = [ + "base64 0.21.2", + "log", + "native-tls", + "once_cell", + "url", +] + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna 0.4.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 = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "validator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0f08911ab0fee2c5009580f04615fa868898ee57de10692a45da0c3bcc3e5e" +dependencies = [ + "idna 0.2.3", + "lazy_static", + "regex", + "serde", + "serde_derive", + "serde_json", + "url", + "validator_derive", + "validator_types", +] + +[[package]] +name = "validator_derive" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d85135714dba11a1bd0b3eb1744169266f1a38977bf4e3ff5e2e1acb8c2b7eee" +dependencies = [ + "if_chain", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "validator_types", +] + +[[package]] +name = "validator_types" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[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.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.29", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "webpki-roots" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +dependencies = [ + "rustls-webpki", +] + +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys", +] + +[[package]] +name = "yansi" +version = "1.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee746ad3851dd3bc40e4a028ab3b00b99278d929e48957bcb2d111874a7e43e" + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" + +[[package]] +name = "zeroize" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix new file mode 100644 index 0000000000000..e7de972488e2e --- /dev/null +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -0,0 +1,54 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, protobuf, stdenv +, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "svix-server"; + version = "1.13.0"; + + src = fetchFromGitHub { + owner = "svix"; + repo = "svix-webhooks"; + rev = "v${version}"; + hash = "sha256-6758ej7bTvwZPWifl239rQMazM8uw+Y4+3EbjE8XsTg="; + }; + + sourceRoot = "source/server"; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "aide-0.10.0" = "sha256-hUUer5D6OA4F0Co3JgygY3g89cKIChFest67ABIX+4M="; + "hyper-0.14.23" = "sha256-7MBCAjKYCdDbqCmYg3eYE74h7K7yTjfVoo0sjxr4g/s="; + }; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + protobuf + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + # needed for internal protobuf c wrapper library + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + + OPENSSL_NO_VENDOR = 1; + + # disable tests because they require postgres and redis to be running + doCheck = false; + + meta = with lib; { + mainProgram = "svix-server"; + description = "The enterprise-ready webhooks service"; + homepage = "https://github.com/svix/svix-webhooks"; + changelog = + "https://github.com/svix/svix-webhooks/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix index 7268b43865682..9c0086dfffcbd 100644 --- a/pkgs/by-name/tr/tradingview/package.nix +++ b/pkgs/by-name/tr/tradingview/package.nix @@ -64,15 +64,18 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out - cp -r squashfs-root/* $out + mkdir -p $out/share + cp -r squashfs-root $out/share/tradingview + rm -rf $out/share/tradingview/meta - mkdir -p $out/share/applications - mv $out/meta/gui/tradingview.desktop $out/share/applications - substituteInPlace $out/share/applications/tradingview.desktop --replace \$\{SNAP} $out + install -Dm444 squashfs-root/meta/gui/tradingview.desktop -t $out/share/applications + substituteInPlace $out/share/applications/tradingview.desktop --replace \$\{SNAP}/meta/gui/icon.png tradingview + + mkdir $out/share/icons + cp squashfs-root/meta/gui/icon.png $out/share/icons/tradingview.png mkdir $out/bin - makeBinaryWrapper $out/tradingview $out/bin/tradingview --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath buildInputs } + makeBinaryWrapper $out/share/tradingview/tradingview $out/bin/tradingview --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath buildInputs } runHook postInstall ''; @@ -88,4 +91,3 @@ stdenv.mkDerivation rec { mainProgram = "tradingview"; }; } - diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index bc04a2fc8fea3..9ddfd1d8cf134 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "uiua"; - version = "0.0.22"; + version = "0.0.23"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; - rev = "refs/tags/${version}"; - hash = "sha256-x1xZH+AVJqnvwxgBgcVB5LvDb54C+HnPBCTIqZ8Dv7E="; + rev = version; + hash = "sha256-+Q/dn0pGZ3R+UlAt9stQZU1n+WITujJzTxY5dpXc+Bc="; }; - cargoHash = "sha256-gY+KeE2ATsCydpxcRoLtRDeyEvOGv7+I0SskLq8b9rw="; + cargoHash = "sha256-R4jQ9Or9vh3dtqJH7nPvYM4o1h277sFUf+nC1VQl1Uk="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook @@ -41,13 +41,14 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional audioSupport "audio"; - passthru.tests.run = runCommand "uiua-test-run" {nativeBuildInputs = [uiua];} '' + passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } '' uiua init; diff -U3 --color=auto <(uiua run main.ua) <(echo '"Hello, World!"') touch $out; ''; - meta = with lib; { + meta = { + changelog = "https://github.com/uiua-lang/uiua/releases/tag/${src.rev}"; description = "A stack-oriented array programming language with a focus on simplicity, beauty, and tacit code"; longDescription = '' Uiua combines the stack-oriented and array-oriented paradigms in a single @@ -55,8 +56,8 @@ rustPlatform.buildRustPackage rec { high information density and little syntactic noise. ''; homepage = "https://www.uiua.org/"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "uiua"; - maintainers = with maintainers; [ cafkafk tomasajt ]; + maintainers = with lib.maintainers; [ cafkafk tomasajt ]; }; } diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index d25167ebe3083..52c21e75f7b11 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , stdenvNoCC +, gcc13Stdenv , fetchFromGitHub , substituteAll , makeWrapper @@ -9,6 +10,7 @@ , vencord , electron , pipewire +, libpulseaudio , libicns , jq , moreutils @@ -16,13 +18,13 @@ }: stdenv.mkDerivation rec { pname = "vesktop"; - version = "0.3.3"; + version = "0.4.2"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${version}"; - sha256 = "sha256-Njs3tACxUyRolYUtS/q2lITIQnUBFXVXWZEfQ66HpPM="; + hash = "sha256-elgoX8z8q0+7uUia9gbcCmpDg+qYRWWUxdRuNV53Puw="; }; pnpm-deps = stdenvNoCC.mkDerivation { @@ -51,7 +53,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-vInaSLGahRUgvwAeUcI+oV84L+tgNRCmfFpE0aUD4X4="; + outputHash = "sha256-KDJ8QmpwGb2lOdwWEl5y62pJiqEvpI59StfQZrN1PPE="; }; nativeBuildInputs = [ @@ -92,7 +94,12 @@ stdenv.mkDerivation rec { # yes, upstream really packages it as "vesktop" but uses "vencorddesktop" file names installPhase = let - libPath = lib.makeLibraryPath [ pipewire ]; + # this is mainly required for venmic + libPath = lib.makeLibraryPath [ + libpulseaudio + pipewire + gcc13Stdenv.cc.cc.lib + ]; in '' runHook preInstall @@ -132,7 +139,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Vencord/Vesktop"; license = licenses.gpl3Only; maintainers = with maintainers; [ getchoo Scrumplex vgskye ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "vencorddesktop"; + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/ws/wslay/package.nix b/pkgs/by-name/ws/wslay/package.nix new file mode 100644 index 0000000000000..ed6c0c9b67354 --- /dev/null +++ b/pkgs/by-name/ws/wslay/package.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, cmake, cunit }: + +stdenv.mkDerivation rec { + pname = "wslay"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "tatsuhiro-t"; + repo = "wslay"; + rev = "release-${version}"; + hash = "sha256-xKQGZO5hNzMg+JYKeqOBsu73YO+ucBEOcNhG8iSNYvA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "WSLAY_TESTS" true) + ]; + + doCheck = true; + + checkInputs = [ cunit ]; + + meta = with lib; { + homepage = "https://tatsuhiro-t.github.io/wslay/"; + description = "The WebSocket library in C"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ pingiun ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/yu/yunfaavatar/package.nix b/pkgs/by-name/yu/yunfaavatar/package.nix new file mode 100644 index 0000000000000..369f89d7c888d --- /dev/null +++ b/pkgs/by-name/yu/yunfaavatar/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + bash, + imagemagick, + makeWrapper, +}: +stdenvNoCC.mkDerivation rec { + pname = "yunfaavatar"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "yunfachi"; + repo = "yunfaAvatar"; + rev = version; + hash = "sha256-hCpbe+gW9hkiVOKq7a55n5s3bMpyCNGWiY3D2b4VYxg="; + }; + + strictDeps = true; + nativeBuildInputs = [makeWrapper]; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + postInstall = '' + wrapProgram "$out/bin/yunfaavatar" \ + --prefix PATH : "${lib.makeBinPath [imagemagick]}" + ''; + + meta = with lib; { + description = "Utility for automatic centralized changing of avatar in Github, Discord, Steam, Shikimori, and many more"; + homepage = "https://github.com/yunfachi/yunfaAvatar"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [yunfachi]; + mainProgram = "yunfaavatar"; + }; +} diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 4503b09354a96..d0f055166805e 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation { pname = "google-fonts"; - version = "unstable-2022-11-14"; + version = "unstable-2023-10-20"; # Adobe Blank is split out in a separate output, # because it causes crashes with `libfontconfig`. @@ -16,8 +16,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "83e116a566eda04a2469a11ee562cef1d7b33e4f"; - sha256 = "sha256-sSabk+VWkoXj1Nzv9ufgIU/nkfKf4XkZU1SO+j+eSPA="; + rev = "990be3ed8f77e31c26bf07b148d6a74b8e6241cf"; + sha256 = "sha256-ffLXzaniHkWxGQpvlJpiO6/SAdbI3FONgTaq8Xu+WY0="; }; postPatch = '' @@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation { rm -rv ofl/cabincondensed \ ofl/signikanegative \ ofl/signikanegativesc \ + ofl/*_todelist \ axisregistry/tests/data if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then @@ -67,5 +68,6 @@ stdenvNoCC.mkDerivation { platforms = platforms.all; hydraPlatforms = []; maintainers = with maintainers; [ manveru ]; + sourceProvenance = [ sourceTypes.binaryBytecode ]; }; } diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index fa1787d8f7fc8..5d2be4826f431 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "27.2.0"; + version = "27.3.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 5d687585141da..fdd9ff2de15b6 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "27.3.1"; + version = "27.3.2"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-7ndJDdgDn5tnnUeB4etQ8bBZnH7NuiYoNQ9CrF2HtwQ="; + hash = "sha256-an2/Aqb+5t61CkiBhwL9lA0WPxhIC+tDDjhn8alcqJQ="; }; - npmDepsHash = "sha256-MNlT8VJTIvoZDAAdEs0Fa8gqO7dWhRR9I4Kw4qlW5Ig="; + npmDepsHash = "sha256-BQTM/ea/X2iqRkX510fAzouPNcV7cUmtY7J/CSUMH7o="; nativeBuildInputs = [ remarshal diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 0094fc3e6fe14..4035a0961a263 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1jn883s4vvpfih31yxap2hg6xya9jfjnqa8f7iqkqyxxqrnx7zzm"; - iosevka-aile = "1p2s5nslifmdbjbqqlk02kl0rvpmr5pkq71hr9xim2dqb11kmcdl"; - iosevka-curly = "0rs7jmgpl1ki7b9i3l78fn63xbgd02wraixqb1yjc3lmxi9jbhxn"; - iosevka-curly-slab = "09rf82w41fbw7pm1ak9vv1i9450h2ia7x434gn9czx01wnb3s2zb"; - iosevka-etoile = "1621a74z378rz4l1gn9dr7fqqvnd1g7ipr5bw13qhwl5ljf170xs"; - iosevka-slab = "06x3hbi05bzlaci7hr3wk8j92zn97i41bw8xjnj8sh63mla36w9p"; - iosevka-ss01 = "1plp7lk9yzizfz9c5k4m51ynvp0zkz7r7vgx416rkwb3yh23fjpv"; - iosevka-ss02 = "0zpl9a8nccnrywaxj61glj4x7ai1fas9x463xqpy38w686n0jjyn"; - iosevka-ss03 = "1xrxvsj2ja9miwvgq7p6kxysn8858gk8qh2pp1bw1n67vppvhkp9"; - iosevka-ss04 = "1y0ac2dq8xmrbw84nar2jsxbyf9nck8fxh3dbl8vhvpnbwan150w"; - iosevka-ss05 = "1z722m5chr8jq24i7czph1qgkasah7y7i4wv2wv0n2j89mc2fbc2"; - iosevka-ss06 = "1fzsj9389cah6zp23vlr375j107jxfabqxaa7iv1hjbw3fa2vmdk"; - iosevka-ss07 = "18psmz6kfhdmpac408w1fsqfarahn60bypm8ci8y3gd8bk8js13c"; - iosevka-ss08 = "0hjlrly98hd4w5l6cm361h4cyvkdrlf3bp1g6f438aip0bj2y94w"; - iosevka-ss09 = "13jdlmamfbxnkqii6bkh0xm71fgqdvgnqs88dnq8pjyqhbl32sca"; - iosevka-ss10 = "15ak510q6di9hsy2p8k7gkp5d1kzgrmk2m55zh90w5irbr5fmbjp"; - iosevka-ss11 = "0x42pjik0iy2v11iq8i83wa88f6b6qymc3v2sih28rjhijxl7lsm"; - iosevka-ss12 = "15s7imcm4w61555crah1pxzc9yn3zffkj13zk8zidgk6v7jzb6rs"; - iosevka-ss13 = "1q3d3fyjsk6iwq1w6dv9rc7ivk021i3v2px574dfbqlswvb2sg86"; - iosevka-ss14 = "0r1fkrcqcccx4zz9qgzgq9si8xcbn7y1f2821cjs6cbfaxmrkwmc"; - iosevka-ss15 = "0vgwgkfnch5rn7kc9rblg1km4pzqwsglb31zqnx3rxhszm66j9q6"; - iosevka-ss16 = "009whnydn5rb6dj06scnc3722y8sddsv4jl42r70x2zzra14qdgk"; - iosevka-ss17 = "01j1gqrmlx3b6rlv6sg3kv9j39s2dwqvj35h4v0v7min2vn1hydj"; - iosevka-ss18 = "1pbwqgrkv560237marp5msq1y93llxvjrpixka15a79a7lmpd36i"; - sgr-iosevka = "0p31qdby1znrsz4hplrq81ngv1l2pxbn9x26hcpjxrbgv2mmvhfq"; - sgr-iosevka-aile = "00zapw8mk0z40jw69ynvdzhpd67rvi9lp509hf3vb7x3cq1ka1wz"; - sgr-iosevka-curly = "1rgxkc2ps8pmp3mgi2b51lv4j5cc5q7m6iizw8gbfl36qmzlfdlh"; - sgr-iosevka-curly-slab = "1fdxr0mkb40fa0605i8b8h51pg8p3cskjsggil9gp1376wzhr42q"; - sgr-iosevka-etoile = "1r91042avgn0f0p2rf09pam4wfjndkj7wml9vs082kc40aqgh9m5"; - sgr-iosevka-fixed = "13b5nkyxpm9izj0dmwc97lqbfvbxqyjg3677hpi6ywl3c6m1h542"; - sgr-iosevka-fixed-curly = "06r0lzcrhf9897yi9h6xh5n1mfb8j4v21nz81igs616w7gjlz0dk"; - sgr-iosevka-fixed-curly-slab = "1l9qaialwq2xygznylbwkizbqwghzl4625d845f8kwyl9krd92na"; - sgr-iosevka-fixed-slab = "199s1cdn22rjirrh1f9xhqbh77namriw077g11hykr4ibwy6sc6n"; - sgr-iosevka-fixed-ss01 = "1y51qk0pfq9r8hpcgmcykrvddl8rw5rjfysrbsjvf6zi59z5rk02"; - sgr-iosevka-fixed-ss02 = "12x3qrw6baxfwbj2wgawf9qpbk8nv7ccd9grqgw7b4qmy5j31n39"; - sgr-iosevka-fixed-ss03 = "1sf8xybh8l76dbm8vgk0y4lgdm5lb5pb4kgnipygqj9z0kasj07d"; - sgr-iosevka-fixed-ss04 = "0pbpqnv6kdnnl4yix3ysfrnxg3ainsl9m0pnkb1i21q5sav20ph5"; - sgr-iosevka-fixed-ss05 = "1vgfiqxwfg3m68dlk4s1x5ms293nbwgdq34y80hysp8pfzl7d07z"; - sgr-iosevka-fixed-ss06 = "17f3rxsh2nla6a8fhim88vxqj1kzafvcfbara1iwzsw3fw9gz2ai"; - sgr-iosevka-fixed-ss07 = "1j3r197jx51b7l5cpm2g5b7mzq53wp05f8ra3cz04r69qc0dj8i5"; - sgr-iosevka-fixed-ss08 = "1gj784bi4wy0282xbq3f24sqlm7b2s1gz2f8sna4bd5bgci8avb7"; - sgr-iosevka-fixed-ss09 = "0hhqvghq0mxbjzfhfcjgij94b40129vhg6x4slgk579kdfmr21y4"; - sgr-iosevka-fixed-ss10 = "044dam3cg2s29j0zbq03ypyyskws31dfvyyp01smds7njf8f2w39"; - sgr-iosevka-fixed-ss11 = "1xxmcai145rfjhlx4n5hcs7kdz298pxn9b3if85cpmdd9qhdmy48"; - sgr-iosevka-fixed-ss12 = "13rbsql91z2ndbx121j1yb3m10a2fwil0jilhfjj17rn0kh0a5qi"; - sgr-iosevka-fixed-ss13 = "19y6x2jln772afqy7y2k97kzpin73y5wq72fh7c9n9cmh1n24628"; - sgr-iosevka-fixed-ss14 = "0ndm0yk95a10qv95c9d5qhjx4vzc28wkahlxjadndxh82hn8zlqm"; - sgr-iosevka-fixed-ss15 = "107lwn4d01hry6jyk2blxdy7gx80ka6wrgxs80l5czx4jsk6kr66"; - sgr-iosevka-fixed-ss16 = "0ka5rp7svqp5hs2zdf0bq5lfhgfmqij93f53q1a0snispx1qnsn6"; - sgr-iosevka-fixed-ss17 = "18kvws3r66b1lqqpyphpf1nk6qdv6pv9c36zf0kpi7hpfcp1dvaa"; - sgr-iosevka-fixed-ss18 = "1s9gzh2ghs66rjjz7317x163072gy2fxbqmvhghngd7bpvbajdd6"; - sgr-iosevka-slab = "0b78y7pikcrlilzn2xlvg5f7liqp0zvzcknx9l47nh32sqn11f5j"; - sgr-iosevka-ss01 = "1nrj6dl3znakj3h0fvd37k71gcp2l0yfgqggdn6ms4cyyrq16z38"; - sgr-iosevka-ss02 = "0mhn1jx2ibllp8h05lm9ms8wh960yyncblx4pkj95sswm5kdv8vv"; - sgr-iosevka-ss03 = "0xxanqcpqh5fvhfad6cyk89yr2nza9lpig6dralizi8b1vxl7bnl"; - sgr-iosevka-ss04 = "1566hvq2lwnh6p7v55j8khi56y61cg88g7vnb306a0rakg5jv17y"; - sgr-iosevka-ss05 = "111pwbwp8fkiph6mrzblbx1nzdnzv9d6aphmkxlmrf1cs19jv71k"; - sgr-iosevka-ss06 = "0p57cqqfhyhri2r1ss8pcd2hdn4pvp0dwr8ls1iws5gaj2s5zbjx"; - sgr-iosevka-ss07 = "0clchkildx4vmk4xpd3xjx0xbihfkn61pcha00md4qf471ysnpmp"; - sgr-iosevka-ss08 = "17ici8in0sh2zy1ya9319k9qqjzg5nl7ky6mbb2skpgmh85figfp"; - sgr-iosevka-ss09 = "0fcwxcvzpc9l5dvmkqxf1g32xr4fk5rr389d6s3qbkdxdlc2vx63"; - sgr-iosevka-ss10 = "1d59vw8caj9nlpmfijwpgkbb6kxphgdrw2hd5ldcvxs0ny0r8fcd"; - sgr-iosevka-ss11 = "0d60zpdq7n73cn0lgnwhddxzw3x0i2cpqwpc1k78s8r8h36qmd05"; - sgr-iosevka-ss12 = "15sc20f2kf6i0wlcfy60ss2j6dyg6figd18g22zmm7msz2lda1b0"; - sgr-iosevka-ss13 = "0qi8ala5dm3r9gljwf5i84624h6arasd9mhww8nk3822cx8c8jd0"; - sgr-iosevka-ss14 = "0i9p2rz8ppwl6x9d2j4gry7l386nbv4g2jrrna6bwgk4nh12izg0"; - sgr-iosevka-ss15 = "0d4s197v96ka5c4b63kisiy8j694vskspc5vry4bgj4pbl7vl6lg"; - sgr-iosevka-ss16 = "1a02r483ihfnlzx0kir6p84q6bscrs798i5qaw7qiz3zi8kxdrgb"; - sgr-iosevka-ss17 = "1hi7dikls7x5zn79waki77bcp4w5hzx12mqmh0zx77aah3ghcax1"; - sgr-iosevka-ss18 = "1mkjyn5mjnlwrxfhxr1f3ja2fd6lbv54fxx0xy9zm1banz0pp3y1"; - sgr-iosevka-term = "0cmycg6vygxi3c1pdqddmh8mqpcrnkmn9y5c8xjzd1lygm41668q"; - sgr-iosevka-term-curly = "1q7r3qclmkniin8hx8digwk1rfgfcm4jz6mvjay5sfi5wa6g9fd0"; - sgr-iosevka-term-curly-slab = "07bf92s5zf9vny3560dr8zwxdg1jpdvz5ksmqcm74ib1024yk17r"; - sgr-iosevka-term-slab = "1am42m5jggfy0fv3580rsksklaiq8827da1s20ngiyxfzcgbgwf3"; - sgr-iosevka-term-ss01 = "09igqk8b4hmgmh1q1idvcjpz0vj15yzrsmcqhyrs1ygxyl2d6g5v"; - sgr-iosevka-term-ss02 = "143czw61bilpim4lqqzp9d2gz4igijyl2p87iy3f5pvh75qzk8fx"; - sgr-iosevka-term-ss03 = "02s7dsjxsm6dgp2rcz6n9dyi6priz9k5q5wd1rajfs6rgb01j1h7"; - sgr-iosevka-term-ss04 = "10paacm4gb0823pqacj1ps8s79k6zbayrqqqnhvklkqki2iiay4g"; - sgr-iosevka-term-ss05 = "0nn49fgxciwpfddcksb5krhvyqbr2zfx2zq1m5nswb70nzwwk8sj"; - sgr-iosevka-term-ss06 = "1r6xlbf9si5ycg96av2pjjak82qgj1sqdq634wkl41x4mj39zkjl"; - sgr-iosevka-term-ss07 = "1sfjv2ggqrgxjqykgycia62xa2g523yf61gix9dp79gyg6ga25nr"; - sgr-iosevka-term-ss08 = "0rk66nzjc4d7bjx9sfgnlzsx52mdrdmgl4xri6jd0ad3543j43bh"; - sgr-iosevka-term-ss09 = "0y12s0ynb5fda8kprwlbw6a9kkb7fwjfna2axgz5rxlz0ja14gs1"; - sgr-iosevka-term-ss10 = "0hy31v083cd9lcb7xfvh6lj4nvzlqkbm8lni092sp21iv43xpp4f"; - sgr-iosevka-term-ss11 = "0wb1c4l8327vsnkpj34grplw1v1mlr3wdavi7i0z5383qx4l3cn0"; - sgr-iosevka-term-ss12 = "0x8zgm1yl37ij1hq6bcdf0whfbyv4gdkqk94yi3xm74a744pzsvx"; - sgr-iosevka-term-ss13 = "1ia9q4gn9a6mr0n4vb6d8mnnp9s6l5v5y4fgi6ip0g49n0n8fw4r"; - sgr-iosevka-term-ss14 = "0ipfjn23jaz6xjb0v2pbirrvi18czir6nijh79kxrrs1k83mc4yq"; - sgr-iosevka-term-ss15 = "0pdlsd8qsp80y5rgp3vrhl1wjbj4b3bgqyavz1ayqccg939dvzqv"; - sgr-iosevka-term-ss16 = "0bz3i0cnijq84skhsjgy0p6p6ww364gnkrny1hgcw7w21d69n2x5"; - sgr-iosevka-term-ss17 = "1sfpaqviv1gqz4c29kmrm1v3zbr3615w90w96s5yxh2lr6zqxi7v"; - sgr-iosevka-term-ss18 = "02f7i400qk9pbyid4dr6p690sqphz52pvgprqp54q1lw07jksqa6"; + iosevka = "0l14c39r68x14maw9hyiqd0lqz7q2pq4drw68i0j4jwa58l0r2x1"; + iosevka-aile = "1pl59kga3ab2jm3y4lh0lqp9nqjggykqrpnh27s99abkf5cvgkzr"; + iosevka-curly = "1nv3r2c2zj9y3zgaa2r8s0w4l28a3pzkyvcm1br650mb4l469j6c"; + iosevka-curly-slab = "1ik3affc11w0q3xjrm9pdpzp6hdq9623f1nhsbc4ih5980mvki0j"; + iosevka-etoile = "16fsysywpf7zdkl0sszi5im42idlmxl273ml0zs9dajd5zdwhm08"; + iosevka-slab = "1xksbmzzfp6mnd90nfnqyg02ps36makrcr311l1xcl9v4drcnsiq"; + iosevka-ss01 = "1pzl1adnbi4m2bi4p754k82viqksxjd39q5sqljjrs60p5mwxbw6"; + iosevka-ss02 = "0r1vrg6b6c4ixw0fzi4g3q7c1hah2szw2rv5gkqmdg0kiw6sddl1"; + iosevka-ss03 = "0rg6hb0xjzmf8s410x7v5m1pv246p1xfxfggw4lhs19h6f7jcy0v"; + iosevka-ss04 = "1690xgfyk6gqxwx70dsvq5ba7vf5906pf1qrrd916fkg2a28fxxp"; + iosevka-ss05 = "1zbiq0hczg2dhld82nyw7x6rkh6y812cvawqqpjmhzxjhd2wn6hv"; + iosevka-ss06 = "0290w7812pqlix1zmpanksbinzkzv6gw0y5k5dvaf4jrg5c3163m"; + iosevka-ss07 = "0z7irkdcwwxpj52a6j1b4s1xz9nlib6jm66fxva7pqd9dhsjp1ph"; + iosevka-ss08 = "1jd12mjcnjs6md3lj182ph9zlb66cmmm2cz49fwdxpx54laawn3i"; + iosevka-ss09 = "0zggxrk2a315rzz684c06pk0vmp9cw5bcn9zkh61hcn0mii10xdv"; + iosevka-ss10 = "14mshgnpq5sn4z81a8cwsq6hjarlrmwfqyhkyzcmqymi6gyljs6k"; + iosevka-ss11 = "14p8fbvd4b4vddnmydyn0v5iffkq1s15pdxpmmwl2aplxnrgshiy"; + iosevka-ss12 = "1r2p1f0mdkx7sqkv29gdpq78c905gcc7kfbr8l907awhv80fzsgg"; + iosevka-ss13 = "0ara2w4zav48rk019hnhr3fq8kqzzvlgshq18cq5gralbcgjw883"; + iosevka-ss14 = "1yqmm13bafrz7siq7q95921ipn3p6ms3dmsxn5zbcmm3pdxxyq1c"; + iosevka-ss15 = "1y84vzqpwa060q3qrxc77kk3hnrgyjqwwxq4s9fq8hww9d01jb5d"; + iosevka-ss16 = "0cszx4s3bi9j5l46sh33dkn9cqn9s7v6rk23d4srlfg19bfs19ga"; + iosevka-ss17 = "0ld6pr8rx1ldszgdd2ixmfj341ry9ajfcpk6k1f9jmfilp4cjnzr"; + iosevka-ss18 = "19787429v0am3qsjyxlgqwbkn50s54w26481h46ybn7nrskgxl7a"; + sgr-iosevka = "1i5zg7wwyczf2ljxjvwk4n75j1nvn6wavc3w1zycfcgim458x8s6"; + sgr-iosevka-aile = "0m0imj778l6zb4y5kb882z4f6abw6q1ww0d8fn4vyqk2csm3kx9v"; + sgr-iosevka-curly = "071jpj9cj56hszqjy5cmj40gq6n47fp117ckypi0npk6cvrvrl7a"; + sgr-iosevka-curly-slab = "1f33iy0nrkm76alyzs7bjdfvc7c4j7cqrzrk769y40wx68l5sbji"; + sgr-iosevka-etoile = "19rgrrk4p9k94s887vv2kqb7zj1wjh5kjncalzbisjpv8ns6l3qq"; + sgr-iosevka-fixed = "03ccy1f8hswslr7n9dhj9l3zvfkahqi742giim34f360f5chpmdi"; + sgr-iosevka-fixed-curly = "14czka86s0yj1h0mq4ajn5yx1lnb9l3hp9yw8h558dy8hf6xk9pi"; + sgr-iosevka-fixed-curly-slab = "1i0hjw0121l83znyfq3zl0z1pl4p57yf2qqrp35qqp0vpsxnjlcy"; + sgr-iosevka-fixed-slab = "1cz1lj2qa8yiwbxpk3c6hdkgg44q9019yai3iz0c17gw8vwj6xxh"; + sgr-iosevka-fixed-ss01 = "1966jyi9j01s094kz1k67ds4k4z1sfahwfxsasi59bc4r5srq3p7"; + sgr-iosevka-fixed-ss02 = "1l08id1p2z2m8vrprlrg0rphspbz17lnc1l483wadffbfrlqrhpr"; + sgr-iosevka-fixed-ss03 = "0g98s0w2lvskq9fyh47b8rx7rha24k4vzza9svl25kx55ixznzjm"; + sgr-iosevka-fixed-ss04 = "0wjq34b6xv17ma75lysmwfqxyp57zr0h9hrxyl9c6sgdmlvf7jqx"; + sgr-iosevka-fixed-ss05 = "080i32z64y9dm19fagc5jh3gkynbim0w03i42bc19im07ryyq79h"; + sgr-iosevka-fixed-ss06 = "17ggkvz3y17zqkn1m864vgqbc5zvn63gsh39n4w1p9wi9v360984"; + sgr-iosevka-fixed-ss07 = "1nazbkhr46larr0hgxwx2h5zvi9yr3qlg2npnmpprwqrhvlvlpah"; + sgr-iosevka-fixed-ss08 = "08i420lx329py3slc99r73hysdnjbc12nm15fs17f505c2zj7war"; + sgr-iosevka-fixed-ss09 = "0zc9wmxjrpzss7cdczg6af6sckdr22k0q9gj90hggyyjlc08cvz0"; + sgr-iosevka-fixed-ss10 = "15qzf9zir1rqfpfspkgy9azf6m73lgpl79xhidf47hkvcw9zxjr7"; + sgr-iosevka-fixed-ss11 = "1z6kji0h5vb3my47h2ccdl2vafh58pyqwp83yy3xgsvsj2qd0835"; + sgr-iosevka-fixed-ss12 = "0wyk8kyllm35wlsqkxgh3sxvn3f52w7kicq64hdax8k8piaj584x"; + sgr-iosevka-fixed-ss13 = "052jrfqwi4qbs9k9mqmdk2s82qb8q6175ajy3f6186grnzd73nnq"; + sgr-iosevka-fixed-ss14 = "0wba9g5q8h5n5c50rncbbkbkc06xs9zxydxz1b0a6dl37drgmvkf"; + sgr-iosevka-fixed-ss15 = "1kds5pl4vxcniksfp4mslpfr0ba30m754w7vxvzvqamgazmyf0pp"; + sgr-iosevka-fixed-ss16 = "12hb9laxbhkbgf2rnbzq7zwwl7bg3n3n2yyjlr3vlsik5kd7aznz"; + sgr-iosevka-fixed-ss17 = "18rvf78xif6p06nzha9nvp725f6mr79f1rk0a6n7ifh1ygdy4lvx"; + sgr-iosevka-fixed-ss18 = "019gzj9s3wh3i9bxalazx9x8nfljf191idh6ygxpqjz4z3yzxh9n"; + sgr-iosevka-slab = "0l9bcvrfbxp0pi3hj3zlirq800h63dyqf8dy307r7xg8m3l48xgr"; + sgr-iosevka-ss01 = "1rb49rx12vgdjvkbyyg63pmxbwqd4v5cfvn5q3k2q4w5m3yhsbm9"; + sgr-iosevka-ss02 = "07xz0iayqk2hqalmrj8c7kp8b80d6qgazrxwvs22y8nymignzq2s"; + sgr-iosevka-ss03 = "0skq1kqmkwhs9d1p0lpksxqdgvpjz2krlfqa7idq1sdykpwsvmhi"; + sgr-iosevka-ss04 = "0cgjh4c3vmmcgb43g0l2dmwcwnwwwqkrr80b9rsbrx43v6lkavda"; + sgr-iosevka-ss05 = "16y8rm0byaf2xqh31h4vfan6il2m98a225nv3vsb7f42ga185vw0"; + sgr-iosevka-ss06 = "0v9nd1h0gzgwa5sw9lrxvd5g77y9wn3fqsw86ivpsqn1vmgpqrzq"; + sgr-iosevka-ss07 = "1h49qx02kn683ax3vh090r7fwlq7ya802zywcws2b9h2hs6p799x"; + sgr-iosevka-ss08 = "1zk08x7chnj1ach4ghh26kr9kndzlgzzsrrw9aa3f0s7qk1lx2yg"; + sgr-iosevka-ss09 = "12mrzd7viia71r9ixw1bzsqfaycxpl8zf20qv83ndbjsgzxh9ary"; + sgr-iosevka-ss10 = "1cq8ii94jdskd0p5g2iigprbzzs3qnjxj7m2rkhl8mricwxdxxs4"; + sgr-iosevka-ss11 = "1wmzaqcy0xy831010fsdhlm3aly2j01j7z10ka83ga3h8ymg1wla"; + sgr-iosevka-ss12 = "00xfyvf50ykippnr1cfxy17s0k0gqkgx61vf7x9dmsgl2y6qigpl"; + sgr-iosevka-ss13 = "0ynmx67c96qslzggjign8g3q7k11ny0mdrdwa7zwi2p0mm61n2jd"; + sgr-iosevka-ss14 = "19s3a6csc4wq4cjjc2qll8fv00hmzsp5z7hwaq09wls8swz5kmmq"; + sgr-iosevka-ss15 = "0d8ljkjcf0y263lwpnlh07305k6xlznk9gysk63dhcyxv0ajhrq1"; + sgr-iosevka-ss16 = "12jbanrv31zxkh5a3a4w2wv0gqvj03mcs7v0zpnylp8jgfmpf8qa"; + sgr-iosevka-ss17 = "1p088x66grn9bs4k1y6mxb0ka4y4vm74v6nbm74qsarjbyc0kx0a"; + sgr-iosevka-ss18 = "0ff8lnhhgknj2sq40fkx7pqmiklnjl9ryjrnjcjviwzvs2dgzbmh"; + sgr-iosevka-term = "0ny2p3hmzwbmzwxr8k1hbv0r3fqwngnz6kind1p3yddrqz8l5rrz"; + sgr-iosevka-term-curly = "0qdys5q9fw273q58yvs71kqhal2mrh1400kf33mjp80pm1dy0j5j"; + sgr-iosevka-term-curly-slab = "1bfn60arcb78lllf1lpdi2gscazvy3k9irp3ik0x12qdf9jgzgw0"; + sgr-iosevka-term-slab = "1grdywa132zl3m5vf7w47lq7wgk6p5n8nab6rgg7pim839f1cn9q"; + sgr-iosevka-term-ss01 = "14an4f8gm741zz22g854zxbfys2z33sf20kjrlzdp239376k72b7"; + sgr-iosevka-term-ss02 = "0lqzcn4ykvkvylnlp4c1cfcl72hy3i18q15zng79d8v439w7cbds"; + sgr-iosevka-term-ss03 = "0kmfmdv5rvfgm8p85dcqb28fsmkwsrgpjkjh1n787nvd2vs96l23"; + sgr-iosevka-term-ss04 = "0p6hspr95p8hxas05rgp2dq00425i7nnz3nbyfrv4mnjzj66ir60"; + sgr-iosevka-term-ss05 = "0izgz7rgjivzzvqywj3d2gma2sh83nhvc4scb7x3cbwwkzg9m5jx"; + sgr-iosevka-term-ss06 = "0syp2mqnqq2gs4zsa3vvx0yz7pa23s995jc8sjrh01la6kpdk332"; + sgr-iosevka-term-ss07 = "0dzfrw30aych0a0ic643w11ww42rncgyzvm5fkgqnkj1zjsdpgsw"; + sgr-iosevka-term-ss08 = "0d9b2rwcdpwbdlsyjcd3qd0pip9km4hg9ihjymsi3xj7bihd0wp5"; + sgr-iosevka-term-ss09 = "06bbj7c99wpjfh7ib7990nayxvbwy69ijlrjbi2mj45pm5i5lswq"; + sgr-iosevka-term-ss10 = "1i6cfzgbnga999851k7gg6b5awq1i9253fz8sngsb6b34c45zw5c"; + sgr-iosevka-term-ss11 = "1jb4lg0cjwv8xvhc5j9qp921zawgp2say6dnj6zncv0ys0rs6qwm"; + sgr-iosevka-term-ss12 = "01w3vj7pw0714r6xp4rq5rlirch9h2d22mk76hsnqb0igzhlkvhy"; + sgr-iosevka-term-ss13 = "0ywjr4j31v31z1cvvz7jvn7mcj2zhdpgljmvsfvix1j26cy5lr95"; + sgr-iosevka-term-ss14 = "1cxsxriayzvrxzr3i6k6dwq08ywl9dk78iz4jqgy5jvrh942km0w"; + sgr-iosevka-term-ss15 = "0j6rvsww2783hrdca3hfvv02s2whswwld7icf0bijdb3p799qi6w"; + sgr-iosevka-term-ss16 = "0hgi40g030s1ylnp1whxz47wg2lzzqwhblx894dzz7rpnwbgff38"; + sgr-iosevka-term-ss17 = "0hbdhc3z75n814r2xffnw6lnkwc31p0fmrvsan3z0db35c5kz54i"; + sgr-iosevka-term-ss18 = "18c3i4l4j9wi7rx191hzmhlc8zblyqpx7bhq9g2lxs9asp8svqsa"; } diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 4e42cf1c4174e..88ef4e588c776 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,22 +1,24 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchzip }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "1.003"; + version = "2.200"; - src = fetchFromGitHub { - owner = "psb1558"; - repo = "Junicode-font"; - rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; - hash = "sha256-eTiMgI8prnpR4H6sqKRaB3Gcnt4C5QWZalRajWW49G4="; + src = fetchzip { + url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; + hash = "sha256-2K+zPq6Bjg+hZQhQrWWm1bxHVfwwRdsV7EseRGBnpUw="; }; + outputs = [ "out" "doc" ]; + installPhase = '' runHook preInstall - local out_ttf=$out/share/fonts/junicode-ttf - mkdir -p $out_ttf - cp legacy/*.ttf $out_ttf + install -Dm 444 -t $out/share/fonts/truetype TTF/*.ttf VAR/*.ttf + install -Dm 444 -t $out/share/fonts/opentype OTF/*.otf + install -Dm 444 -t $out/share/fonts/woff2 WOFF2/*.woff2 + + install -Dm 444 -t $doc/share/doc/${pname}-${version} docs/*.pdf runHook postInstall ''; diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 5bc4b86c8ad1b..2fc6731b850a8 100644 --- a/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.105"; + version = "1.106"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-rufBz5u6dV91oD211JuCUP2Km3RoFwkZ1OhRxyoGxpQ="; + hash = "sha256-AXEOoU9gvml1bqjPTYV+mmhVGLG4R6mH8e/h3wQgySo="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 79288cb5f4c80..f0a22fde92642 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -253,9 +253,11 @@ rec { metadata.files; installPhase = '' + runHook preInstall for src in $srcs; do install -D $src $out/share/fonts/noto/$(stripHash $src) done + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json b/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json index 2f22a24a34c0b..e9ad1c327f4f9 100644 --- a/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json +++ b/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json @@ -1,7 +1,7 @@ { - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf": "sha256-9ndQqJJzsCkR6KcYRNVW3wXWMxcH+0QzFgQQdCG8vSo=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf": "sha256-AXGLdWebddyJhTKMW/D/6tW8ODcaXrUM96m2hN9wYlg=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf": "sha256-wzF9kKNMeQTYZ2QUT5pIgauhl2qMpZ2nMLNTeAJuqtQ=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf": "sha256-NIelE8X+lKtH6yT3eFPZV7zYUR3Y5GnNobAbf7AckR0=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf": "sha256-zkJuJ8YlTrUV+28wHIqny3yQvjvZqEPG4WXYmaLcY8A=" + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf": "sha256-B8XBpYycOYBjrhjlnyiz42YukIoOjGTd3NN3EY00NiQ=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf": "sha256-Zfwh9q2GrL5Dwp+J/8Ddd2IXCaUXpQ7dE3CqgCMMyPs=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf": "sha256-/O5b2DzM8g97NAdJgIC/RsQ7E5P7USKq7TXyDuUE3WQ=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf": "sha256-vrjB8GlhzWAe6jG/Srpy8R431VivNtWbCa5Uh4ATnmU=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf": "sha256-EbnZt8h4Lcl0yJoOKmXlF1nfcP5hZv7n4cEQ10yBkcg=" } diff --git a/pkgs/data/fonts/noto-fonts/noto-emoji.json b/pkgs/data/fonts/noto-fonts/noto-emoji.json index 66b0292906b59..c729634b9e1e7 100644 --- a/pkgs/data/fonts/noto-fonts/noto-emoji.json +++ b/pkgs/data/fonts/noto-fonts/noto-emoji.json @@ -13,18 +13,18 @@ "subsets": [ "emoji" ], - "version": "v46", - "lastModified": "2023-09-07", + "version": "v47", + "lastModified": "2023-09-27", "files": { - "300": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf", - "regular": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf", - "500": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf", - "600": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf", - "700": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf" + "300": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf", + "regular": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf", + "500": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf", + "600": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf", + "700": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf" }, "category": "sans-serif", "kind": "webfonts#webfont", - "menu": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0gwuQeU.ttf" + "menu": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0gwuQeU.ttf" } ] } diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 631904942b3cc..14dc6514e8161 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.42.1"; + version = "0.42.2"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - hash = "sha256-e6ig+boWzYiOzENkIsj/z9FFt2pZc+T0dYoFoeONMFM="; + hash = "sha256-RkPHlOPXQiAswtekrOCmYcPNlNSvcqyaM4juSHJxEeY="; }; sourceRoot = "."; diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 961f846a6c334..68b8eae40e2a0 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "0.74"; + version = "0.77"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-WPoqWhCKk2gZ/cdIjvmiNZ95xZ9sqnGzZuw4OEHxtrI="; + hash = "sha256-xnIDCuCUP8ErUsWTJedWpy4lo77Ji+FO2vO9BRDAmV0="; }; installPhase = '' diff --git a/pkgs/data/icons/tau-hydrogen/default.nix b/pkgs/data/icons/tau-hydrogen/default.nix index 3f7aa63526dd1..bff4bb703a4ec 100644 --- a/pkgs/data/icons/tau-hydrogen/default.nix +++ b/pkgs/data/icons/tau-hydrogen/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tau-hydrogen"; - version = "1.0.11"; + version = "1.0.13"; src = fetchFromGitHub { owner = "tau-OS"; repo = "tau-hydrogen"; rev = finalAttrs.version; - hash = "sha256-ECrRWWS/Am0lfCIJw/BVZg53oLw79Im8d8KgAYxE+pw="; + hash = "sha256-rfgSNytPCVCkAJ9N3kRw9mfcXr+JEqy1jyyDgXqxtsM="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index 518f0d11efd79..9b1043467f14a 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -2,7 +2,7 @@ , stdenvNoCC , fetchFromGitHub , adwaita-icon-theme -, libsForQt5 +, breeze-icons , gtk3 , hicolor-icon-theme , jdupes @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "il+bYIcwm0BQF6U0J6h6rlzHSGSHYN/O8BezehYIpQ4="; + hash = "sha256-il+bYIcwm0BQF6U0J6h6rlzHSGSHYN/O8BezehYIpQ4="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + breeze-icons hicolor-icon-theme ]; diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index b94137ccf4e6d..b344ca0d4aad0 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20230912"; + version = "20231012"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-MyNlgsa+8OS7vkMq74KKmUVzBhmDpF4ED2Xdgl3GIS4="; + sha256 = "sha256-KXmHaoIZ01M6Nu2LlVgTZarUp+5VPpLfnkc7d/Xl4z0="; }; dontUnpack = true; diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index 44b5e7423d593..e20872482d58e 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.21"; + version = "3.22"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - hash = "sha256-dv8aC4giD0JqaYN19eCHzEbmwXhqX+ZrKrwit9tzf5Y="; + hash = "sha256-ZADijP8TKMSXJApY7pVTJoqsEPPL8PX7dUFJHFX5utw="; }; # List of file formats to package. diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/default.nix b/pkgs/data/themes/adi1090x-plymouth-themes/default.nix index 10356feed6233..d5ff1d0018a9a 100644 --- a/pkgs/data/themes/adi1090x-plymouth-themes/default.nix +++ b/pkgs/data/themes/adi1090x-plymouth-themes/default.nix @@ -7,7 +7,7 @@ # reference ./shas.nix for available themes selected_themes ? [], }: let - version = "2020-12-28"; + version = "1.0"; # this file is generated via ./update.sh # borrowed from pkgs/data/fonts/nerdfonts themeShas = import ./shas.nix; diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix b/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix index cb128478cdfe2..51a7178f094b3 100644 --- a/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix +++ b/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix @@ -1,322 +1,322 @@ { "abstract_ring" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring.tar.gz"; - sha = "133gifr4571b14ci44jmm49j91yhq785yx4b3h6yvx0188liibr2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/abstract_ring.tar.gz"; + sha = "0hfrzm974nm8f237vzlyjjh4pikva3n7fqr1p7jmx04g857g4rjq"; }; "abstract_ring_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring_alt.tar.gz"; - sha = "157yg2y4vfwjfly2paq2xn1p6h2wrbvvzwy4lbpbhlmhyhrymjvj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/abstract_ring_alt.tar.gz"; + sha = "0gx6l6w9d9z6am3x99igp6v1kykpwd39sjhalfsl21x1ah2cfmbh"; }; "alienware" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/alienware.tar.gz"; - sha = "1i3i0gj927drbgivcx3fqj6fqdwm2gqy0wrwfkdqdjyqzq1286a5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/alienware.tar.gz"; + sha = "0pq9zdhdz5vg97zfzsj9kh63szsm9qww2j7bgp2w4z6pg42xcswh"; }; "angular" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular.tar.gz"; - sha = "06n3ix7k8zpraqc75wy4fnk1bzcyhfajjxjq9kyy470wgsjrw6p4"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/angular.tar.gz"; + sha = "15rsljiv1nhgcsgjiwsb2jiwah1ghxa95dbj3hlddx8d337nxljc"; }; "angular_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular_alt.tar.gz"; - sha = "1l1iy9p0k4a8mcdps30avscjp6wfv20m9zy376r18y7xwcz19qbj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/angular_alt.tar.gz"; + sha = "12v4d7yjd81vch6cm2jphkb24gnc5d2kncfi4lsan6vhamija49f"; }; "black_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/black_hud.tar.gz"; - sha = "13y32zxcshnfyjxs0r7f1sz010sr6brsaap90im2cb4rlvp0ajsz"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/black_hud.tar.gz"; + sha = "07iy216xij19m6jy76z2rafmjm8mv4k7mwpp145xayz52zhs66s8"; }; "blockchain" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/blockchain.tar.gz"; - sha = "1f60nvrk506bqw47g90wzbvn3bp5h1gbi0ll5f3bd6wj77qfk05i"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/blockchain.tar.gz"; + sha = "1w0hz1fyj4p9qxwdhib9c7gxx582wb9fz2dyd77l9xqjkps78fjx"; }; "circle" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle.tar.gz"; - sha = "04085lkh4i5diszpr1w5xnhnngp8ba1ckalcjj5s8hm8lk6wd4nc"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle.tar.gz"; + sha = "16xrz3v85kpxc4palm8flc7lhscfl6psm1dz999r802yivxl5ikg"; }; "circle_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_alt.tar.gz"; - sha = "0awbjrd31fv2cb0q7n58h5iji29di8n550bmpz5qdg6xn55baqqx"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_alt.tar.gz"; + sha = "0hsia8rq059kyxrnikr6brwmg7pa5kbm3j9gj4ky1a83dwpx18lg"; }; "circle_flow" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_flow.tar.gz"; - sha = "0ffxgjmx5la55dn3nyqgxi8fyd1ci4wckmvfaa6s1kyd7xsk8785"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_flow.tar.gz"; + sha = "109m9hdirrr9a6gxgqpq80yz0lx4s7bv7nihdfjzg7rhl0icgw93"; }; "circle_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_hud.tar.gz"; - sha = "0sd28d0ac7wvkwmbrnvg42bccz6y4iyl2wp1pg7awwjxvag0azlf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_hud.tar.gz"; + sha = "1xmc30z5k583zrknx2g7rmq41vw9chyxhdacpxvxzyvnp0828z0j"; }; "circuit" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circuit.tar.gz"; - sha = "1jzlr6c47n3zs0f1cafgjy92sks5060d1gs0774kxc0c96bysypg"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circuit.tar.gz"; + sha = "0linpkxhx01v7q2s3c7z8py0h697z7a4jhwbs2gp47p2923xggij"; }; "colorful" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful.tar.gz"; - sha = "18lbyffvhdav5cjh0xnidf09amryf5dcj5rizl9z7ghxpz2z57pr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful.tar.gz"; + sha = "0m89prph31a0r0rxax989n72wdk3d5ywl8h3lygas8k7g908xr3p"; }; "colorful_loop" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_loop.tar.gz"; - sha = "0qcn19gxl9w2q0w7lihi8wnlwlh8h3k0ddbp3ww9wcw1q0wsy1vi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful_loop.tar.gz"; + sha = "0nbdh6v8zn1xxm44sgr1904wik8pv0yrqjg84dym10k7hvfnb1af"; }; "colorful_sliced" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_sliced.tar.gz"; - sha = "0d9lafg76w2y77ywj1f1p5n1ci2q9jnfqfd16akf6f28h0iz1f9r"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful_sliced.tar.gz"; + sha = "1yadpyiwiixxily7wzhd8myxnrvhzdc9m6lj7g4ll3hlwygw7rz1"; }; "connect" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/connect.tar.gz"; - sha = "1a0z59l391xv795d8mhcwa816wlmzyl75pwiizvvra2a0i8g6wz0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/connect.tar.gz"; + sha = "0gwd27vlr23zbf0mw34gd55f3s32a70q1s03z36dsf01bbyrvwz5"; }; "cross_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cross_hud.tar.gz"; - sha = "188wj6hkvryawmw4r3bwcsvqxx52h10jb4ddq3jx7sh2rz1kpvwa"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cross_hud.tar.gz"; + sha = "1j79c99n3r94vrf6f8n2a42jjfywaf7vf6q34awdqcl188hc3qzi"; }; "cubes" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cubes.tar.gz"; - sha = "0bydagjwfkvbhgr7sv903a7pjkrmrdz6vh22i4qjx5rhzw2wvvsk"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cubes.tar.gz"; + sha = "11r6q9f4vz64rxz8wshhhpyp7knwn2klw50z98bn3qbmwl3zfh8c"; }; "cuts" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts.tar.gz"; - sha = "0znz82zzgyqkfprvzhkzv974amcnxqdg38ajsm4d7wlagc52zs0d"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cuts.tar.gz"; + sha = "1bf8yrwha2bibnpf8abc0bxsj0g9sg3m1fpagxcpr61m0cl4i3vq"; }; "cuts_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts_alt.tar.gz"; - sha = "1bgs4v5kkh96m1xh29wjmdxinfsxh4g7lg9fk1nqj87igdg7wwss"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cuts_alt.tar.gz"; + sha = "00yrhfnfnmirzij5wd592cfn90crw3774a6wdxq4s538wrpmzhik"; }; "cyanide" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cyanide.tar.gz"; - sha = "04aklg9il310iv7zjpan6z4ha7gvh1b0yzgwi91679vm38cg0593"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cyanide.tar.gz"; + sha = "0bbrqg77m0655l9x90334b8yn60kni062p17h4rf6kp9qbi86gg0"; }; "cybernetic" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cybernetic.tar.gz"; - sha = "0ad75fcra24bjzs4pqn89l19wb4rcjph63j71lv60m0rz75vgjfb"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cybernetic.tar.gz"; + sha = "0chk52pfl81npffda6hy1pag6n8l5ssq61mc0qaa4nqfwpyvqqvw"; }; "dark_planet" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dark_planet.tar.gz"; - sha = "03i2knrfi56f8lbc8hs8rqa4jg432nsmjn74wibb04ppmvm8f47j"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dark_planet.tar.gz"; + sha = "1bbwdzgmvrdxkd379r1w2rkl0r5ixlh56xn59c47bmfbjl19927d"; }; "darth_vader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/darth_vader.tar.gz"; - sha = "0mlxy17l1hjf3nq390wc26n4x3c45n5hmks75zkzjz3l5ac1fah6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/darth_vader.tar.gz"; + sha = "1czq929j87zila0v49kikjqdw8bmssmn5cp573i3qb9kry5xdlm7"; }; "deus_ex" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/deus_ex.tar.gz"; - sha = "1mllj0xj9g1nn01vcq0xsfcwd0qnmk1s3vj5d03f9qp513k8qzdl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/deus_ex.tar.gz"; + sha = "1la8rlvy9gh593vx2w9wjq2hmsp58fd2gx9l9g2222mmzpk1hmcc"; }; "dna" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dna.tar.gz"; - sha = "0xcf4vxd99w3d44bhrdk1yqsfcakix6cd7hdpjsgccgs1jd02hi1"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dna.tar.gz"; + sha = "1mkq23khwsbnz8spf00amk48fx5vnk3rpzapx37rpx1klgxpm89q"; }; "double" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/double.tar.gz"; - sha = "07gxkzqrp0cfisdkq0wqfiai37m2yr2fhcpdpazmzkkxnm4qf25y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/double.tar.gz"; + sha = "11grxa2wblii4yxxrwfbbmwlwk26sm6mw9y00wfadijx2iyx30i1"; }; "dragon" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dragon.tar.gz"; - sha = "0ypr1vyl6zilfzncymlh2s1ivxr7n88kfaygmz2y83l332asjs66"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dragon.tar.gz"; + sha = "1hlvr2s8zhlf8mg9pskwby94kh15g8icxn3833cdqqhmgvc0d7l5"; }; "flame" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/flame.tar.gz"; - sha = "0kvly5rgp47a4lby3blb1dird9xwy9y9c8a0wg17qfvz3zr69r0g"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/flame.tar.gz"; + sha = "1yszmhmmjgdkjvqpij3gjwz8vxjhmklf7clbpz947254zgwxyn5g"; }; "glitch" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glitch.tar.gz"; - sha = "0s0kmrw01wj9i7qd7zbwvmfbbh7r3jfkc4522jv44m4rl6r4h84c"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/glitch.tar.gz"; + sha = "15gwhfnrn0p80wdaymnlvrcig5cjb4m5qz56hbhg4jdwcjdlppbd"; }; "glowing" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glowing.tar.gz"; - sha = "19nkbk2cw6j763idz5z7l71lx529xcgyx1dcd9qd356x9ifdw206"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/glowing.tar.gz"; + sha = "09h7dn805lrg04j5lp30l3qc6kb8xxilibdg0pxfadwyljblwl1f"; }; "green_blocks" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_blocks.tar.gz"; - sha = "0x8pgsyfbchy7z6d4rijsk2nml6fl1xwba0f0h3lw9i6359k7j3j"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/green_blocks.tar.gz"; + sha = "09xx5fbnby567s9s8hmryalm9k9vs520lymiprw06nig49rmy4v2"; }; "green_loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_loader.tar.gz"; - sha = "00rdpy1gbc4ikxx487w3k27z622z2rjcsi0d18i23s5p3xqd1l3a"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/green_loader.tar.gz"; + sha = "09vw6c9albsv28y4bdlp54csq5bl0vrd20yjph00jxhvhizffk3k"; }; "hexagon" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon.tar.gz"; - sha = "0yk47hs5qfv09q5df4x6j82ivrxfxh1bxsw8p8x7hcmlb08dh6g6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon.tar.gz"; + sha = "17api8ndiqjxyj7prxz0bv1dpq0h0wvphnll4lb2dlhxp61bjmj3"; }; "hexagon_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_2.tar.gz"; - sha = "175im23q769s2if3xi8j669r0b5y0dagz8rsbvq7kghznzw4abc2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_2.tar.gz"; + sha = "030yr5nb6q7bw1f1dh9kcdmd87x25f1fn60v45vmk7k07y1s10c8"; }; "hexagon_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_alt.tar.gz"; - sha = "1ayhw1gzrb98hf7f77b6ka5wi19ymp3mljhhgm5lx8w8pwawsxnb"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_alt.tar.gz"; + sha = "1f6i8signlscp0av3kcmdw0xm13pf2dy2lz3c6wq9d9203ibry1p"; }; "hexagon_dots" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots.tar.gz"; - sha = "0pdw9ih9fsxvv394yc5vfj7nlq7mca9w05y0s631gnsdzgqxsyd6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_dots.tar.gz"; + sha = "13mi9f8saw9zk8zdxp003ipigyd4y26iydn0pd1c0vr5fbz483rq"; }; "hexagon_dots_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots_alt.tar.gz"; - sha = "0aff3bgpva41b4jk4mp0fxdvli286x4pk3q9ysvps7z7srw4fvvn"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_dots_alt.tar.gz"; + sha = "1gkzh5i84cwv64f3r8rgpzyj8h1kpn92m4syf67kn5sdhqykvqkz"; }; "hexagon_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_hud.tar.gz"; - sha = "0wpmsffdp59dy2g5ggprgr7l50rf131c7v8pbgpir230lpn10xzi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_hud.tar.gz"; + sha = "17k5378fsydvcps9rxd117rfqlijnrsj1ggyqx445a5yrwy6rx55"; }; "hexagon_red" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_red.tar.gz"; - sha = "0fgmma5j6fnjykpwplji4rm57d07l9shfpay079gz1nhbhnq3rkl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_red.tar.gz"; + sha = "0x8i1k54qff7agwq9gqi2z59lww8qglck105bv87ylgy5z6150sx"; }; "hexa_retro" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hexa_retro.tar.gz"; - sha = "1cbyhqhv2ysx9w8cpbfidrm0w70wssp4fld0q1g01fgcbg93b7mf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexa_retro.tar.gz"; + sha = "0bwx2nvvr6bkqnmnv2kh9slbi11lv0h3hnzql99d9llr3vlid5ip"; }; "hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud.tar.gz"; - sha = "0s01p1n75ckwa69iy5v2z2cg85ipzgx356n4yvdyi1jh9pnl22k9"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud.tar.gz"; + sha = "0zng0rn4lacxf9v1azndzv5v7pl84f0amschccdlnymilyy564ck"; }; "hud_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_2.tar.gz"; - sha = "1bvkl5f0fwi7xzy23pj3p7c98fbz2zk8abz7frxr0pp0xj3ql87i"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_2.tar.gz"; + sha = "14ldw37gpysnw3k1cssh8q1hgxnrh954pgq5x5xhrlv2w6rsbfzq"; }; "hud_3" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_3.tar.gz"; - sha = "1n5qqkp0qb4mlpp7g20hpvazgwxw4gjb2p0ys0q2bglb3amzc2xr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_3.tar.gz"; + sha = "0lc3x51gjfc58y45yzfnpy2i07vk9vdzbjl5yawv3wh97jy5x6x7"; }; "hud_space" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_space.tar.gz"; - sha = "0dhajnica048smn5wpwc13ij0n9g6c10a0qxgi4rwiczr7p9vajj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_space.tar.gz"; + sha = "13ipj1l737bs9rnhh5vviq6bm5hdghpyq6s5hc1fhg2cgldfnq0i"; }; "ibm" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ibm.tar.gz"; - sha = "0xri6x716ma3y7d59yn9vm7skw5y53kn6s2ivfrvlfsac9n1zj4m"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/ibm.tar.gz"; + sha = "0acs1f468xfpsvzy400f8ba7890n3pp69c9b20lb8slamm9l4swd"; }; "infinite_seal" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/infinite_seal.tar.gz"; - sha = "0r9plydfdc35s2is1zi3pbx3s0bs5hqkim3laiav8fv3rzq0f3lq"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/infinite_seal.tar.gz"; + sha = "07g4qmkfc9yqjpbs0yr277ij3pbhc1p51gzpnnbc3viwm1zzrs6p"; }; "ironman" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ironman.tar.gz"; - sha = "0af6qfdqj0n5qgsxg6nnrs2k8xas6cd18jw96mrwfcckpfz091cm"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/ironman.tar.gz"; + sha = "0w5z22529jrgd2ab7fqibm2sd57740qxyqqrzhyvgd4l5axn1yzd"; }; "liquid" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/liquid.tar.gz"; - sha = "0ghavh6nj68kwcgvrnwbabkzn44zq0m2ic1b2cl278d2vffzqv87"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/liquid.tar.gz"; + sha = "01lwzb2yid7hb1f2nc0jycll9kvq89jcz7s7w81vqirx4by8p8n8"; }; "loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader.tar.gz"; - sha = "1zlba3mra45ii0gahlw8v1vq1j7nbfjq62pcjn43vb40zcc1j873"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader.tar.gz"; + sha = "0vx66kb56n6dy74k6yjk5w8apc8q1hmr8mrpgl420lzdqm4ggrgz"; }; "loader_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_2.tar.gz"; - sha = "1yw4n9bw483pl7m3ks2ajgfldslgyc4gb1kw61fszfp5x4l3k4rg"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader_2.tar.gz"; + sha = "0rir3gfi8bq4m8s0xhbd2ppny6q60b42wq9vs826axk2g58jczrw"; }; "loader_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_alt.tar.gz"; - sha = "1pi97pfhg13wq5s8hai4fd31s6bcfq09r969fl216yxksj8h69wj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader_alt.tar.gz"; + sha = "0pfg304xmgc46ai9d5m51p05i7zbvhfzfsscn7yk6kiw09b21fpz"; }; "lone" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/lone.tar.gz"; - sha = "0413mxr8lqlznbps5c4qgbhm0zpz8dlkbdj67r9gvzi9v020qjgl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/lone.tar.gz"; + sha = "0xx959215w8qcpbzn9w3ip4shq3ib7dcni43z4m9jwa28aa3v7y8"; }; "metal_ball" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/metal_ball.tar.gz"; - sha = "129q23q992fxfi976px5r68sf8wqbac3zby4yjh97s48zm83rzb5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/metal_ball.tar.gz"; + sha = "18nbikv736yd1q4qf9nq0fzspmxlkq1z6kl0jzady8ifkny1kvlw"; }; "motion" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/motion.tar.gz"; - sha = "0g84ac8ps69ihic2z7gr4nlwib9ra86il2fdl7rl7w5nc8xzhx1y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/motion.tar.gz"; + sha = "0nbvgsgkpkdx83v45fb4z6ywiz3cpdmbsx8jcxhaa0cpywvq40bh"; }; "optimus" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/optimus.tar.gz"; - sha = "1l4bmbiqqypwqvyhcd561nnxhrq5zif8pmkyk2hdwscbq6rlbc7r"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/optimus.tar.gz"; + sha = "0zxv3b21mxkl0dvhs6nzd94vlsphc8h1zzvkcgng6cqg9n1c206p"; }; "owl" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/owl.tar.gz"; - sha = "03gqqcvp4320qy1d3az1k2a8rj97alk8qzgkz6xg4akz9ccd731y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/owl.tar.gz"; + sha = "1ylkpydmy65xilqzkdps18kr0yyqggkxaysmmik3sz01qs6xjrz6"; }; "pie" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pie.tar.gz"; - sha = "1j479l428gq1b2g0g2ybkf81jzad69n59kphm0ns5gfv6khx10ga"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/pie.tar.gz"; + sha = "1x834k0qsa8c7z3ds0vk6cw2r1f4ydmyk8yz1hdw8lxys17n9rj8"; }; "pixels" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pixels.tar.gz"; - sha = "13rfdd9v7h0k2wbwr428h2w8dv5vhhbw03wvirlmafsbhmgjz5xs"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/pixels.tar.gz"; + sha = "072ag60r2n3jjj64r1nzsj5p97gjcfrvd72axm1z741rz5xaigki"; }; "polaroid" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/polaroid.tar.gz"; - sha = "096iz34hpmicixrdrqaxmx8m83vggm90xqz4zyy5vkpcy3vl60mf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/polaroid.tar.gz"; + sha = "0m748kj5qps9vwwww44i1lj64r0mg0hqnfkg7dhqrf7nl0saw4da"; }; "red_loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/red_loader.tar.gz"; - sha = "0n2jmfy558rma6knraskb7rgccvnayxh7csl0jaarx2xl9zxzzay"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/red_loader.tar.gz"; + sha = "18vvlknnp3kiviacmp0cbmagrqzbhli6qv6vbzw362cv2mxhid85"; }; "rings" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings.tar.gz"; - sha = "1g9p2cdn1w7dmy2z017xdkv6rm50gdb5qqd8a0y0662fzph5adg0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rings.tar.gz"; + sha = "0xhwnxr5hcxqr64vr45lkvwzbbcpzxfbdlad006r16m480ncripw"; }; "rings_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings_2.tar.gz"; - sha = "07v4mq1lpw9vfzg0rfxmkyfhyhz3nv5zab5kf10bjjgpjq8c9fi3"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rings_2.tar.gz"; + sha = "0vdjby6kyazxy042ljyv59pg4zfsvzzssf20w4r7ircfyiqypajs"; }; "rog" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog.tar.gz"; - sha = "13lcrsdk1v1xn7fxn54xbk1jkh55kmsf813q1v7x8a2l8p9pl0hp"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rog.tar.gz"; + sha = "0az3vxndzym39w7357mmr6zyzfy32pg036v6jim895z10093b0y0"; }; "rog_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog_2.tar.gz"; - sha = "0cgc1y1jrb689h9wd7jf3wvf9r996k4ik965v4wclmp9wra5gflk"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rog_2.tar.gz"; + sha = "13yfqb06ihzma80lfsb0mlsaq0j6qakqx607pr5rmhl6765bz116"; }; "seal" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal.tar.gz"; - sha = "0ip23x69ljdj1bwxlhvz3fbg3ia47m2aw6d122v2rqhwqasmy40n"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal.tar.gz"; + sha = "14k98v41ng3had7n6q1z513yc53zzkji7gm4n2jpjj5rd1jd2xr8"; }; "seal_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_2.tar.gz"; - sha = "1fc91n6ys2fl8xbzdj0ywck87xnyn1gp4jvjk307w49jmkpdzs15"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal_2.tar.gz"; + sha = "0kwn7njj7anci9ihf8aqs7k7qv2vsnqc81sj5db672qn4hxpy50v"; }; "seal_3" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_3.tar.gz"; - sha = "1l2jlxhhaf5whbvbdf31ypcasalx4fsd4yn90xybmjq7b27bz5b2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal_3.tar.gz"; + sha = "0pjqq7qlmb0mf0xnm001b1f5jcbfzd3a3hzsf0jysacb5wmpzspp"; }; "sliced" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sliced.tar.gz"; - sha = "0363lwq3rwdcz3fg47f6kch150vxspvpjdqzg87aahli30kkjfdi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/sliced.tar.gz"; + sha = "1xrlhg1glykj73x9spq609y4ygfy3xw4azk3npjfh3ky5l0jqxjg"; }; "sphere" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sphere.tar.gz"; - sha = "1zjlwign7f2zd70qkg25adbbmq8ndm9b44gc4pa0ls64i6yfd6fz"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/sphere.tar.gz"; + sha = "1nav61fr7wba1vbas8wci3fpyx0pidgiv9wm4zxdrw7hqw8akkpn"; }; "spin" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spin.tar.gz"; - sha = "0hwjc4i69zmzw7cpmsrhmx00w5k5y46m317m1imw2ycmhm0jicm5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/spin.tar.gz"; + sha = "1yb39jmvifb1ijh5i804d06c97samhf8w4p0w1xwxq29j6ihsvw9"; }; "spinner_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spinner_alt.tar.gz"; - sha = "1ifs9xxd1cxvgjcnqjfw2zxkcapssv10hvchjrlf9nl60ayyp4m4"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/spinner_alt.tar.gz"; + sha = "136nhpxlc2kar9jwz4pdxpg30b66n7bqy5mk9lm4v90pwf5m3kbs"; }; "splash" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/splash.tar.gz"; - sha = "12l8hwzmi68mjqgl384wf1fscvnzwp4a3vmlsb2zcbfwhrs5q717"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/splash.tar.gz"; + sha = "1wnmqqm07yrbd5ha31dd2iihmrjr555hd8fgra9fy9zh2pw9wgf2"; }; "square" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square.tar.gz"; - sha = "1mpyrivchsj2gr8flwj0g45vb792fvjjb5jmkn9xz1glrxxs7zww"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/square.tar.gz"; + sha = "1wkixypxchsi11d8qfackcbvcjhifys9xlsc61rd7hfgz2nwjmww"; }; "square_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square_hud.tar.gz"; - sha = "1lvv00r5rg8yjwibfqncka1s0p59fnpklhz3v6ifbs7ynlyp0kag"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/square_hud.tar.gz"; + sha = "13bbzxv4gq66z0h801m8fi3n2rk41212nhapa5xb3xgh7v23my04"; }; "target" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target.tar.gz"; - sha = "1ipsd3rjclmwzg2l4bxpj0mgfl5bwxs1ihf498660zhm0bqqpgpr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/target.tar.gz"; + sha = "0vk8abdxhs93bj9l21db2ai7w945z472rwwn1m4070vrhs2fvzn4"; }; "target_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target_2.tar.gz"; - sha = "16lipy5c0pyyb1idwj1zchfr8g0cy6qr46c87b8g1kv2g96n5cn6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/target_2.tar.gz"; + sha = "0n6f1lnmry5zv3y592gp0r2rn297h806zhcgd7yfp0z2zgay67nz"; }; "tech_a" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_a.tar.gz"; - sha = "0fn8aib05kmjxnp7j2bmgrs3avaj6bn06kxz55bw8fdg8ihxnxg0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/tech_a.tar.gz"; + sha = "13gdq6h3m7skryr95vi0a30ylrapxg1nkc8cv8vn025gj6bafa83"; }; "tech_b" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_b.tar.gz"; - sha = "03i8jcvql76mhcq0dqaj2wygfza72fc7c22vfcyp38cx1lm6ilbv"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/tech_b.tar.gz"; + sha = "1l383plabzlkccqjhf8x02jskykr4wkj2wy6knk9kg6qrq8w870l"; }; "unrap" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/unrap.tar.gz"; - sha = "08gqwb11539kz5178ga6f96jv82xmyyzv44q6d05ajcw3pxk5j4c"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/unrap.tar.gz"; + sha = "0571pvnhmny9642rfg7sw6csrz7bka2424zfryg858c0hg6aqrnk"; }; } diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/update.sh b/pkgs/data/themes/adi1090x-plymouth-themes/update.sh index 82eb9916553a8..0fe5db726b3f4 100755 --- a/pkgs/data/themes/adi1090x-plymouth-themes/update.sh +++ b/pkgs/data/themes/adi1090x-plymouth-themes/update.sh @@ -8,27 +8,21 @@ curl_args=( '--silent' ) # optionally takes a GITHUB_TOKEN to overcome api rate limiting. if [ -n "$GITHUB_TOKEN" ]; then curl_args+=( --header "authorization: Bearer ${GITHUB_TOKEN}" ); fi -# get last master ref -curl_args+=( --url https://api.github.com/repos/adi1090x/files/commits/master ) -last_ref=$(curl "${curl_args[@]}" | jq -r '.sha' ) - -unset curl_args[-1] -curl_args+=( https://api.github.com/repos/adi1090x/files/git/trees/$last_ref\?recursive=1 ) - -theme_archives=$(curl "${curl_args[@]}" \ - | jq '.tree | map(select(.path| test("^plymouth-themes/themes/pack_.*tar.gz$"))| .path)') +# get latest release assets +curl_args+=( --url https://api.github.com/repos/adi1090x/plymouth-themes/releases/latest ) +theme_archives=$(curl "${curl_args[@]}" | jq -r '.assets' ) dirname="$(dirname "$0")" printf '{\n' > "$dirname/shas.nix" -repo_url="https://github.com/adi1090x/files/raw/$last_ref" - while read -r file_path do - name=$(basename $file_path) - printf ' "%s" = {\n url = "%s";\n sha = "%s";\n };\n' "${name%%.*}" "$repo_url/$file_path" "$(nix-prefetch-url "$repo_url/$file_path")" >>"$dirname/shas.nix" -done < <(jq -r '.[]' <<<"$theme_archives") + name="$(basename $file_path)" + name="${name/.tar.gz/}" + + printf ' "%s" = {\n url = "%s";\n sha = "%s";\n };\n' "${name}" "$file_path" "$(nix-prefetch-url "$file_path")" >>"$dirname/shas.nix" +done < <(jq -r '.[].browser_download_url' <<<"$theme_archives") printf '}\n' >> "$dirname/shas.nix" diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix new file mode 100644 index 0000000000000..203b260e251b6 --- /dev/null +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, nix-update-script +, stdenvNoCC +, ... }: + +stdenvNoCC.mkDerivation (self: { + name = "alacritty-theme"; + version = "unstable-2023-10-26"; + + src = fetchFromGitHub { + owner = "alacritty"; + repo = "alacritty-theme"; + rev = "e1b08b5bc06d07dd65f5e72b12fd7f736e0e7928"; + hash = "sha256-wf0aT2uGe/6Ifv//lQStTm24yt2FX3kWQq5ebdmdPJ0="; + }; + + dontConfigure = true; + dontBuild = true; + preferLocalBuild = true; + + sourceRoot = "${self.src.name}/themes"; + installPhase = '' + runHook preInstall + install -Dt $out *.yaml + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = with lib; { + description = "Collection of Alacritty color schemes"; + homepage = "https://alacritty.org/"; + license = licenses.asl20; + maintainers = [ maintainers.nicoo ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index a64b870d12b98..16eefee7bbb9c 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -80,14 +80,11 @@ stdenv.mkDerivation rec { sourceRoot = "."; + outputs = [ "out" "sddm" ]; + nativeBuildInputs = [ jdupes ]; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - breeze-icons - plasma-framework - plasma-workspace - ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; dontWrapQtApps = true; @@ -119,15 +116,18 @@ stdenv.mkDerivation rec { rmdir $out/share/themes/Nordic/extras{/wallpapers,} # move kde related contents to appropriate directories - mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes,icons} + mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,icons} mv -v $out/share/themes/Nordic/kde/aurorae/* $out/share/aurorae/themes/ mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/ mv -v $out/share/themes/Nordic/kde/konsole $out/share/ mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/ mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/ - mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/ mv -v $out/share/themes/Nordic/kde/folders/* $out/share/icons/ mv -v $out/share/themes/Nordic/kde/cursors/*-cursors $out/share/icons/ + + mkdir -p $sddm/share/sddm/themes + mv -v $out/share/themes/Nordic/kde/sddm/* $sddm/share/sddm/themes/ + rm -rf $out/share/themes/Nordic/kde # Replace duplicate files with symbolic links to the first file in @@ -137,6 +137,16 @@ stdenv.mkDerivation rec { runHook postInstall ''; + postFixup = '' + # Propagate sddm theme dependencies to user env otherwise sddm + # does find them. Putting them in buildInputs is not enough. + + mkdir -p $sddm/nix-support + + printWords ${breeze-icons} ${plasma-framework} ${plasma-workspace} \ + >> $sddm/nix-support/propagated-user-env-packages + ''; + meta = with lib; { description = "Gtk and KDE themes using the Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic"; diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix index a140d9cdcb0eb..782fcf0fa89e5 100644 --- a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix +++ b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pantheon-tweaks"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "pantheon-tweaks"; repo = pname; rev = version; - sha256 = "sha256-wj9bvcES8JAgDtW0Damfd8VQNLK+SCFTDVWp/nYGcgI="; + sha256 = "sha256-KYnrQnh/Zz3EjMAqasdk2CZMXzw15txKtPm/K5+FzhI="; }; patches = [ diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 2906a5c839f30..c20ded466eec3 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -404,11 +404,11 @@ }; }; plasma-workspace = { - version = "5.27.9"; + version = "5.27.9.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.9/plasma-workspace-5.27.9.tar.xz"; - sha256 = "0b2xw5izw5pjlyw2mppmxplibdm4vm2kj18rz1narksg7rwnwfmw"; - name = "plasma-workspace-5.27.9.tar.xz"; + url = "${mirror}/stable/plasma/5.27.9/plasma-workspace-5.27.9.1.tar.xz"; + sha256 = "8d00b691cfbb4d7218f97d0c68a677f41cba6eaf18e8fe29976c92d3718201b8"; + name = "plasma-workspace-5.27.9.1.tar.xz"; }; }; plasma-workspace-wallpapers = { diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 473757ae20a3a..b08a59a5aae2d 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -1,5 +1,4 @@ { mkXfceDerivation -, fetchpatch , lib , docbook_xsl , exo @@ -22,18 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.18.7"; + version = "4.18.8"; - sha256 = "sha256-pxIblhC40X0wdE6+uvmV5ypp4sOZtzn/evcS33PlNpU="; - - patches = [ - # Fix log spam with new GLib - # https://gitlab.xfce.org/xfce/thunar/-/issues/1204 - (fetchpatch { - url = "https://gitlab.xfce.org/xfce/thunar/-/commit/2f06fcdbedbc59d9f90ccd3df07fce417cea391d.patch"; - sha256 = "sha256-nvYakT4GJkQYmubgZF8GJIA/m7+6ZPbmD0HSgMcCh10="; - }) - ]; + sha256 = "sha256-+VS8Mn9J8VySNEKUMq4xUXXvVgMpWkNVdpv5dzxhZ/M="; nativeBuildInputs = [ docbook_xsl diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index 169efcb2c3254..16e6fb3209289 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -1,4 +1,10 @@ -{ lib, mkXfceDerivation, libxfce4util, gobject-introspection, vala }: +{ lib +, mkXfceDerivation +, fetchpatch +, libxfce4util +, gobject-introspection +, vala +}: mkXfceDerivation { category = "xfce"; @@ -7,6 +13,16 @@ mkXfceDerivation { sha256 = "sha256-FVNkcwOS4feMocx3vYhuWNs1EkXDrM1FaKkMhIOuPHI="; + patches = [ + # fixes a segfault, can likely be removed with 4.18.3, + # see https://gitlab.xfce.org/xfce/xfconf/-/issues/35#note_81151 + (fetchpatch { + name = "cache-fix-uncached-value.patch"; + url = "https://gitlab.xfce.org/xfce/xfconf/-/commit/03f7ff961fd46c9141aba624a278e19de0bf3211.diff"; + hash = "sha256-n9Wvt7NfKMxs2AcjUWgs4vZgzLUG9jyEVTZxINko4h8="; + }) + ]; + nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ libxfce4util ]; diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index f8eaae9a04017..129388005b5ad 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.56.1"; + version = "1.58.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-MOwjfSUd5Dvlvek763AMZWK29dUoc2fblb5qtByTqLA="; + sha256 = "sha256-WX3eZl9/N8K4VzBOLHZrxwEI7V+AxOnSA0XYKFHlqcE="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index ee63a6a241d99..c60133da3c8d0 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -3,177 +3,177 @@ # v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { - version = "6.0.22"; + version = "6.0.24"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a936856b-96f0-4525-8f74-b96b792c3664/2da9be398c92985d3f95c3336361d1ba/aspnetcore-runtime-6.0.22-linux-x64.tar.gz"; - sha512 = "a42f600823e19611ddb202bde1a8da8d0e9dadb22262cb2122f8c85af12bddee8793524d9e2096c188b267bdd852ef90bf93533c2d4f2f3151742cfc20fdc244"; + url = "https://download.visualstudio.microsoft.com/download/pr/8f5a65c0-9bc8-497d-9ce2-4658c461dc55/b6c01c3cd060552d987501ba6bbde09f/aspnetcore-runtime-6.0.24-linux-x64.tar.gz"; + sha512 = "b14ed20bb6c2897fb05cf11154aa22df3c68b6f90d2e9bc6ccc623897a565f51c3007c9a6edcdbab2090c710047a3d8eed0bcc6df19f3993d1be4c6387238da5"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/000ddf12-2c8b-4d97-9b3d-f76c8fef461e/c2dfb5a82b7952cb272c0f5dbeb7fcb1/aspnetcore-runtime-6.0.22-linux-arm64.tar.gz"; - sha512 = "bd3dc49cd2b637edc3797206a0b6b07b40f774a25c3c6932bc86d345cfb90f4af7c0927e1b39cf4fc638ce67a5291b0ab7a5bfb030c629f8e4e0d9ce76715532"; + url = "https://download.visualstudio.microsoft.com/download/pr/d562ba2b-8e2c-48e5-9853-f8616a9cb4e4/f4e251ba67b718083c28017e3b0c6349/aspnetcore-runtime-6.0.24-linux-arm64.tar.gz"; + sha512 = "db5de0888441e93466f84aac459d5ea0c9079c9b8e00308abb0ccc687922bbe48ace22b5cbdeb0f38d89cd115440deab5d0b4f1499611822dfb8a0e9f13c4309"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/447de6fd-79ad-4a1d-a7ea-48f57a8e1280/27c1a55772876bf109b7c2caa5038d9d/aspnetcore-runtime-6.0.22-osx-x64.tar.gz"; - sha512 = "c899865b0c3b409273fc9d4eec1e0d37406021acbc40d34aea8566fbd1cdce541bf0f1011a625ec0f61798ae334d244f72874943da790dc3d4b98611b140a954"; + url = "https://download.visualstudio.microsoft.com/download/pr/cf267621-f2f5-47d8-90b4-e8a4555de21b/aa82da20c081e6359b1ffbc8261b5c73/aspnetcore-runtime-6.0.24-osx-x64.tar.gz"; + sha512 = "8cfab4466ab5a82c7e0110541708b08f894427036f54e2e8add649b9777c86b856f7d5fbd4c2709bc74343b5b1de937b13bff2f0b7e68726072f93b417632603"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4f2055fb-f5f2-4953-8341-4c56ae1f2893/52d66998e9326c7172d77a706e752861/aspnetcore-runtime-6.0.22-osx-arm64.tar.gz"; - sha512 = "c39e137d351125fefc078882311eb7de37ec8188444767a15b56d6f242bf5855e0e79cfb205a45c5083e86f039b5e7202727a1f8eaab92706e5c705ba782aafb"; + url = "https://download.visualstudio.microsoft.com/download/pr/516e1a2a-0256-48d9-8212-c95a6c9d93de/6abbcc369ef1d3e03e6e28f0438ee295/aspnetcore-runtime-6.0.24-osx-arm64.tar.gz"; + sha512 = "1590236034ca91d347b045843d790288024b19939d34f356c6914bdc7ce000af9ceea63a9ce69fa599d126fbc6dae405a3a42cd4a02edf5ffa067388da8b4da4"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.22"; + version = "6.0.24"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f812da49-53de-4f59-93d2-742a61229149/35ff2eb90bf2583d21ad25146c291fe4/dotnet-runtime-6.0.22-linux-x64.tar.gz"; - sha512 = "c24ed83cd8299963203b3c964169666ed55acaa55e547672714e1f67e6459d8d6998802906a194fc59abcfd1504556267a839c116858ad34c56a2a105dc18d3d"; + url = "https://download.visualstudio.microsoft.com/download/pr/872b4f32-dd0d-49e5-bca3-2b27314286a7/e72d2be582895b7053912deb45a4677d/dotnet-runtime-6.0.24-linux-x64.tar.gz"; + sha512 = "3a72ddae17ecc9e5354131f03078f3fbfa1c21d26ada9f254b01cddcb73869cb33bac5fc0aed2200fbb57be939d65829d8f1514cd0889a2f5858d1f1eec136eb"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/1cd7db66-695f-48d8-9e79-d61df9774345/4c363363f91445c542e8a997e3568ac4/dotnet-runtime-6.0.22-linux-arm64.tar.gz"; - sha512 = "bef57f12a8f9ad3c41767b85158f76c996f38db56bd4b8d800d9ccd107be3e1d47a3d2917a252bdd937e3c30547e431dfbc295c7ffce8eb4ab072ade426c53f4"; + url = "https://download.visualstudio.microsoft.com/download/pr/8292f37d-c0b7-4371-b307-990c488ffce0/95142913864b1f8cf45d3bc432a8c193/dotnet-runtime-6.0.24-linux-arm64.tar.gz"; + sha512 = "43ec6b177d18ad5dbdd83392f861668ea71160b01f7540c18eee425d24ad0b5eee88dfc0f4ad9ec1cca2d8cf09bca4ac806d8e0f315b52c7b4a7a969532feacc"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b1dc97bc-8a17-4211-831f-8dd2c01399ce/9972b4153b37a16773b13ea0dcd12268/dotnet-runtime-6.0.22-osx-x64.tar.gz"; - sha512 = "cea7d3de081cdc6053861398700211561e2c7990be2e8d982b007f485321c5b6255622069d4c4adf2c0ddaefbd2438625617b10294d7c05dcd36d283bae40567"; + url = "https://download.visualstudio.microsoft.com/download/pr/3adf2172-7ded-4053-bc86-b5236b1a3830/80038eb1ea0019995c76660f18e9a290/dotnet-runtime-6.0.24-osx-x64.tar.gz"; + sha512 = "25afb6eb9d9404332efe32407e1dcef080a79372b8631b7720daf62bdea42c4fd36c1fdc12c6333c9c1754a1cb29f5ce64a1436e6392db396a9dce647a8f2c16"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/48cddb0a-2a08-4d83-b571-00772a73d05e/5489b285d12781a983a0f17f26973369/dotnet-runtime-6.0.22-osx-arm64.tar.gz"; - sha512 = "5038b29e5794271284d8316cbc454c8b1f1e54c30fd15305051008ff005a79ae22367bb2a50b03ffa4ce00228d1d82a3361d675a1a1a2c8ffaee3dffdd7c4eac"; + url = "https://download.visualstudio.microsoft.com/download/pr/87743def-9e7c-4157-8ca5-d818496e41ff/97ab6a39043f45d7701f91c422a663f4/dotnet-runtime-6.0.24-osx-arm64.tar.gz"; + sha512 = "fbbf6b385172700e4864db9db6f85bcec6fe447d504d181878ae7a3d7b4e06f19920c7aecbdb4c4700bc65f51abb7409cb68e99dda4af14319909bb2816c22ff"; }; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.414"; + version = "6.0.416"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/d97d1625-d7ed-444c-a7e9-e7b469842960/d8b97220d0d79119e3026da2b956854e/dotnet-sdk-6.0.414-linux-x64.tar.gz"; - sha512 = "79bb0576df990bb1bdb2008756587fbf6068562887b67787f639fa51cf1a73d06a7272a244ef34de627dee4bb82377f91f49de9994cbaeb849412df4e711db40"; + url = "https://download.visualstudio.microsoft.com/download/pr/675f1077-ab10-40cf-ac18-d146a14ea18a/522055f875b0a2474dacfa25729d3231/dotnet-sdk-6.0.416-linux-x64.tar.gz"; + sha512 = "5a3c60c73b68e9527406a93c9cc18941d082ac988d0b4bfea277da3465c71777dded1b3389f0dde807eda6a8186fcf68d617d2473a52203cb75127ab3dafc64d"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2afb4da-478b-4ffa-aeeb-a37a313d6fc8/0897a8456d42f306519de9a15b1e14ef/dotnet-sdk-6.0.414-linux-arm64.tar.gz"; - sha512 = "225367725fa2af00240654863c4dbe2370b95542d8c411a78017e37e13031a67049bcf570b94d9fdc9f61b1d13db7bf7ff9772bceccb70f43dd468302a47016c"; + url = "https://download.visualstudio.microsoft.com/download/pr/a56a7895-ec29-44fe-9fbf-3ea6a1bedd3d/47393de218098a0d63e9629b008abf07/dotnet-sdk-6.0.416-linux-arm64.tar.gz"; + sha512 = "b121ba30bd8bab2f8744f32442d93807b60dac90f8b6caa395d87151b2ffc335f93a95843f08a412d0b90c82d587301b73ea96f5a520658be729c65a061a8a80"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/25ec70da-5c05-4d55-9f1c-fe103417da1d/afcf8ecac02c9e8a927c128c9a72ec1f/dotnet-sdk-6.0.414-osx-x64.tar.gz"; - sha512 = "399c9fcef1ac858685f67d33079a49fd814d90926d47161680eda23820281acbd3b0a98fc7dffedeb9e2072f68880d74de3e4ff4d369046af157817dce61d5a1"; + url = "https://download.visualstudio.microsoft.com/download/pr/fd03f404-c806-4eae-9bda-0d002437c227/314b39bd905ad559bf38421d8184f0b1/dotnet-sdk-6.0.416-osx-x64.tar.gz"; + sha512 = "cccd47ac03198f7c2335abbf9ebaf11d76e229cd2690f334bafd70363de7045e600c33057d16689fba6ed95bb2f80ee8cd8258152c07c1972323471dcc6f2df1"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/72bd5609-d0bd-4fb5-a563-6f426038a7d9/01507b650934aab36c340284d0819ba3/dotnet-sdk-6.0.414-osx-arm64.tar.gz"; - sha512 = "02c65256834ed5cb947089ae4f0b2f5ad0bda44fd3abd06d9f5003e2090017a384a569ef08fa7f4abfdb368345c34242569cb81980c0463529469e522e742042"; + url = "https://download.visualstudio.microsoft.com/download/pr/ac99e470-ab07-4f1f-901a-3d14c9dd909d/a2a51c3f12ba268e22166cdeca54cc65/dotnet-sdk-6.0.416-osx-arm64.tar.gz"; + sha512 = "7099b3dba1137e1f429adebc3ebb4cd002d6528dd74426a687c2919b7d01acea49cb65c2cff1f1f2e283d96159440c60d909258d2350b8e76df3e513152b23f6"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.22"; sha256 = "0naka2szh9yxbqh99b4hswmxdspknckxm1dc7y56b8685gpwj202"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.22"; sha256 = "1xvqqc7bzj764g3scp0saqxlfiv866crgi8chz57vhjp9sgd61jw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.22"; sha256 = "0nwnrchpajsllg2gxnxgyxgdbdamsnvpav1yv746bdjh0anb4yr0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.22"; sha256 = "0ss0avj940d47pykh7sqsks6g15ny0qwp67kcbzb9nc5h6gi4p18"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.22"; sha256 = "1gcv99y295fnhy12fyx8wqvbhbj6mz8p5bm66ppwdxb3zykjg2l8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.22"; sha256 = "026r38a7by7wdfd3virjdaah3y2sjjmnabgf5l25vdnwpwc7c31d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.22"; sha256 = "1bfff1342735kp4d9rhmwf8jflj40dvpy1gb3gvd7dri8vqhk3fg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.22"; sha256 = "1d58anf2ws7gs52fyjj3i0fr62dva9va605vswl95d4w8av5bgnj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.22"; sha256 = "0ygdqsd312kqpykwb0k2942n45q1w3yn1nia6m1ahf7b74926qb5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.22"; sha256 = "075z4rn6nx5jqgxksdcr743mrbd6lw8hvsxkbmyg5ikqxfwqa1ny"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.22"; sha256 = "0fqpl1fr213b4fb3c6xw3fy6669yxqcp1bzcnayw80yrskw8lpxs"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.22"; sha256 = "04xvsm3kjh04d0cbw524f021kliylgi2ghcm7w0bm38p29022jh0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.22"; sha256 = "1ib0x1w33wqy7lgzjf14dvgx981xpjffjqd800d7wgxisgmakrmr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.22"; sha256 = "10dah19xqs4qkvirjj921hrkyrkv3a6gis562f4grqggmr6kb9a4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.22"; sha256 = "0gri1gqznm5c8fsb6spqb3j88a3b0br0iy50y66fh4hz9wc4fwzm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.22"; sha256 = "04b1p8whw3jqxdxck1z5m5zpa56jfqrzspa7ahaq9xqqfacsfnzx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.22"; sha256 = "170d8md31m3cfxwbanpv2amr5cmd1kkl9wl2w0jz9ggiwykc81nz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.22"; sha256 = "0k1i74wn6j7nq0bd8m6jrpl65wda6qc9pglppvz4ybk0n2ab1rbi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.22"; sha256 = "038bjwk201p2kzs3jflrkhlnszf7cwalafq0nvs2v8bp7jlnx5ib"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.22"; sha256 = "0pvab3a6h8cv1qjwkl90n44jh9z3aajgwq5dyq11hckxq5iga09n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.22"; sha256 = "0h1jr5lacsxqw4dx4fclxfbn711vvdkj7j7l2wq2iqhfkdj6r7d7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.22"; sha256 = "1bjy3zmrmaq97xp0f3nzs3ax330ji632avrfpg8xz4vc5p8s1xpc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.22"; sha256 = "1g190wngdz8758knb5ckgzip6hw6a72cjwiqgszmyh6hfisi553r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.22"; sha256 = "0px26kil779qjcram05smv4lq600l35r0klwh4qrwlrjq4pj2250"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.22"; sha256 = "01gbl9dgky4h7ijxryz3527l39v23lkcvk4fs4w91ra4pris2n8p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.22"; sha256 = "0qplswzqx17xa649mpr3cvlap926hlylvk1hh77cpqyrx5wz7855"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.22"; sha256 = "03nbcav8if0yjkxfkkk5sknc0zdl9nk3lhd847qa602dsigabaz9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.22"; sha256 = "09gfqdxbh36bjx20fw9k94b9qa9bwffhrq0ldwn834mx31bgrfs8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.22"; sha256 = "1sq1ygsrpv2sl85wrs8382wgkjic0zylaj1y8kcvhczcmkpk3wr5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.22"; sha256 = "0svzrwz3zi40xab1v1fd1rk2vcmxj1y6a4q6ap5hx0y7pck3xlcr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.22"; sha256 = "0596z83qqgrjvih2sqzjhm2i6ww8s3c4dhjfjl35d5a676j44n31"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.22"; sha256 = "1nn254xv1hi5c4rg38fbfkln3031vv545lv9f4df31i8c1yfzz24"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.22"; sha256 = "06hswqx0p4gdvb4r1ff77kwcmwsswhc0h79dffnmfdrll0a10yca"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0rii1mcsrbz6j0mcnbak51rm7afbxhilkvlfgxqvipgdg0xq0nyv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "15k8187hcs54l1wjh5qd3w48sjcpad0z2dn2ng92kmay74jl1yjy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0nwcbkmxpjqafpbi7i1lrw3k235jn8a3g5aimnvppfi2plpys8f0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "11cgpvhrq80r2fra1fqpcarp02nfn69v27av4svmglkv0gqc0fvw"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "1x37zyxhv830480kdn96k1w6lh2yby31dpdh6w9yj475fh5na3dn"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0l7whkm7lidyq2qdbrrvwi3qjk19w2712g9ks1mr4zgqcc29cipx"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1sj3a6g1l7g1w4c7wrxnswqz1n7kk7f0m63zx2jmqhvx5igpnnvw"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1c25fmcb0x2alhnhlfclh5vk4b2rrd675vm21wh4jyjv56vls6js"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "04k53x0vc7zwlzxc8n5qg12wxg2r7nppp19sp9q4qfampyr92r2z"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0pgjn0mkgwrwam03zwyi0f9vz7msnnblw2wxg67wwij1azmjnb20"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0p0xga68ms5m4a0f89jgja8r79ps03d3ka4m9ni9z7yzhq83fq6n"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "17hr4fpl6a8nq3qphhg7m8z5ad0l5az4whh9dk28n0yis76dy5fn"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0qvqnz9b4cljffmms8yms9rijyfc18igbvg5l0qa4y50416r6i1i"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1m56r3admq89lwp4cxsinzcrr8hdl6rr87vj439p9xkpc8yw83a2"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0zwl7c2vjwwifqb9rfl5s3xfffhhlzffh12zjgd0lzhx7y6fn8iw"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "14h04a5skmdlqd2yr00h3ybgw9mnvyv9zlpg7vij7qgdvq4zz8p9"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "1gw9wmg6nqgahgk04g04rfg3v9d8rs4qfhiz6g4n4h6v8lxwirjw"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "12wscn8jkpbgcj1kwwipyin0b61i99r0z6pwg5wrgrirvv0a9jnh"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1pl1g7s58ay6dryc1mk1haw3g2ywv1iakqv9wazk9cd8d5ls1mpp"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "0inrily1l901723j2ak983i79vl8ppb01khrpwvfnibcycj8l2d5"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0vawg1744bxbjxcb5jaqkxcz59bgpg5c231qckjiza2ycrw5nfhk"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1xywy4lipml6ifi7w8aghnrbp8br421iqjfni8pr25d9fri83rk9"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0smyxwpihifgbyx8kpqbynp9az0m86k1s1ikdbinahglhj9bxca6"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1ixmmhyq37s8v76fsj35ffpgvab5lzh9wf4z3x0kkp9v561knh05"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "172wq4gdf64ri5qs9s33wyca5rg2mm9vbfzljf6dszy47847n5yd"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0iginfaq7smfipidp8vr2jjw0i4xq8fq8km1ki3z6gkxp8p2w3i8"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1mb10yml3spgamwllqsxx0n7gimj8nac0lc7cz5yq56fipp4i14g"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1bj7rkqiiy1wrfyiq47h671n5igphzd7xrpda7myzh0xcsvqhxab"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "10yxzymgg8cxhymqhrcr9vqg102fyvh5dc2zrdaqxsf64hv469g6"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0yv8jv3gbsji81pn72jx6is60gy4v4f657kbp4kk7f1q78vx1046"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1jsnywr0vd4lkwi6gr6s06pv2bl8dsjhj4q6vxk276i6bfxss5jd"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "02g350h6537fnv9zsw6i4anbaq5f4mrfsqlrsindxbfmqapnbm5w"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "0ipl5zjcmlzm0ia00hkqgzc20f6k7bsk68rr1yc3rzzmp6gcjgml"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "19dqa1s2gz2rfbqsqsnzxxybbkd2y412ck19y06vzbjwc3r5v358"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "1mn6zmgc0n7lbc6vxvnyxf5znvdzsqhvkyfhpfga67npj2i8w7fc"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "0razqiq1hhzrf46m71vx8n8gvraavndig5119g8wh7rlxhrrdwk0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "14v8vrfx3ncclki3nfhg83p01d7abwqsfmgqyjwka2slhjrapgpn"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1pqdmbcs3scxa1xqw4sa7y9dky9nd5z4vzzx5frjxx3255f8zcm9"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0yabmsv8lnrvsylxvs96vswwky4slp3h9c0gn7x0agpwh7wzhwg5"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "18zhyrldffv5scvwvc6v9p0dg606d204m1rdijr2sx1g4sg3gplg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "032zmbhry64pzk9vlmgk8pc1bwz0jcx8dnbz1w34wp8wwx8f0cdz"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "0gcfaki5mf40x3yw97dci8dwlsyhjvjy0ysbid1g80ag9mkjqh4b"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "08057y5d4sjk77f24lnsiv8dbn2axgz8mp5sfzvmaqzzig3w3j3v"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1zx164azcsrss62m8dk8g8nkl9kq8z7n1mn756jskdrdmdslqxjz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.22"; sha256 = "0i9gw5d7gqjbir7ip9904zj6n3sr81xv8lf290xbr163l2f181iq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.22"; sha256 = "1si0dmcjdwdm4z6x412hvyq35jps0rv1y483s83wkv22b0j7l3in"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.22"; sha256 = "0166gwarhhnary19lf80ff33bkx00mkm24f17bc8j6v7g3a7zvq6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.22"; sha256 = "0g2sc6359k3z3f6h2pqg8np2cbk57gpzbyqyn5ixlv34gv3pfhfc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.22"; sha256 = "1x7wclv93q8wp7rip5nwnsxbqcami92yilvzbp0yn42ddkw177ds"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.22"; sha256 = "0km8184kma8kgz7iyl3j6apj1n7vskzdhzmq3myy3y36ysqrb4wf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.22"; sha256 = "0nhd7q0piy6frfv7fx00lf7hdd0l6mpj3bb5w2c1ijfqlcny88ww"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.22"; sha256 = "0vhpqbywilqkyyvlra6sq94vc5p76da962g550lmw18yfkzk5i1q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.22"; sha256 = "05yyssk0vin5s7r5cs43il19ki424ikpcifw1nrglw5ar700pw50"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.22"; sha256 = "09if60d7175yaraf1ljg47lcxg3wpnm3yd33a68g60zd3qi80har"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.22"; sha256 = "10bq9y4vmw09a5apyzqa8zgn8r1i0wysrqaj0rw7bjjl3iz4vifv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.22"; sha256 = "1l56sx3rjmdq8i5cwdzd90vkbx5nyzbbc7rzckmbw7lbi92ys8lc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.22"; sha256 = "0gqv5n9kb8avfn9hqn50ybm12hxxrz35gvvfrppdwdqain13ypca"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.22"; sha256 = "04kkaxkqxw67cn58h46li5kxv0axkdh9f2mr22n4llysbfamzcd1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "10rlwyacci7l8j028n486a1icbsx4lvfq92k88a4h75ys5iy9r63"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "1n313j4lrdsr7yw8r0kxcd1137w4kqmsypjjadcdcq3wm1c8207p"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "126sn9p98shb8pbf4wd5vf94fl2jbmvshdkdmq4knyn8n6bg3kvf"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1wav33bqfz7237cr55x3l27f06ybdrm9zl2dnapjp79ipp73vqj7"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.22"; sha256 = "07p1gccdwhq7rsvlniwvy8ja4dbxisv4822yawffkwwmpnh94byj"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.22"; sha256 = "09q14pyk13ki8wc29wy87adq393g35aanfsp4bdag8gb68qlq847"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.22"; sha256 = "0hvjnnviv8rc3hgw9ypzvx9b19riyb0kyq34g9sg2y3bamhahd86"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.22"; sha256 = "1zjdfjp161n48s8x4jx1f957j49x4g10f61p2b721cc616wfpvik"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.22"; sha256 = "1qcv9286f4c035naqfjmscqn11hid1ak5qw4lv51i0qijd6bkqad"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.22"; sha256 = "141zgcsw9v8pyf0cgg6g433ba1xg87343gpcy9mpnj2jpczhh0cr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.22"; sha256 = "0cm4bv0izfyh6ynr9zdjy2gn6c6vsqfrc9b0pjmadgf07mw9sns8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.22"; sha256 = "1jci3jmzxjqi0h2fwmxqh8vss3cnfw0nv6bw7s13a4jzx1127cxi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.22"; sha256 = "1yx5y4s9ihdgk7pmc2il516w790d6rkklsqlxj5w4yy9vmj16mk6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.22"; sha256 = "19jrak7w0dbyn2jrvxqzjizafglw1w6v84qfqywbbqkhplr6km3a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.22"; sha256 = "0pdzn9s2qdw8ngk2ygnj6xil544h801xhxi0lz0d80dws2w8440f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.22"; sha256 = "1savfrhbcalhdfkc3z6008d7rx0hzr4ry3nvcw7kchx6mxf2pkxf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.24"; sha256 = "1xiw3kdc76b9hqf0pyg9vapdxwv637ma1b63am9dpvm8qprn01nh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.24"; sha256 = "08670zhn2ywkwy0d7sj89rikxccy5qg0vsjwpbypvzndawng0bb9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.24"; sha256 = "1iwnzs8pfrkvqyp0idxc7bx4k8970zfbsdrk1xc3v4jw99hj0q2i"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.24"; sha256 = "1d7j7b8vvbrdf4hiji5snmn8yi39scd2kvnbs5f9sy26424fz22y"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.24"; sha256 = "0knx6lhlqxn3lkgakpab0663788q0si00m9ga7wdn2mzqq0s9yx0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.24"; sha256 = "0qci0ghi0cnm26pym6qlp8cricnbgzdxzwzc8ay1sdhha8dbh375"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.24"; sha256 = "1qr67bb1wqjs43xwypnqlrx3fzhhm9gyjwdniqr01c48yg8d33yw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.24"; sha256 = "07sr9hqzbm1p5cmvzwia30yv5cjf5b1bm0l4bx45sg53g8niramp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.24"; sha256 = "0cvvmh90vil156qqgy2kbv1j6sgrp4z977f3zrwbsw4pj9azdalx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.24"; sha256 = "1czq36l5l01f6r1mahzg8fim1qjxgs345mcyx1f4gq024dw1fmfb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.24"; sha256 = "0lriw4f48f0q2vyagbngnffshdismn3msn7d6dj0lb2xdkzsz1f1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.24"; sha256 = "034p01vm5jfz94qzqcvpph5fjk6rnkjwqlsm39ipc38f4r4a9iif"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.24"; sha256 = "1671gfqabmbqnjq1djx17j5q3zbaf6ivapixyhsla1bz1gadm3g4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.24"; sha256 = "0l2d49an5bmdfd7hgykkd82n7i1l9kpj5k3vfwdkv5274iaiqagz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.24"; sha256 = "1vyy01i4w2wcx82mrjjsbp98v9sjn1cwhdvkhrw8yrrb04lcxbir"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.24"; sha256 = "1ij8xlr044laq4lhl833994hpr636hyisx072c6wmmm21vr9i312"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.24"; sha256 = "1mdhpqdwcly31x08n6wk39n970h98kqgr6hrh8grqln2fqz2xgw8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.24"; sha256 = "02l6javfqwsaialkimmpsq3v4dhb1j4sxy19yvr5w5sdjmq1jh5y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.24"; sha256 = "0g99fqr27h1ya2why3inhcqhyrxrg3g0hvcnqvqp153njcbdl9qg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.24"; sha256 = "0i6gfdlb815322n4rj7mgagrdhpj8kha73r8h0w9y0bkwgjlqw6v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.24"; sha256 = "11nfqmjk11446nl4n35w2l94dsjbbm03lwz47vffibcqmymd57xh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.24"; sha256 = "1n0s52gzfc0i4wwbcfpqh02z3kdjxjpgpvslia1cf8v5wqn690pm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.24"; sha256 = "0j30fyz0cavqd059iviglpx1c3q7mlplvzhnwl2m46hdj18ln8pa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.24"; sha256 = "1zcn4px94z67j60cidynm5ab8cln1rrxabv7c24mlajqnkfw14sb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.24"; sha256 = "1hw8rxghsagw8vd6f5sgl16s7x5d5ix0pf9zqs9zis1wfm41lgv9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.24"; sha256 = "0w2aq1bmbpbb2b79frr2j7xnf2h5mszip2wgaxzbl1vfsnq4zs3z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.24"; sha256 = "0rylvdvdc5rdmw2vcqi0fdzmiwwa1pwlqiavqnb2pslhhq8qg4mh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.24"; sha256 = "1wb4w0izm4njhgh4dji4zv072cw5h2jkw7qdaa98130ai5czg5x2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.24"; sha256 = "1crdfd8p83syn7m4n7vm82lr9lcrz5vq7k4jrk6g3xfgl4jkym2n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.24"; sha256 = "1pc0f31pvfzgdgwlnvpjysvjmzakskllccrsh5qp28ccrr67ck0m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.24"; sha256 = "1lpb81zpfdiz4c1jyfq7y7m4v6icq8b8dg5ainrxjzjz8qjmn7qc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1x3h6w52ab7cwxvshnjbhb9vdfifbnjmwn2kgw2ngl6qxvygikv3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "0ncqxzbpgfgdhrvl3j3csmr749nlzxp7gqf467wsgxd9kri848rv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "1a5935lb2rb9hj6m08fh6r0br8y3i7vq5xzy48hanjdb6cair3k1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "0l5n8pl4i8khrz3nv045saihvndbgwqqip44yc5r5abjbpljp5zq"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "0yv1bmgg85g2abph7wmkv9y7p4s5l51wa3j18rcd7wx63cjik1sa"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1m17lihc3fya44y4vpnacbia773gpg4bqd0gy3lw86gx7rs4n343"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "04q13b76icmbp7cpjwfbw5hlqxnqlrgs0d0xsp7hxlqvnpg1ba9a"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "14p0wpb8w26zagjnp9jvbdqzvgg04s3b9midhz47zr78qjqa0k41"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1n66dxxkh5ax83wp640znw80s1j03sq6zbpi1wsvmm9xbasskjw6"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "0yg3fc5x7frqmvnca244rhwbqwmrcyrqwp0kv2102fs08fjcyk5v"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "0fdnvq997sq16fkc9sjaghzmbahvp5k6zk24s8s51ypbniynwpq7"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1n9bjddbmi6w9bsz4vpc9fx3wyn6ygvh05wcd98d3rf0p3ynghcx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "14h9xxha2qb2smnk2iy6inhwmsjmkpv4kd92l42i0is19k1sq852"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "18mmlg42j8hs9qlq74pxhpj1sm53gqclsrpdjq3d4gpfg6zz7h02"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "05s0qdlyasjrr8vf6kfx18vixn05iwsk23hpsp7qdjvx560kdza5"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1x7nqpb0psqk7q9ifhw149b6awcpm8lgpy2pxz03frdnbpjms7x5"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1jigailv8p3nmmy8qpscxyq8zrdlwkfrls3qicn9arp9ni8phmgs"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1pycy8jspvdga940frd06smsipq10bip9ipd466pnqicaa8nawjn"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "1gm99469wb35v169dpprrnkwkvbzh6v2lapkw4v8mx4nylfc84dx"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1sgjiaync06gy6a1zmpyvikbk3l868k2qg3jag1dyyyl2s1hp02c"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "14nh4hlk9znngl1kl2bhi0ybpsn1kmxb0hq122zqjwvjbfqahlzd"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "0y6a53kfhwaddm7yw263yyn6c5fghihlh76mmfi1hba9bf9615qs"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "0ya7bx3lg92bil8mswp9awhlr2gg2z77kmw90l3ax7srymbimzfn"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1x1hlgn4j9vql8p7szrjrli46lyjn4a4km9v3hj5rg3ppm1wd7wl"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "12b1l6fc9dajvb877kffidyqiicfkk1cxpr5w6cgcvfif3cxak87"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1dpkwqwj4ldasixv2lkg1smql3cgxavswyk53pflr604v1519f9g"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "1ma16r7q1y8000wcwa3rxk5p4j6pw4gdfhbf64cymcahn49azh63"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1kf26qd6ajcafssk674c44nmqr68bp9fibgrglqz67hz9r8w84bb"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "0sm8r6zdwxnwv947yszq8p5dl05j846lk2l0dxbd78r83iskmpkm"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "0059gcn5qkbkqcrrcn75nvw54jcc3q06jyq87l4hbvm9l1w6igrg"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "137nq1bv3q48cn14annxsf2zqg19ppg81fkan6vjbb9vwvcvkx25"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "0gz9ipmh5sn4fds2baqfzc8gzalwmifxs2h3qril1rawxkz29s0z"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1h2pp8p38ilp1hlrjzh70vq2s7k9n4jmcsjpcmzghdaahdg2m8kf"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1npxp73s5pj6cmy9j2cxnfr3cvbm86g6jmq6194qpax9b3xh3a8r"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "06v40vi7ckrn1rl8ynygxaxr0dj0ll5qqsx8k11qk8dpc6849zrd"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "17lk8414hnpn1lpxnqqlkk612l5dyp9yr8kk3hqz7ygi5i7m0igh"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1qlxjg6ynf5fkswb65bk0sg20yklq207x1frq2hrccm5s2f53v8w"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1a5wq6y4qixjd8xadw4wfwx7qrbz9rvhfq5f61sfgsc14lkqjs0r"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "1biz5x9pznlnik0k9jz462z5f3x87frmxayikcb655ydbaiwibkl"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1qvqfkpr8vrfn3p3ws1k4b7mv4n4swc31grvs7bvx6ah8qfacjgs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.24"; sha256 = "0l1j6ybwawk6w01ffaj2rs6wac6p0lps2wsq21pc5imjcbm2mgyg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.24"; sha256 = "18cysr0gbw18hkvc03r6gmllp2s63a0s5xvp02iryrdhaa0vr0qz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.24"; sha256 = "08kjhz9cw50vw3rd904r873fvdm7z4w8lf9k77ws834k92hr2yrp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.24"; sha256 = "0ygdkff2qln45nc9yb2pcrpx3p01bf2bk5ygm34p5mcfqys9yhpa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.24"; sha256 = "1fy1hr14igy4lix4vmwkjj13cbyjjfhx8izch9cd9hc4f1y25767"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.24"; sha256 = "09h7bvwsi2bpd8c9p11amqj2mw0hl4rzla333xmz28p3jf2l06yh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.24"; sha256 = "15sqxccpc9s8djhk1cb1rqlgw20qd2bx8iij0i11riblqg8n37in"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.24"; sha256 = "0vxb0a7zvhhljv8w5bz7ryn8hl28r9j0s20xm1rj4ifggpfkgzgm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.24"; sha256 = "0is94agm1v7q3qhxx8qkfxip92zikd65xq70mg7nl0qms8p4cc41"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.24"; sha256 = "10yk9qlw0v0dkwmzhx58spbpab7xlkxnlzji9dcknmb2yxh4g870"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.24"; sha256 = "0bln3fn5pyc9s03yyfln517682jcnmfnw7v207swdn2qrdcfgdk2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.24"; sha256 = "1yxr2n4p6ijc5hi5ym7hbafqgc6b0ckl7wzh2w829mmg16ww4nsc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.24"; sha256 = "1bryp4rpa21q7fmlr71j6p9r9p30f09mzddkg3d85ll7faap7iqx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "0v2bc1is8786h50nhzf74sm90l1knn85a3f7phxpp8mdsn13ff9z"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1wmgjg4fl9c321yklb0nl0rzj83646xzcf9akj6nzz9ihmq5jp5v"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "0ikg13k88chg6wv8d9bpivnn1ldpnx2yqs348sk6l4i2m1wyz5dz"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "1d3qs0cm2nmf99rv0milmh3g6y5riz66xlkppc6dhn8p1lqrgaf5"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "1w5gjdv7dpig78m334bavlhl6938g5h7bsx26wlzb3rzc9vbyv5f"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "06fhdy6hm78hsscdlc8i22wm439z3fw4003i5r03vvwlpgwm7y3c"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "157gd8fi7vx2cbak8k1vxri8fy54f4q02n6xi0jip8al4l018kn5"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "0sps772kj4sa7cb6rcwlssizbxj7w7zvqfaflalm9zq2m23v7q3s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.24"; sha256 = "0wsmpychdx33pcn6ag6wk0z728jfzi3gds0azh7mv8qizg5b7ak1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.24"; sha256 = "0lc7ckk83bc301kqascqgh2cw0f20rmi1j9144yikpr38x4irg78"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.24"; sha256 = "0k0vyq8dixgp87mskkhdn8bbhdpza1imjfx1jqycms6l4m3aiffh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.24"; sha256 = "1g9dl6n77b9bfraz83hsb3qc74g3wjciwr1r5q3m8w44iaqx6vf0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.24"; sha256 = "1iabbhilq865ccrdq6z765ay6xgqlpcb1abzkaw1kr4lcdp5qh4q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.24"; sha256 = "1hvz3zfgmk6pc7q4f400fnd578yfrah69fm5ybk4lxywkydazjn7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.24"; sha256 = "12d30k8ia8sl4n4q4dzqx2daj7zs20h439x2lgj9bn9gxbrc9kw6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.24"; sha256 = "1ibh79yqbbxxvk8h1nr30kmcj7lz7y733sxdbvj5a28nbvka6axs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.24"; sha256 = "1xdnk0my2j1smvm1lyb9xxda78nx9pnl7pnjyaxbyli918qayyjg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.24"; sha256 = "1wxdh02z70dx4x3vx6bq1krc69irrdiar7662wqkcic3lkgqhdpm"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.24"; sha256 = "18h52kg8brvdm2kagjm4lfkmy42sqmxc3avv7wgn1nxrlfdl221l"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.24"; sha256 = "1xbvhii2p53l6xklg2m54pyk6ja4480hkyykas5m7gvzwglnlh2n"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.24"; sha256 = "0c8gpc4qpr2v6hwn7qswdwyv689gczksvfw9wmqij0nmy2fyrdyz"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.24"; sha256 = "0x94xqff4s0nnwslpmyw1g50k4vsrb6g2xvqmiis2lg8422xi7jg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.24"; sha256 = "1s9vsk81c8bkbviig3x0i45skhsifxwn7sgcg417pvzj27l495a8"; }) ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index a9ab7b4a6cb79..837e3b337934f 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -3,184 +3,184 @@ # v7.0 (active) { aspnetcore_7_0 = buildAspNetCore { - version = "7.0.11"; + version = "7.0.13"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/dc2c0a53-85a8-4fda-a283-fa28adb5fbe2/8ccade5bc400a5bb40cd9240f003b45c/aspnetcore-runtime-7.0.11-linux-x64.tar.gz"; - sha512 = "a5691a53a1be91751bea5c1f6faa2e93d19f5be61dc5a4953a6d6ce33359f78126873022fa1a25e2694dd85ef9671b566bf8b6c5f399f1eb017ae26833867019"; + url = "https://download.visualstudio.microsoft.com/download/pr/a4ac0f7a-a65f-4222-bd1a-c1a94f7df32b/2c62b82c325a8c396db10f09cfa952c5/aspnetcore-runtime-7.0.13-linux-x64.tar.gz"; + sha512 = "930c83d7b553529f37b1516848f64ac5bde479bc5dff5e89edaddc4f7b552924f9b51b58367df8cadb9055b4a7220bfa5a4d39e09fb6b51f4bcacf3b82416ba3"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/cd1c8c35-921d-44dd-8296-f76126a73e86/5c7c20fb1df66c7b1853f77ffe858d1c/aspnetcore-runtime-7.0.11-linux-arm64.tar.gz"; - sha512 = "e8864d261487d3077b0637e710d9348209dd7fe19a0cdd60edde2e43d238f1e534b9485282230c8b1cea0faf4bff1887f07dc919dbeb9ea7f97d4b26b9c7aa91"; + url = "https://download.visualstudio.microsoft.com/download/pr/53990197-c340-4514-b12f-a6c6580cc1b8/c25e55e6e23e7bc94701dc982525d66c/aspnetcore-runtime-7.0.13-linux-arm64.tar.gz"; + sha512 = "a091c7bc7dabf944ad2888908e8becb0b9ed6a8f3f0475c845559804bfb35d6d76fb81ecafac4d9a589b64837258304d94d5c412ef8c75e138582072081f270e"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6df3136e-ba50-43e8-a68f-93e347c63693/e1b7ad4c0009723ab3a83db65969d0b7/aspnetcore-runtime-7.0.11-osx-x64.tar.gz"; - sha512 = "c0925ba2ff686438a40e5b61b660dca48103b37ad42f30828a1bf20ac2f9750a0f2643beb533eef877519f56757f3d4c50ccc5c1c172527883981b0d7974677f"; + url = "https://download.visualstudio.microsoft.com/download/pr/1858183b-b0ae-4866-86b9-af2efc7bf05b/d69c3f2f527c182a841c7233dedc496a/aspnetcore-runtime-7.0.13-osx-x64.tar.gz"; + sha512 = "d635ac072df5f5cf587470c656b6a55e880eeba2f00c12cb6e239d7cbd0a52d92b094379de80ff60fea426049d96e54e095417f089890eb92630d3c07a20a67e"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/f7ea90e7-5d92-44d8-9b55-211182814710/af6bbc87d7505be5d4b22f130076a65d/aspnetcore-runtime-7.0.11-osx-arm64.tar.gz"; - sha512 = "799460d18543a4e3fcb0b0ed824bbc248afd9374bf74142d12a65d422aa8eb939914c870f3d575ad121d035c19adcf4423815a34e24969b9eda15a2048de8b68"; + url = "https://download.visualstudio.microsoft.com/download/pr/a7823689-d818-4744-8bd3-fef504768c3b/7160531d6f935155772e4b0d4a0e3b78/aspnetcore-runtime-7.0.13-osx-arm64.tar.gz"; + sha512 = "6734869eaa22f163d8fed52ea3b1f11f22ceb0876337114a0b9927a96e4fb82f826b6ddea3dd7061ac02da2e13c32c9ae6c946ca5ce53007869a97c0cdae3f94"; }; }; }; runtime_7_0 = buildNetRuntime { - version = "7.0.11"; + version = "7.0.13"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/948e3f45-a2c8-4d34-954e-a360851b7ff2/aad7d4a9b73242625bc33b0e9c124478/dotnet-runtime-7.0.11-linux-x64.tar.gz"; - sha512 = "110db17f1bc9e5577488e7f5425c6c639851af68c8d7dd17b0616469755c27d3c8a78ab01aaab13ed4849c676230bfeef9113f1dc4cda34c5be7aa1d199e7d57"; + url = "https://download.visualstudio.microsoft.com/download/pr/084709e8-8937-4c46-a361-28212cb2838b/4c5d7393c6e79f816a1591264411c22c/dotnet-runtime-7.0.13-linux-x64.tar.gz"; + sha512 = "00a0b9c101c665ea9e751ce645c68840b02450c4a9f268149e6f59da1f179e85f0932475b8a72162b5271fdfe2ddc88eb21d09aa78bdd7dc285983445503f758"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6079be92-f70b-447f-bdbb-ee85e5b04d14/249738ad78341a40f9765599281579da/dotnet-runtime-7.0.11-linux-arm64.tar.gz"; - sha512 = "567b39c4b8ff278349fa76522351e6f399eadd9a86189150a312fa7a4d365c60ccad8a06564ff4b8acaaeb907222d6b154b711e324989f7f6c234dc5a85ea0da"; + url = "https://download.visualstudio.microsoft.com/download/pr/08f8d331-b20e-4400-a1b9-ddd7b4977fad/b162a6c808f713914ad3ec65f88521d9/dotnet-runtime-7.0.13-linux-arm64.tar.gz"; + sha512 = "e3a465923ed3325f3d427a4737e0e23bfcd549b1ad2c2374e65a3d865553790e644a57a0aef676893050085a389a846737ce6ddf6f2f53e7bae7d3f6253c06d5"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ffaab50c-bc8e-4b4a-a1e1-7bd859a3e7dc/5e6a62a33021d44df7807e3fcca4d111/dotnet-runtime-7.0.11-osx-x64.tar.gz"; - sha512 = "5e714641c1693abe2662ee71f6aae7ddb35a8a3869939f024f63666d7e90fdf2e5e25af5d7e53c81fab293706640c391ce6be4f737df3fe2a0d769bdf443178c"; + url = "https://download.visualstudio.microsoft.com/download/pr/30e43cae-eb9e-4d8e-b1ab-bcc4773f9fae/06137966e03cd705d55a86e10d8a6340/dotnet-runtime-7.0.13-osx-x64.tar.gz"; + sha512 = "e28407e6e466ce8708a9648e59df6b574da5794c61418217edcbcd068bb72086761a7a9f09c3c35cca3f7bba9c8aac28c8cb6b64b6fbfefbc3016dc1f6292ab3"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6120c903-2058-4ea6-a62a-6b246750c2c9/28d586c9ecacc7fe95a65f98dc6acd6d/dotnet-runtime-7.0.11-osx-arm64.tar.gz"; - sha512 = "546ec5050ebc70ed17252d401cc43c9bd628fbaa40a6a764a4ca567fb37d0db14a6c0e28a190bdd74254e886aff9fed542830224f0dbaea32792235386648ea8"; + url = "https://download.visualstudio.microsoft.com/download/pr/ee9ebef3-f459-4337-bd45-521c818fae52/58efc8c2ea98c0fdcd8ebb15700a0565/dotnet-runtime-7.0.13-osx-arm64.tar.gz"; + sha512 = "d0ebff0a46471ae1450de439b870b775e88901e05d3716261371e2283b5ae469bc03b71f545d08839990e7473517bb583bb6174215e412f10d873c9de5972f06"; }; }; }; sdk_7_0 = buildNetSdk { - version = "7.0.401"; + version = "7.0.403"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/61f29db0-10a5-4816-8fd8-ca2f71beaea3/e15fb7288eb5bc0053b91ea7b0bfd580/dotnet-sdk-7.0.401-linux-x64.tar.gz"; - sha512 = "2544f58c7409b1fd8fe2c7f600f6d2b6a1929318071f16789bd6abf6deea00bd496dd6ba7f2573bbf17c891c4f56a372a073e57712acfd3e80ea3eb1b3f9c3d0"; + url = "https://download.visualstudio.microsoft.com/download/pr/ff8c660f-ffa9-4814-ac2d-4089e6ec4eb5/dc806d344844f1d58d8015d105e85c65/dotnet-sdk-7.0.403-linux-x64.tar.gz"; + sha512 = "2e96fa4ee32885a4433be12aac0e10998f9e7f0fe4791f33cd31966c0e0d345d978514787a36c5f0f43c7754e9639a5d52fc96c9f44cf56c0cfc9a8ad2620dd6"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/799b3459-f1de-4c88-ae38-fd1aa76c2d73/db275a0fe9776b55cf0f81cb0788b6a9/dotnet-sdk-7.0.401-linux-arm64.tar.gz"; - sha512 = "7c6ba2047998c906353f8e8d7fa73589867f46cbc2d4ece6cc7ee4ca3402b6a18717089b98002c7d15e16ca6fd5b11e42037b5fb0e25aff39075d67d8be49e25"; + url = "https://download.visualstudio.microsoft.com/download/pr/558bb19a-c08f-4aa4-bcbc-481e9b050031/4de7724688881c9ce6f0e5cfb8a2acb6/dotnet-sdk-7.0.403-linux-arm64.tar.gz"; + sha512 = "0980f3f888f1267a5dee5c916ae8d0931f0c6789f1e7334fb7b4d5ab27a1876ec014d30be8977d314e4aa7302b197dde09ed39cdc5ed84b366307148d5350deb"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/7190497a-9e02-4369-ba8a-29e7a4acc69e/45af3f104e254cc37cf48227bc8e464c/dotnet-sdk-7.0.401-osx-x64.tar.gz"; - sha512 = "7c0ffdc756e13606982a58f21e8fe6fb4a0cfe0210ffba925e81f70b0266715f17d2dd9efeac72c23d552f099c173b04c1c31d07a050151ffc65578ba2d922aa"; + url = "https://download.visualstudio.microsoft.com/download/pr/ff4be5da-8947-4b41-ad0d-84c98bc6d36d/4a20953b6b2aaa5ffd0f0a37e723698b/dotnet-sdk-7.0.403-osx-x64.tar.gz"; + sha512 = "50a38d89af656ac5a3110761182c1b8b6ca15821eb4fde8d0eaebb6dfbeb4c9046a80c00004cdbdb4e5165c6cca1f2c6ef0ca5ff84fc9c32b4c298a9f620bac6"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4246aa3e-4c90-4022-b3d2-5bf36547bfa6/8f75268f923723fb2c4a44b271dbc042/dotnet-sdk-7.0.401-osx-arm64.tar.gz"; - sha512 = "64878c33a80a13eeff58304832b8a00bdea7da088d8683903c4adbf9f6aaab4ea9bd55f5148c76518526d483ee43ab8a76f07afd60da5fc8081456f0448ac3ed"; + url = "https://download.visualstudio.microsoft.com/download/pr/ac1ec933-8265-46e4-b725-5843d483aba9/f41605b8581d114a5131f7761f703a20/dotnet-sdk-7.0.403-osx-arm64.tar.gz"; + sha512 = "6083b9f469dccf097a6a1bd4a264ab5438bce653ceceb54cfba25526845783e43e57e6b57eb6c7b4157108d9572ca62d8df2ecdbc1a0a36d9f08310b9bb3c9a1"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.11"; sha256 = "1l9vydgqzsl8mcx2b58gwkiqy46v14by5fh6im0ibcpv1l8raijj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.11"; sha256 = "0hmsqy4yc3023mcp5rg0h59yv3f8cnjhxw1g4i8md67vm5y04lfv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.11"; sha256 = "0dazipajzj78i4x8f7m8c7sa890il4b46pxzfyz2vq21jb2g9lv9"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.11"; sha256 = "0d6ny4i84fxzadvxamicr5qlmpnb1d6zndw8rkrqsaskpl57l0dm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.11"; sha256 = "18sk9wka8z5354ca77q43hi0615yjssdjbyi0hqq92w6zmg43vgc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.11"; sha256 = "0wxw7vgygg6hqzq479n0pfjizr69wq7ja03a0qh8bma8b9q2mn6f"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.11"; sha256 = "1lvjhrv6c4mmqa645ml4rfj29ardpgxq7rw2jsnxr4qyv1d8iba4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.11"; sha256 = "0fmnfq59454vc4jsynvqf768m8qzzbnl9gv8w4q15wz1aqy02789"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.11"; sha256 = "05ywwfn5lzx6y999f7gwmablkxi2zvska4sg20ihmjzp3xakcmk0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.11"; sha256 = "0b3sqvy48477yxzh1jfwjz69nrpnhpmy063zb5qj69birpcqriyk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.11"; sha256 = "07i1axzlpkprd9imiqxvaxwwxzdrmq8s9vd8k22gdv742wysf5pn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.11"; sha256 = "1i9z9q6b4zna1vg53cz2zxp4fv09jsr521nab4yvavzn2khsb32l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.11"; sha256 = "1j0zbd4rmmd3ylgixsvyj145g2r6px6b9d9k4yxxg6d61x90c165"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.11"; sha256 = "0jc8gq3p0qhd5ws9cwwrjghvqbxb5p0chp43na9knkw6m0wxdxdz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.11"; sha256 = "03nkxjn4wq30rw0163rqi8sngfxmcvwgm0wg7sgyb1cdh0q1ai68"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.11"; sha256 = "0azkiy2r6zbgbcgv8ymdlhwydmap79fw4ws1svyl2yy6ws3mynfk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.11"; sha256 = "0wsy6m1i8znx4y2jf04fnzr6kwzrbqyqvzj6inmdpdnk845lfcw5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.11"; sha256 = "12hh69sr4wf8sjcw3q71vky51sn854ffahbq6rgz3njzvbvc0dbj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.11"; sha256 = "1j1k735gkwba93n5yck87wppfpsbny979hppcygwrk81myf3fv03"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.11"; sha256 = "0hj29pn703vmhkr5x5rx1a0g91f0dx4h7synn1zk4fyzdc5bvj02"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.11"; sha256 = "1wrwzn4zg5fh00pbiv1s4b8fbcz99vv4x2w0m192k1pz84ywgw8w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.11"; sha256 = "0ifshdx19bgnbgynbk6iy6gybnxmp63nylrn7068x66hvcavh7kh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.11"; sha256 = "0px0ha4a256rawssqmzsi2grmydxzi31r9xxqdq2sn8dfpvdshzk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.11"; sha256 = "14159534yavrgrw04r63rcgvdnfv83xcplvb8h2nhrjgsl2kmabk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.11"; sha256 = "1gzwc96fs222ddia0k1924cn7gxm2a4anqgcxhmavx56x76wsy6f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.11"; sha256 = "1mfyq49hcjpj93zhxvy48hh3xji8jfj1hc8caf5wap4jna9rn2dx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.11"; sha256 = "0s3jx6gmjh907kzcqmd26202vl0knbxqbkf55m4wsk7ar3mgc8m8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.11"; sha256 = "0vxza49wwiia0d3m887yiaprp3xnax2bgzhj5bf080b4ayapzkf9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.11"; sha256 = "018qf23b0jixfh3fm74zqaakk01qx6yq21gk2mdn68b0xhnvlzma"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.11"; sha256 = "06x84avjby7q10shqgfzw6z9d2smgwibg51vfw0dzaw648x9mh0a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.11"; sha256 = "0i7x1da6drv8wl2ml9cpzbdalnmlkz86l50wgkirgnwczh3ia054"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.11"; sha256 = "12xmw2kcpf5rh8sv4y0mqzp917f7q8g4mfh5navqw4jmnxyb26qq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.11"; sha256 = "17n1m76ac0i10vkp3y04fd8wyxf2ywjwc6m9a8z1gxgwbmfajs8h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "08flk8ygkyzys0iwv447gndnmfqf9b02api0dcqnzq7zhbgvhxyr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1x9pbqldaz0h2zmw363q68a9zxp5d8xw45s1i40fb2nwl19qqvk8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1x1n63nav3x1is0v6glzjy8wbk343ns7n34q831hw98l4v4gs8c7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "1lpyhwb27fk0d07ibq05fyvhx5lis7gzy3fb2wk617vbwa4aj5vn"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1yzjid5v639xa91l2hk7kxj2a9nszq4qbydxwlw0z1c1vgzx6lzd"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "10k58ncj2q9d2aszwbqldyprficbg0dlv7vy874h8ws1ds43hgpk"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1cbzcxwm5q51sd3ba3cfnkmwf72blqy01j98j3p94xj0fp44s82q"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0k7xdk2k7jrrlas8g6yw0jbmm6gch6ay2vgnayb4nay0l82zczrs"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1nyj6d3ys9c0ffhy2vjgvkbc7z7qa4p7j0z1w76zrawmiikj0j9p"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "02faahlcq4bl2v0rkbpf1gv0a45vk4xcazbcb28iybdnqmz0jb7v"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1nksv1xyss8nhin1ac179w05dfn1181amkk4mb340r1zc348qm6j"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "031n5cmmz6z01z7gwq249xc1rysgzvvy0s7jznn9mfbyk7b3f3cz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1f8s6y4pyxj0w8l3hbvsyph776c4j0w51h7y7bfb6ldpaa4rf7fz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1njk2rc9b1vv9i5v098iycgfsc1wq752x0dj0qpiz5ahmknwgjn0"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0bgdv0j8mhqsvw7zv225n4x4dlbhassl5klga9zhxxh1dnhfhnv0"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "02pkvvpib02rv0i00abygckw0q5rr5ykv2ffn1f15lvfcakssmzf"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1spyrjrb5nbawj3npa4xjjl3yq5d2fd1z77bqc2kjnsvmspqcwdn"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "16ddj8gdwhnbynwdfrk56pk1nh38zs7amibpw156iqc0plwpilgc"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "04shzps9lbqwm2njzp8p8iay9b4spj62rgnz79qnjk10drbf4f35"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0szgfr0r9zqkmbbmcvjnylyvkz9ppfbx1k1dnib6wyxfaiapnl69"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0gpprrzbvv89kxg9k4sa6j7b16i153zy53ailnr3gqaxw3lvp8ra"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1gz3g8gvj5gyazlr24x9cxg81rq6wlzy42zc77dxsrlivxx2jwpb"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0m9h8f9vjpwkf7rcfriqfga11gchv28r7g6w22kc3gxdrba87vzz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "09zmxhxsjbp9qwjhwc6qlckavi62iqqqa0xhd7cd0x834c2v7jag"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1hb45sddw3fxlh7yajj2z2s5zzw3sz117p2qi5ihqb0p7chpibv1"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1x7n2pgxaj2iq6piqav7vfb24n49szrdyalxa31ypkwb4b47s3lp"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1qznwkwrcl098xwzp9hj0qrz0ch69g0mbg332md94pnzw70wjg1g"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "060hg3kiy679h8n71vx7vn6wsrcb10cvnr9yzkr9j060rdiz1jw3"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0mjqsvqd8basizxfjrwj1a5ibjajpm1n9xg800cnfi8m7i9gm9wn"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "010icnyhwfxz7gv5s28p88zvg20lsm1fxlgwdcwgns7swiv6vj75"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0ccyrh87fl4bsxr3a6h54cbnxpm7igm32jfh87s6if1ikb9wp09x"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "1mgi1gl3gvd5rirj91rar32s2ww6f3hf82xpbc3w8bjn6dlnd541"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0sck1d3dgk78rr6dmsdyrqibp8sk4k61286zvc9h2lzl3fdxizj9"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "017x7dyjvizddd1fq87hijjw9n4dq9naqqksj25pc591f7zr181m"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1ajc5ipw7wjw0c07zpf2bjx3sch3d72njpdwg2j561a6v76cj8vx"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0mkjr1shvvrh5rx3q76dp2jrk040ivy1k34bkirms4kh8y680jx4"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1ni1q83679hchrsmbr15ylj1kcbmaw3lsgfp3ml8m2xig1x2hngw"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "0ivy2mi36wgmpm0m3rwmiirzbvfypdm63sh4nw6cwkhfzcy7ngif"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0j1ywgpg2m6pcq9c5cnmac0shjwq6y6lr0p05hzrrkl9amsbgl10"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0bnm6nq7y93z3q33hgsw112ch1kz39bkw46yn6bl3gs2vwl7pjxs"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1n31igwjmjsl5rdzyamcr3hr7qgj4950z3ki78adfgcl0z1a98kf"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "16cvmpkiaah393pxrl955gd31b9pc3z5pm3wd74r6sd687irgi20"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1had0cfkfr9jpbl4lf53dn43c1yccsns9wh45di87in58sr52k1w"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "0xr7anzg7hazhczm5kh28l2lvagzxk4y56rb2xlmmmdjs6y32rpw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.11"; sha256 = "0knl5q76l171fnc3q8yl5f81vv5bkg5m67xm6h0c2szal6s2492c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.11"; sha256 = "0cxw0ck22ngw3l4d7v2yswqiy7rbcrxgbjf2d98s1k73vrpv4czv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.11"; sha256 = "01km0wqrga2bd2mir9syh2qiglrp5y233ahyf5vhf5crb9m01g2f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.11"; sha256 = "040zkvkgyx0cdzgr21x6ysm4m1nb3y64yn80ffbkr7rlfqfyd2rn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.11"; sha256 = "15b62hxrpfy19xvyxlyligixxpa9sysfgi47xi4imx5055fhwphh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.11"; sha256 = "0i8h7ifrni8hnawg59wkicrnz4xz7ihidnd7s9xz1iwigaq3q65l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.11"; sha256 = "0a8fa0758i1gqb44n2v7ha5mzqp9n7rnwc0f9vac11glkvjwba0c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.11"; sha256 = "0g16xzqqdzzrk22dqvn0wf55lh3rk77v8m2kmk7ac9ha77pm5a09"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.11"; sha256 = "1ddhka5hpwbfqmz7gklg7w8vy6vy8kja1wxbfyvcx806wj4z6zzh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.11"; sha256 = "0gjmkkgd85vbd6zj69hr81jn2cbj9zlhxkskmhjsm70k6x9iwbxj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.11"; sha256 = "0avrzj53p512565m904v54x72xmkvznr3jp5r7psjvs4hvbdg26b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.11"; sha256 = "0f1fimz923ahxw6cgz6fkz2m1b3clzi9k9yb08y8zc6dc5jc9kav"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.11"; sha256 = "1hsp6kyw0l88f2i2r9xsyri907v7n0m9ncpr8j4kbwr0ibqnnnxv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.11"; sha256 = "1shdz0sx66vjv26hlyqvyakh8swmq0238w74lwpihpml1bz2bafd"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "1zd472n2831hmpb14zzcqc5p0rdwkpm1qzw3ciqs3rcapna3bzs1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "1ngxsy9fcsx8rjk71skx9ih1lrj3hp809si2i0rykp8sk95gihvi"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "0s5cslrzmv9i2755s251bcf0hpkr8kh5kfad89pympryl0snqc6z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "151h7vkpd86psgh3ykxfnfj74sccbvzii07mb1p6ia52l9jihx2p"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.11"; sha256 = "0k0x4v8rhp6hv30r15g2bny46zx2d32dlf4a5xlrz7va7n95ld86"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.11"; sha256 = "0cdj4sp2z7gh861m5w98hr64inrf1pr302h0dhabipkj8891rp7q"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.11"; sha256 = "1xbvxv7qhgyxl1a1w9jm46zrkia54r8liw5ssjj4kg9cagdxml4m"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.11"; sha256 = "1gh9wxaldind6xfq6ychizaq18s2kf5n377h6wbxra8055nr96gs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.11"; sha256 = "1iy49hg0drhcrqfn6wrvk9cywdbv9hz061yz3216kih02pfs3hv5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.11"; sha256 = "0bxcmi9zx1cqwxf1bzk3n9cmigm7flhid4qr7nzkmlpczdbnk2w7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.11"; sha256 = "0vhqzbispsdcwywqzz7wvbmm9sr66j2d67nhbvcm283s9ms6wcdj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.11"; sha256 = "08aib3f9rid6h04r7wk8129qmhs9fcz2qav6bmmjd9gjf9i8iz9y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.11"; sha256 = "18r221rvnx66n56yxqlwh7lddis1zg6z0qajnraf430k8ilbjwj1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.11"; sha256 = "04wg0nvq7yl7llk0gc7jc29iv7bw8ablaajw3hrzv0yx6kkhbb4z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.11"; sha256 = "036vlbafkjnlkqml7h04wbf6qkxnhshl6m9a8x4kdf9w19bcs0k9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.11"; sha256 = "1c336daa0871l42lwwq7jgh7mkbdbc877dw864wwv2i638rdbnp9"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1mzr6qxz2vnc0zy3gs87ignrq7yiid61b3v22ifv9cpz4x6vdd72"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1y41fwdkski1hl93x1lgkdg81jnjf2k57n5adnl8faqb0ybdbijc"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "155qq0kls43bigrn7iikpw7zn0am51zaf7nya4gb3ayy9cy6s35n"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1yzlmivfm66m6axqlxv99yw8iffl6kn4bamxzzy7wwwvh25y8440"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1qd1rm707kiwdp5kbp8vqnspvgjdd93x3iny6pjhaavjk0mpbrwg"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "12341d3xya1icjphf8vscnygcnd3ydb5c1b2k5gq7nfpdsdcxym5"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.11"; sha256 = "1b1qhysd110a0l8p97yvwgl3q837h2bw56xmqxfsrk4qvnp9n4il"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.13"; sha256 = "01iggc6rxg20min4aa3x8v1baqr9qikf99nal80llyb02fq265hs"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.13"; sha256 = "0x760p4jx5qydsljc2d5r0qkvnghv0axzcpgyzm8pvbfq1kijrj2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.13"; sha256 = "0z2qsiccm7hkkdxd8l9yp9ykswggaykzqawjg51wxh7nq5rmz24y"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.13"; sha256 = "10nks106xh2c6w352bzamba8ags8yvbwkiiw0mj5imrqgi0kvd52"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.13"; sha256 = "012xh79xc2z79jmqjxmgwjw8pbg1my8v12glx3dm3i5p7syccfq4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.13"; sha256 = "0nnkr84pr5zrds8mzf8jkcg9aj85ssjybdqj5khmmjjvailljjyn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.13"; sha256 = "0jan2ajrdmjgxc4hlany11rmsz6pipn8z10jxl6jrab4zb7xv0jk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.13"; sha256 = "106ng227iyydd5sv0b7w0snibyxvgrq8z0jivfbydzng84ijpwnn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.13"; sha256 = "1kw6jdvlssj9bpg67lx1xmwpiad1krpldbbab7f5wyq6yvchd30d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.13"; sha256 = "0411abg5ay308zgw34p0jdim6n6913mgal41azph3wqakw3fsiks"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.13"; sha256 = "0rm0jsznzbpp6r8y4hgcy6y1x6460hb38fdxikbbfnppinpdy549"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.13"; sha256 = "1d2p5phx9rsi960nji298px9idnama424vipjv76vknc4j7qbsvf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.13"; sha256 = "1blzmczw1hxxfsifh95p9xxyksyvkgyp808xki2ylyyi69dlz5s6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.13"; sha256 = "096r8swgq0iw4f7bkcjz85b43qqdzfcsg4qh8xkk4nrfkkilwycw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.13"; sha256 = "1rfgwi1gr1jyym50yvcw295v3q2333jqfi42bain0xxq3fa539j9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.13"; sha256 = "0d410mpgv8y0yj7kixxaylw5j2b8f9krravcq8i5zpdbxzjbzxrz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.13"; sha256 = "1rkfpifnc2n1ijgxpb86rraa7jyl8mj1w65lpwhw777wk039vbz6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.13"; sha256 = "01miqpbazjc1hmyl9w4shnig3ijga4ddbyjmhr98sin6fkrs4797"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.13"; sha256 = "17a0lzd7zhvvvx0dw79isri74nhwhdi8hdiaaz9svl03pbs7gybs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.13"; sha256 = "1d7placw1v8i8n3bq687nvvckq4jxz2kxqj9q0q7nlwjzl3vpyab"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.13"; sha256 = "1kwy9c5q95kpf1xs2v3mir7qzj1px8rgv0bvlcw3nn3k7bwk9504"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.13"; sha256 = "14cv63fa1bzlvjfxicj6df3ay0df59a77rmyb0b95582zdm51hyy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.13"; sha256 = "1c5l1q53k8vrdapk3iafc1njdp9y2lqsyf8k9xzjhxkx2asr3gsb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.13"; sha256 = "1k6hj6k05gkgbh1pspvbdryzdxchfs6as6509fsm1rp8s327fh33"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.13"; sha256 = "112nfx12kz48v5izvqbkiv74r4n7293bdgkwcyvbf5nzmkkm49v3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.13"; sha256 = "0yw489apwhpr36m0450f88ximlj8hmfx4m6fdscxfy7bl9az4y3r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.13"; sha256 = "1kmwsx7d1pf2ayl44rja1fj3qpd8valpigly9hzv1kgxbq95wp1d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.13"; sha256 = "0w8iz1qm9lxsfy3vdgq6nhhkkasmdqpp2flbawr4w4z0qs082mp5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.13"; sha256 = "04rfjbqr89dw631w541z6h1gi7lk7nx6cv25p789hv4289qnkirw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.13"; sha256 = "1b22qn4j8bdnm8i4mz544cazmz84bxv2xc6cv38qz7rw17fy28hh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.13"; sha256 = "1bsrfvp7gfga84ks48wjjc0j0y4gsvzp4dmw4xqs3y4f8wc1f1jq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "04xwjavsgxyhmiq6hw0sb8lcrpsmcfjqvg2i3qgaf85rcy8vsqx9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "1fwj19yg50j4mkd58b0fg440a939vy9lzfyyx4qapssba9wilv5b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "08y9k3kn5lfdk11vlqnsf87vvl7vi8w2an8mpll0drw9yawf2zws"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1j4m58i3dqj3nivnxkh91ic1q0z0visfi9r9aqzf2iwmq7njsxgx"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "0km9sjb6f1s88y8v668wnv3lkls3hn5lrgazagmwgs0hw6x70xpm"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0swj57pqrh3435s8jcqci86ifkqhf977ipgmsqa6l0dz365nchl9"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0176s7imvc1fg78xmjxznv7jr99p0nxsariw48axpm6c5fqv5hhx"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1idvvmbqwg16nxkyblrkxbrbhrz8qwfcw5iyyjpylkjkawklxrc4"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "1gihrv3yny5s98sgsaafgfh7nhr4yw7biyz6kqxi8hbwnyddsx8x"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "1kdywv9r7ij8krz65wpyj5pfffhnqg6s7n2s1bhj249x0ggx31lr"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0xpiqma99vqq8i8v6szrqxj056sfc1yjwx16hmm7bl30b1a0vzh8"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "13w733b4pxvani3b3yxdpq72jfaj6amvqzg48zl44i52lrbi5a77"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "06j19xdcpw867qn8bfwsafadb1nxzz1wyj2d19dzvhxpxj8vvia5"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0s6kxlwkwvb3csgibsm8rq30k3mf2vr6qjx72fzzhkw20b1gsazr"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0mhkylq4mhgm82vlicd6fxrmq90mm6a58k1xjpq6njmzmdy6485l"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1fs15j6mzn1nx3kjzz47b44sz45vbfjyr34xfq67sh7frba5ka41"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "0p1dhgw2avg0gqy99ykpdzx869rhbbvca6xk9499vyf7sam4k6rr"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0psmzbjz0pp7k9mrqxzlwhwbr9yxwfnn08yj54yvpafxlwyka413"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "1qgcq5qfhnaxrmcipd4jn8cjy2lm0wf2z82xqfnsamz4p4h0ssln"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "0lk9mlgr3mq5ls6llc92vi7k88wv35x58s80f4gix04dal14jrx2"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "1h4x03zk6qj9pg68xcfxvjg971z7jfhsk0a10wa6iavl979bnyhg"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0a3dl5laq2zwl5s5gj7lf18l3kh1k2h9x1myfbw8pp5g5pcq1igp"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0zn7myvbcqrgi4sfcwjxfqd5zhfqp06zzjl3383a8xl2679qf0jz"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "01jqs98r0xazngnrdz7lq7hk047laafmwd8d075k3p132cnafq3y"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "0jjfx2xjcg3kridkdf199yaxcynhglcjq9j5v8z5jlhgwxqy9v0f"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0gvwiljarc0fgd84gb5zdh4550nbzhd934aba2c4jl5wl1773cla"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "02rv25ssljf5b8jhs8za6hbfh9nab9lk4yfpp7na7izgm4lfaw3w"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "0kslp81hsmqq6m6sa5hdrfch8scw130smn2jixrjqhqx5qvh1srm"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "1wv5xxmygp4spdpzq0g2j0rzr3jjrmvi930gfl4hfpwd9mqmr9qy"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "1r893njy0lr89as72qag659cg4hq0w1r6awby45a3iiyzwj6nc70"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "1znngzk9jlrzq9vmd5qghaji8brjbbyqcg8fcina0gwq427rcvr3"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1kwfa6637bg7gc6f40aivqnq1g6cwqjjn3xlxl02bsghcn8z16l2"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "0vgql6x47b6fzr4zr6r308znfnrkafp7v8q8f0i7ma23rm38dmjf"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0gsjmrnrk5v4pp14yzqn0q9lwwlpdlbsb3py626q9zjhlabqz524"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "1z3bnv9892bi4lp08q5i29xiyra2d38dg7ai1ar4cc4z7vphfcw6"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1fm1y8cdfw30iic0dx3f98gziw0bn4ya0af2g79r1p21arki2lck"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "0a1ckhf994dnyr8llabi2za8chgzc2pi9kg5kxd4gvah0l4ghbzr"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "0bxxahlr8xsmyq2n59d0wphrvi0b2qlb2j085mx56zhysj9s9drz"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0gv0d0lrgbg3h5ldfqyginvi7hy38fpz6573f3r840k0cz5f8m04"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "18s4pdmxv3rwlsr4ygfjs1r6ci4q4znjx0vf5r7n4fbynscr31pn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.13"; sha256 = "1na7w99yqhp6h6m50fa020fi9qldjwbdp2k6b2dcfw0lfi3f0dl2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.13"; sha256 = "06cqhkkv4kysgsd31r14axvav3m490lhs5b4mc2ssc4r15g0ym95"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.13"; sha256 = "0y384akvxkdqij1ywlf2g8afny5ss5wgpfx18xfd0nmcpxbl4fa6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.13"; sha256 = "0nqqqdkvk3xfjr009kdn30900wgrj2hzpzzrpga7y7c38nlpmsqi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.13"; sha256 = "1ip83wmb7ldfl02261acgm29ixzv9pxxliddmw3asp02ins45x58"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.13"; sha256 = "0b8lydw8sf6bcvg5rcvwl8a2x6lwama30h9nc1clsfhd5vljdgzf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.13"; sha256 = "0jhgwkw13mm744vfz6gbhajx9kajy9n4ph7kykqnnfmz1n7w6ryq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.13"; sha256 = "15iz2jmlk445193jz9rifc86fcz801x0qg2ikjqxnj7dn1zz24rr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.13"; sha256 = "02lfq0ifxclr9af5ndfz48ds17a1m8g7a29f6j6m1qhnil29jkj5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.13"; sha256 = "13z1p7w98gsj1lrqq14p2xjmgj0lm5xl2yqacxlc60gsb91f40s0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.13"; sha256 = "1xb96ch2k96m48nmgwisk9bi7c49ix3di7yd9zjqci3gp854d8ka"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.13"; sha256 = "0wj0vv2c0wx0p5wxkcr5hdbqdp08kmp08d7r2rjz6jfdd49h9i7m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.13"; sha256 = "1rrgksmcz4fpzwa8yiahk3wdyg7xnng6jmm3kvzh15y4mw8xir7x"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "17f2pgpp560m1pr2n2l4h0b8zbpz8p6nvqigp82k1g1ys95qbhdy"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "1ic5h46g8cskifldj1b8rgzfzkc1scygrqpmw00xnncp3kzwxkl2"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0crxk42iy7qm13bcpd8ra6kdd3gd2bg88vg5ky9czbm0di57w17d"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "1h643k0g83g3yw8p7s0qvsfpqagp75f98x008qqrw127li716y8g"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "1svvamildi5sw88jllrl0qkb7pdx7g9ccp53ly11lrzls2y1nxc2"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "1q94dzclwp30g3dvw6681djz4pxz0mr2i8w8yb43ikcqm99k6y2n"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "1vrlcqfaxdhmd79lry7nbqa8023vs7zd6728c16rjlkiq69r9yjv"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "17da9plgd1jbdfiqm000xg0aj2c37h8qmm23k96sdg8kl5dkfl2f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.13"; sha256 = "1cplbbiib4h7x5g0j79ijkj4kvw146vnqrmp7h2pbk5912mprzi8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.13"; sha256 = "09s2ykhprx49iwqv2bnsa0nvfvjj6hxh40fy13b90kcpkw1d4vjw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.13"; sha256 = "0dfmwfqb57k5j2b2s4ysg3hm0hzswnrjxilglxcr1r8irk7gr5i3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.13"; sha256 = "0sb24snynvr1bsrhgy4x45z1rjknjfpfs80r0hkhxj184scqakj3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.13"; sha256 = "02hhkhl52cpy3cfl3yfjpyxm4bgkmv4yi2y83fzfrfqim44dslx0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.13"; sha256 = "0g4bn4kv87rln4yjl1igz0mi8rcd90ws1jprn1aqdcxzqqzapzjk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.13"; sha256 = "0hg6y7fd5kx3c6adssxqmwgr606l9h8b31a282lvsw978dmbybj1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.13"; sha256 = "1xxd33h6gn2xmcgv5g8q5c2l3gp77pdf1b6dzvfmwm9xnq6ms3ci"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.13"; sha256 = "1h98p62vh2f5hxziznrd6lljg9p9rc5v72rn6wj1dpgb97zr535r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.13"; sha256 = "13dd70r5y5k7zniwqzzicg5n10kjjb7an02irw9vxbzw35vhn9nr"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.13"; sha256 = "00gyzw6v3npfppkakq78s73si75jgxcgssz9zwccd8gpa3rg82m9"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.13"; sha256 = "03l7nwkx12k3h883x4wnpnkxwk2h2y44c9z96a5f7xm73idfnppg"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.13"; sha256 = "0b9cmcc5cp6ays7qvb22s9fsw7mmfqyvn7krh7ywihap074ddzrq"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.13"; sha256 = "0nn2advczdrnjl0nfl877876bkimwbblr8wkafr24fjkza7al4s9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.13"; sha256 = "102rlvqhzkw74gpfn8zip1qwbkpbx6mklgxfis874d5np1x1wql2"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "092bgrnwpzk9y0ar9xcd2n5j8ilba3f7l296n3hkvgz0mmzihc80"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "1p3x1abm40kwqaxhpp3xszpg39hmlqwxw5kml1jf7drmnij79496"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "03l6ykmd3q1f5karl4njbb6977hymg2zdsb6b590267czfh0xap3"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "05xyp2f5fp5j75k6c4v8lp0clq66mbxrlc5l0lja5s502cypvj83"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "0gzsb4hhk82dpwilaiwin3qgp7mj2jhxa7ync68a4m20x1y5d5vi"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "0cbvq87q4pdyvawxq2ix1y6y8mminx9kl6g3nxfmp7ss20qd025f"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.13"; sha256 = "1vn2pv1d0ir01zga0bpahhzmkn2lr7m0c5bf0s1i92acsq0z9z21"; }) ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index e7bcfdbdd8c4f..d1da16d88e5e8 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -3,176 +3,176 @@ # v8.0 (go-live) { aspnetcore_8_0 = buildAspNetCore { - version = "8.0.0-rc.1.23421.29"; + version = "8.0.0-rc.2.23480.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/02f4c6c2-c137-448d-a189-9ee3a3f6f99f/192f2c750089fa0194f04f5a805bd21e/aspnetcore-runtime-8.0.0-rc.1.23421.29-linux-x64.tar.gz"; - sha512 = "d5f9e7bffbf2b48b26a317dd1d78bc866973b4a2cda448cd7a7ee64c0ffaf98fa3c4b8584d32528026674bdfd99f602f0fdac8242176815705e080df83825efa"; + url = "https://download.visualstudio.microsoft.com/download/pr/0d7fb51b-f30e-4b84-b4c2-b739ec8f7978/68e9fc71fb2c4f01a9c7f25672caf1d1/aspnetcore-runtime-8.0.0-rc.2.23480.2-linux-x64.tar.gz"; + sha512 = "5d8d50498be52ee4c8ae83e9ca82ab947b187f27b56047cc8a09f6ca2ba6bb7532fdd30bc035d518ce636965371f2ed16c9f97398f04d836f4f67b11b5ce50a9"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/de4037e0-6e5e-4a40-9c83-555d30d9c21f/f607c58db3f81aea2c7e56b0ddbf9ac6/aspnetcore-runtime-8.0.0-rc.1.23421.29-linux-arm64.tar.gz"; - sha512 = "ba8035da535cb3bffa720e962e6f9e0f88b36e1221b588f2a126ee4b43c02e4d8c27958017d29e5ab68121fab6a564fe0a27099c4103ee3d527f8554b4ab495e"; + url = "https://download.visualstudio.microsoft.com/download/pr/c5d92a9c-c318-422e-b66a-7849199de735/6c3bc3f5958917851fe7dacd383bcaea/aspnetcore-runtime-8.0.0-rc.2.23480.2-linux-arm64.tar.gz"; + sha512 = "a539170e9f0cc07801142b4f301554bbb76f22c3bc8dc4c421ca5c9be4dad93931acbb5a1d516f5fca57d739d33d10bccd33a480eb9e0d40e0f7594c38e405ea"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c3612fc1-f335-4b1c-a08a-08267100ff43/dd06c8e7021c27becdfed27838be253f/aspnetcore-runtime-8.0.0-rc.1.23421.29-osx-x64.tar.gz"; - sha512 = "28c2cc2b1b32a3d4b287f2ceec42ac7fce59870bd6a72f6767d347fa0a9c53210c5328e4d747ce010512dad149109ff072840c9da9301c8bd66a178169458518"; + url = "https://download.visualstudio.microsoft.com/download/pr/76affdcb-9294-41e4-a5c7-91629309e11b/75a24f3cf07097a94c58e22acf1e709a/aspnetcore-runtime-8.0.0-rc.2.23480.2-osx-x64.tar.gz"; + sha512 = "b798c397e2ddd8564024859f8aca2b9043863376b8327661ed83fb626bb51c26b1d5ef5a0ce6848031f14c480d4ba936aa0c4bddde8f38aea993d72ade10153b"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6dbd02b7-f3e8-46b5-a3e9-ea482762a02d/430b0d87ec687b4a9968ca143ea95789/aspnetcore-runtime-8.0.0-rc.1.23421.29-osx-arm64.tar.gz"; - sha512 = "dadb90494fb36a1d38b12d2903a385b76ee7325eba59d44acf4e10c3019bcfd636cf0b9a7c3070516325c6be4f5421c11fad7a2293ccc2b1c7a5d3c62bbf07e1"; + url = "https://download.visualstudio.microsoft.com/download/pr/32f5d2b8-3b63-4d4d-8a7f-876adad4efc0/c1f62a3e480fb0e38faa957d34c0be54/aspnetcore-runtime-8.0.0-rc.2.23480.2-osx-arm64.tar.gz"; + sha512 = "9cf9dce54fa4d1ca27955170c5378b826400e4ae45a9312f97f3a9d87ec31bd3231d70e482c36499fdc0d83f80af8860cd87d70dbbbf614f0312c6f73f71e744"; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.0-rc.1.23419.4"; + version = "8.0.0-rc.2.23479.6"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8cac1522-acbe-4052-9f6a-19341a8f9dae/1cf1396b382e22cb1ba21a27f3b79725/dotnet-runtime-8.0.0-rc.1.23419.4-linux-x64.tar.gz"; - sha512 = "53938ec3aa4353cfb760d22faa850821b54a53fdd864c4969f48caa6b718ba207162b04a196e85543947acb7d3e719982edad1420b76198562051846f51b1b5c"; + url = "https://download.visualstudio.microsoft.com/download/pr/4fb768da-b0ff-495f-8673-869c2f7e59bf/527c1e1d55a9fbcdd86018bc62b07a03/dotnet-runtime-8.0.0-rc.2.23479.6-linux-x64.tar.gz"; + sha512 = "f1565aa5a5a98b3ab2cd92376b0b1bcf4420b6377047bdf2324a7dd86b82f5b4776a2795395bb777a3f7d6f6f9b8dc89721c2fcf93b4c7532b42b263f9fdc828"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/78e40734-8864-48f7-8c03-971ee500d93a/4b2fd807bb790d9ac3cd8585ff8cb6ad/dotnet-runtime-8.0.0-rc.1.23419.4-linux-arm64.tar.gz"; - sha512 = "6f5ca722ec2c4a400b9c19b17a3d9a10cf92b265c90c1e1b4822c12117580c286e99134f7c223f3dcd71171d5799e1498d38129dbd1bdff606fd64fe451458ba"; + url = "https://download.visualstudio.microsoft.com/download/pr/d16acf4b-d37e-4e3e-8f8c-73c7eff96bf0/ceb8eee1c24d194d8614f3b0a885e9ce/dotnet-runtime-8.0.0-rc.2.23479.6-linux-arm64.tar.gz"; + sha512 = "7f92e7d5f51d1623e2ebccb79da1f047c4a125b565cedb0a4be3d9deb2010c1f8c03276a926eb9a7866bc1ef9c6585724c41d268e9d2fda8012613aa6fa4f95d"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/29e68c3a-f37a-4dea-b7dc-bb1890b28d48/3ee60668c4ccd17ea565d6c204ef1f64/dotnet-runtime-8.0.0-rc.1.23419.4-osx-x64.tar.gz"; - sha512 = "ffb0a22c0e4b9cbefc99a1e016683987dc4046abd9f49f5e48bbb93d0434e818c66274422728b328c97ca1dcd6419c7fbb88ba747edff6a8e92213141ce42bc6"; + url = "https://download.visualstudio.microsoft.com/download/pr/d8b1d5c7-2328-49bb-92d4-7c3db905a1bf/500d836a2747b281059ff025cac9a79e/dotnet-runtime-8.0.0-rc.2.23479.6-osx-x64.tar.gz"; + sha512 = "50ab2233f01534784759439752312749731f5e3a46947da40052186bd87459fb19162c0354fb9c44feb8e3693b6dcd6d791782f63c86add4179c6ed6f6c4ff28"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/59ecb50d-0abc-4bd1-ae81-8a252027d3e0/43ed857eea3316732b1a5cb0c68eaa50/dotnet-runtime-8.0.0-rc.1.23419.4-osx-arm64.tar.gz"; - sha512 = "f5810ed4c8ce565f1eb3505b7994e54ddf6d87f8903f739016daafc01ba532caa1b84e39e4e42b73f392703af973dfcaa2165b4630301a859fb49ba411d6ecdb"; + url = "https://download.visualstudio.microsoft.com/download/pr/148f6949-ee92-475f-b45c-814139f2bccb/1e031945c3524f31abac2c8442794875/dotnet-runtime-8.0.0-rc.2.23479.6-osx-arm64.tar.gz"; + sha512 = "8c9b86c1dc4fc0c6d5086d3a1f5fd28b38e2d94746a1529f3d9783e7240e067fd830098be81052629253c1548b43f4937cea92370212a556448320e294ef887e"; }; }; }; sdk_8_0 = buildNetSdk { - version = "8.0.100-rc.1.23455.8"; + version = "8.0.100-rc.2.23502.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8cccb582-1956-422a-8655-fad2fa12c247/4e86a676860c2ced06228a5c8d21718d/dotnet-sdk-8.0.100-rc.1.23455.8-linux-x64.tar.gz"; - sha512 = "b182c4d496f1e3d6ff109c304972f5011a343750ed11ed8ab273ad0bd2d1441b7393fbc20968b54f61acacd8c372528f9a91a7a956362787a362b4821a434d81"; + url = "https://download.visualstudio.microsoft.com/download/pr/9144f37e-b370-41ee-a86f-2d2a69251652/bc1d544112ec134184a5aec7f7a1eaf9/dotnet-sdk-8.0.100-rc.2.23502.2-linux-x64.tar.gz"; + sha512 = "45f09e7b031f4cf5b4dcead240fe47e2e3731d97d22aa96d3a02a087322658606cc22792053c3784c44f15d7c9bad0ac9dbda90def7b4e197f2955dca9a5bb6c"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/7f0829c2-839e-4882-9e21-fa4fc6bac32d/5ade892179b687046b1252638b8cde01/dotnet-sdk-8.0.100-rc.1.23455.8-linux-arm64.tar.gz"; - sha512 = "686a10b89217fd5d28e4b587dc231d0bb2630fe7dfc7423611406fae8812ce1b53aae3e079b924280fe589686153919272f4b5ba0c0292d68ae50a75530d015a"; + url = "https://download.visualstudio.microsoft.com/download/pr/0247681a-1a4a-4a32-a1a6-4149d56af27e/5bcbf1d8189c2649b16d27f5199e04a4/dotnet-sdk-8.0.100-rc.2.23502.2-linux-arm64.tar.gz"; + sha512 = "b07059a8b6b5586134a63a20c952f4f029372791d53e4a3a1363d39b8beb62b4c7dbc23c7de202397310c79aaaa110d35d0dd5d996420eaed0ed7f77e2dbc669"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/17670d0d-05c3-4e4b-8d72-5e31bb7f7000/44395256cb038899393d7958db2bf2e8/dotnet-sdk-8.0.100-rc.1.23455.8-osx-x64.tar.gz"; - sha512 = "184a845b4b395f4c00b3c9e846977a2af446686ac0e4c916f2736f3e891d3045341a8f391517a19f50900ed262ca4999d28e872bd6d0faa0729f6a5c4ad183bd"; + url = "https://download.visualstudio.microsoft.com/download/pr/2cb4fcbd-ba5d-41c4-9907-8120aa4b5f23/98fd104ada4105462cefb1123a0df533/dotnet-sdk-8.0.100-rc.2.23502.2-osx-x64.tar.gz"; + sha512 = "48268afc73335c19c96bd77bea49eedd461056b1b640703ebae39b3003875ba0b0dbdc13ce7aec0c74ae842bd01647cd1c225ec555439972f3e16300245a48fc"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/91a1c0c5-ab26-4dfc-8aee-6c0cb2354774/7e12ab1e86fbabc3417eb4036d955f67/dotnet-sdk-8.0.100-rc.1.23455.8-osx-arm64.tar.gz"; - sha512 = "a658e0dd633175ac5c7d7c1481cdc44f431e85094e29d0f21f5632f447469a452f5fcf5cf6e42cd4d0053fabca6bb4a7e5cc0f859f09cecbd062301c24cfaf79"; + url = "https://download.visualstudio.microsoft.com/download/pr/6c9084b3-c512-41be-afe5-84e156f250b1/6e1c12684b4c5b95f122f0659f337ab3/dotnet-sdk-8.0.100-rc.2.23502.2-osx-arm64.tar.gz"; + sha512 = "c7f955ba587cb00aa688dbba987acfd4203519da0dc5914ae7e1ecdf8f95089a84402b4d833c7b6186bdc1f70215e399646117242a054c1555087aced61d119a"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-rc.1.23421.29"; sha256 = "0ws54phj14833xz9w53frr3pnq6ps0pfrbz173i9gj5xkhjf3mpb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1sz6skh1ddvdcib8ydi6km593ah3cchgz2fs61kj03z6jg2vz9la"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1r8681ixjxyixznhwakwb19cs8hnwq7pq87n4dpzqpm531jmjkcm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1hmza9icxnxj6dcdivxmngpvrg2ncri1gh849rbfzk04swylp6f5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "1m6a47bnrl8n9ahnh01mg2fkc20lmfjjg3f7xzbdngnikm6vzcxv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "0ygb60mpk1rkz67v1d9vf3f7zfvdzg5a4ckc1yqcfb2n4a64rdbv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "027xhd1r4my8952fajl0smpdikj4ndn1j5gkyhwrg4z45xx35q18"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-rc.1.23421.29"; sha256 = "0cir3vy94ki9v0zzkm49f33mxmp25i2v0c3gp4fhmnhpsfn0x7rb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-rc.1.23421.29"; sha256 = "1ydhf3l9c7grakdr1qsqdgbdvp0zqrc4b66xj7imgpx1k92i2m2c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-rc.1.23421.29"; sha256 = "1mpha730nn451zp3j7h72a4jiwmgq4sqx4r9943v60yzn93j9nhm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-rc.1.23421.29"; sha256 = "1r8y9ra1qc0jx04jdkqcqnwaqlkr9ah081c68qslj7a2izhz1sbp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-rc.1.23421.29"; sha256 = "16vy79c7byrqwd9f7vm0xbah3k4y6yis0flm9jkfk0hp4bb0y0js"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "1q8dsj0l622jxwxxmasmwcp1mdxi6fxyr5swhw9pd0vq3i8y13m5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1254rvx06wjblf0y2msh1zdg0fky861l8x5f5w7hm5l14ys1firb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1q258zk3kkc3qk39yyfvqw3vlcmz4nf4wxdwg79dfp7i6wcny72v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0r5f54vyj38b7simbk0481zfawxr3z5q7sivfm23nmfwxpir80ma"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "10kjms0wx5iialcvd0fp64vriv4cyk7k22wqh3km9mh43i620px7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "03sgkb2ar63wllisx8rmpc3yrngl61yhlmqinwbc5bhyaxpmqnk5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0b747vkvsapy5p4sgv0nw1hs1hak04pbnsqysj4r7ypf4f9bnrhs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0lnxq6risl59ig9svhra6papn0i9rs2pr4zgnysnbfg7gvd3fiwh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-rc.1.23419.4"; sha256 = "1h8xa2kvg6pl8fc1js9lgbvcckh12c496j5hqjiclj6cbsfr3i2g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "0hrxbkqp97mqp6rjpm3azcpvmkkaxz37jl7ybv1bh2m3f0zk66jy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1x5pq1y4gn1gwnqmq9mj02wki5yncidlnmaf2przz8yingfw0hq6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1855npscp1ziab6a50fh0vzv8j4z0sarp94cl3c1myk9ndnkzksn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "03ib84r9xjfzifr5g0b7hifyb5nc6ynk5s3pjifcsplhfhr7hhvq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1arzm0mqdj0hnlsfcki8z3zbbp5mpv73133wc8yxpymh6f000bv2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0f403j2sis8p7y1w2nkbp03xq8qq06f7q94d8clm9c98vppw75sj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1ngwm0hpg00z8hi9kfrc4p8ii51piymn1kkgkbh5wcdz2rmfayc4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "00whfl9s9qd43jv68rff5g6da0k6y11yc2pg6v681967fnq31jqp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-rc.1.23419.4"; sha256 = "0rbyh9a41wvygzfja0wm305bqisnsqxhlfhynvb8p5yv1dsg7w4w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1s8f5mrwnb66azhbrxpy3ab1b7crr3zj1q8fvsym80kl6xapzwva"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "13a7z8m4izwjd0qh3p01kxadxagq59klw173dqn5l57wzzj8vsxs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "059c21fq6kql04kn56yq5ahm5wc3321b12q50hsg5lk6w3w7xgj7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "110aymhj4rj39vpvbkyph9mdx347xydkdcfsdvw1ablfya1p933f"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0kynd77v947b6lxhjwynm9yvz5mp6wb4d4jbl8ccqzw0f4g57qxq"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1ix7jjpqzxjyjqfac2csv2j8zr0xai601m14r5swqs3fy1cpm8zg"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "19g1awn1ywnmwm6z547011d3q1k2wn58sbg4dm5y4pinmcfm37wm"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0wyafqqjxksrp052rqvwxaqc3m6yzhj095w8myqbjnxwyfzsikcr"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "183lwi2xm45699zhynw7zgd4sa3zpap6p8h2036i94kfr24ir61n"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "041n6jrvwlchdvy7xnmwk0khvf4ybmyq5lvwaiav1xxw0a1dyn3h"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "1k6011bq71b3whz9lg7kc8lgf19jn221qzj694m6qqlzrbb3g2s2"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0qkdinyq87rfgiasjgwaggid86xw6kcbjx97w183z4fb65l561mh"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "08h2djggfpjh0q38bq2hjqk5xf48iz343352n6yvsa40rmn7p0fv"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1j4gw5c2p0fvjdhnyg2fcwlfvdgh4sk0v1w3w004xkf9j5jv1sf1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0hh73hk9iq15i46k0h2c1y6ixpi5w0i38f8sk5cijbvkpb1cahwc"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0n3qcyyd0qdnv63ym0rlrw5gvq4g4s65qq6qr5nxpn46iwgz9p07"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1grdchbc8cw94ly9ihnz675c6kg0rnwzdkciwsspnkixfmr8n4wb"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0ndrih51r1ggdbgbjn2gyvwarl0i6qkzp9ravvx92jn02k4bb5yg"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "13x9gnxzk6k6ipijgmi9bivkj4ibqlsb04fs1c0ag0vsdacpwm4d"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0rfkyclsv8451xm8hh8hd55sw9vbr8i60wi67dnjbip61ydl0sfz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1bp2aixzvmvmzkaqq4diqw78azg82751s64s2wn2zkjb9big5d2g"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1mycvp040slw87cl1cnzcfaxmrdjj728sw6dnhyc9z6x75prn7sv"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0a0c3adk3v7qcrxw5wizqxmbkj3fs57r3a0179c8s92vhh4y31l8"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "1dgy2n8acl6kcjpaa6s869v52rvvpkra9wrh6af0zy3z7lrjw3za"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "18rzizk0db8ivbl6hm80r5lzyz2i1gjj1k32nsbhh6x6x57b9a05"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0a8cnaalpb7v09ijm38anh9wyvkd2sza5q87ggmhc0ji10gdlsrr"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "1qfyiwpvh1lw48h3jhry2vkk3qq42avgzfq58xspc87g4km7nq45"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0mnpsvlnw2h4ggw6h3y7cb58a0255p4501m7d2k9jyx2fvkrbiqc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "15h0vxsg91v0yprbg8yf7ny9h0xdy93s4xp7i1x8vqfxizh89l4x"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0wiqmcib5cwxfsyvhf7gq6r76caycmyns08q8hifqksj6lfbi64d"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0qcnaz0slz50lzpdhghr6gxck5x8ljyhc4p8apsk52ir66cb9sfw"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0x1bgi69ylpr280ayzj60dxbirqab4ysxjwzqfwglbjdvqkkwn38"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0fdng2vpzljjpdqjnz2pr8naznlx0vgkbypigjfdkpcrmmdhq004"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0bwbyzcqcbqnaybkb106sq68035vh7kl8i1zlfq6hgd7rsbc5xnx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "060bkh4viwpc1fkhxkpisbxwvfcld1lbm7wjlyl69p84nikyllnf"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "0ma4h0bbham9z57i9fdgf3arz6x5cvc5mmcwr0zm7bzyrc049mdd"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0m95wrq9q8d965yxjkx1mxjnhq35kqhlc868nfkw7i0bgshizaqf"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0bk9wb7vmb5d8pr2lh1zg0gqkx013b760b6mdhpfc0qp3jfqza5j"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0s5yrj4hgamn6r69z5a8phm8v2wcq4f725jzlpfa90wnys09qn64"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "17mla05aq6ab4amw6arq068i3vf3f56gdzhm1s9k2298gfjk71c3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "059v72l55w71i4410jifilgzv9f08mkal7yq87smm5pfmqnl2v35"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0qxnryxvmn6rd8aa1v8knsh974v99n7pqz7lzhyln5f5dr0rpr1s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "024blpk2224i4mvkkdmjrk2zlb7kh1shahkbbk71l7rniagyd2aa"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "04k93say7b842bvh2x853skj5ymxsq3b11vf6rkfcqz6b7hvn7pj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-rc.1.23419.4"; sha256 = "139j4mdjhqnysgal1zifnhwpmnhd8i6a0x46bjxcwskqm3n85c2y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "08mfzspgv3sjcvc2smcsab4q35mbj7cn6ky08nr5clvmf32ddkbd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1wq65zww0ng7w8078bi10km23s7wf1fr2srmzzsk2ailhwhp0ky2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1285632nhb4gqnxqy1rknfzsqn6cg2xaz1p0chdiqdjlw6n8456x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0q5pkl6bji11bskxhgnimbbl9zzv3ly335h169qdi98xig7npv2s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0998hg6n48j7zrhkx7kyn5hk0axf7h9g61qh4gbfpn353zf6ajbx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1s1i1xlszd7rfrg76m616rlwg96zsap81wcjvj68nijfmv563snz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0aif2k51bxc59rskjivcp7lwdnmdw7dnh5gw5aj0hgd1shljms9y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-rc.1.23419.4"; sha256 = "1j5l7zqr8jkj4bgrnmf9ay0zfc43m47q78f8xkiv96pa2bxp9b29"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0aklq0jrjcqgihc6l7cn1j5swz3kxsq02zrvl745a197k2jr10hm"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "17ffbsy4cfplaw8cdly3gqfgkzqxmbgrbwnqca6b7lak1ab53mr3"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "0kk6w9sid9hkqggxxnmzmz3ng14qq049qhz06zq40lhcgbyik96h"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "14s7gxqid5yrlja1aimaq3r40bj2p5karn8ma80368m3zlslm1dw"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "0k24km7x79kxy4blmgzclvqw4m8smlprb0hyi279s1ddg0vpplc4"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.1.23419.4"; sha256 = "1davz97niy36wpsim42yrjm77k6sflcsc0sy5nb6lq9kxj02hypy"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.1.23419.4"; sha256 = "00xw4yjkvdl0x1c60cbbh5gf51cmax2laplhlgilkyazjzrbf3xr"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.1.23419.4"; sha256 = "08yqn96i057lfdrs7xjbambw7sr2aalhskkblvyhqykf8sw24ckb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "1w5p3lngqmp5yqwh96kjdhdlzszik5vw9nx7snsfysjwyhgbr8b0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0zwvkqg0nf981gr6wff2ci2dhb6rc9girg3s0gqz7ysldbxnznsd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0kc57i32xqmrjif82czr7ivsrzf41wmdc0zjkk3qak3j8s0j629f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.0-rc.1.23419.4"; sha256 = "1l8mz0l6g4zv2qnrfsj85miknhq230942l8xvw62bzw4rv89lcp1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1d7m6zgiakdqi6ga0xdaamqjk6y8bxd2fxirmrgzpr0l57zqwhc3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "084pm2qnh8mn5cpf4zs7drqs5zifbph0s6m9h62xgrixw3jv4i6x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.0-rc.1.23419.4"; sha256 = "0szyl8qyc5yc2ah9if4xk20wgny5cbr7hmdl2mzqpbpn5fcm36b6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.0-rc.1.23419.4"; sha256 = "1mavnwcgnzx1dn7h0cg172p0yv00xdaspi6vk34df1s6d4cc35vh"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0xqxz80rr7h1qlgw6ax2pqj33ngv31xbzljhpd60iv229lfzdvia"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "1k6ivz7pcwk7w7fq283q2n88bm0rw7acfl8w9nj8iyag8gi7rpyp"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0al490xcj68xp13q2xl15wd03zld1l3qf88sd651q6jixgwrzbm6"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0wan79hagmkh2in263lbpsydr96l4s6i48qylpgn3fzwdv24idb3"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0jb3gx2ydf4jq0szk071g4l4286alffa6hc4xhy3zqax4vggyakz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0v4g1bva86vxvkhfcimmr30i5d7xm0r9sknf84az2b450b5vfgpm"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.1.23419.4"; sha256 = "0944c1j5gd3hvw7aij5y8wydbv70zb7dw8gs4qpavwjg8vcbs9cx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.0-rc.2.23480.2"; sha256 = "0406jvshxa3j1bc7ss9d717ybbjnf5n6260i9ir231nzmkdw4ich"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0-rc.2.23480.2"; sha256 = "150ja9f96yw7j4mf39kxa541xkmgzmfjgm7jwdmlaln2v97chsk4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-rc.2.23480.2"; sha256 = "1z6lj26cqf3qg3xhhlp8g8k9q93ysr1j2ly41xwi5sccd2x8vwil"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.0-rc.2.23480.2"; sha256 = "10a4pvibil5slnca0bzzpf6nbvan219yg6d6srr9hnqwi2a2la62"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0-rc.2.23480.2"; sha256 = "1qcmw41rbk56y7l79f9xqli44f8xa7rqi2bnncfngfbd54q3ijcj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0-rc.2.23480.2"; sha256 = "0zq25xvypv6fnyy3gx7ivk41z5nyz89x52bf9ayry3391hc5avd1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.0-rc.2.23480.2"; sha256 = "18rwiycm6nhm7mz2gk22yaqmq1sdfsvq971li08czyia2lgxk6wz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.0-rc.2.23480.2"; sha256 = "1qiigv37ikmpbb8j0j2zp1asly13xb8bxj45zh58paycaks01sss"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.0-rc.2.23480.2"; sha256 = "1f8d7mc4kil4xfyj1ki53yqm30cbpms8v1kxpv3harp5dkkgykwi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.0-rc.2.23480.2"; sha256 = "0za8iyskzp7f9mjn8nizz3wjmrpylyv24a70vwavbq0h0h8rplsm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.0-rc.2.23480.2"; sha256 = "1vac7gcv8nqyjn4jylfh5yix8282siarbm5dwvnrsw41ngndgcff"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0-rc.2.23480.2"; sha256 = "0cx4606hlbi9x55vbd99vrbkmhnaz3dcqc7x3sh3ih9f2mpzv5q2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "1l1n2wb374mlwpbk5ivka3j073l8mi89fh92p503iaa47xf95ixl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1xc9hkx2qam19nfnkanm5yvd3iycvw1npql2limskf20qrwr5f7v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "06rk4p7p4ypx7xd2c0dxb142frv9w4gv8720j99392rpzrp1qnmi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0ib3f4wqzx10298gd47j6sqak80f6idrqw37crvgfixsggik23wi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "12yxilcrlwkwrjiyl72sdryjwh1ilxnqq51zm5r10gadips2rzqq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1mbzfbh023xlx2mghhm2f0d4hx9bl9b09d0lfhvf9zlcxhwj8wni"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "05csm5zlrssg94p2vg8zicjxqbx92l5igglsjbwb5dqbvdihz1ih"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "08ify83j27lx0pgjkz4kcg88a2rv89bxqd8fagaafqrjw3s0d68x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.0-rc.2.23479.6"; sha256 = "00lhcw22qfskdljfnk5amfy2j5x8c3mfvgam1s91awh3p4iizx1d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "1pmxwyaynv50fp32b4g2nhys1shpajnpc0q43kgsfs31hmrq32z4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0shzhwgpp35vi2y3fvd0rs458lnwn1wk2361x9q50wcpadiv72hw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1w9j05l8n1r40liq6i04cmc74hbxj4p2j04yqsfww6rx8r4ls241"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1j17rgswixgbli421sgd17cfsrykdv46jmd0337mdgxf2xj99c37"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "04h64nkpxrkp63p52csb4nrkyg8l1gg6r0m3xzl0h8303w88wwi3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0d84yjd67fpl8j1j9dccqqfpg8n717qvxk5y8mhp4rahfi53zk58"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1q6mqcjj4cf3x1mlh0ca5pd1vglq5i9ci0irrm45xqaz8n5190cx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0l9i4y94lmv9m4m44i1gff6a1s8fhdmznz015yf177pbsymm1kjv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.0-rc.2.23479.6"; sha256 = "1bzh85sps3i0ga6pbdrcbd4a0knpq0n41pnknfz6fhyqn9xchpcy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1h36s9sk8dx8dj5g0dkpcnl2g31jbibjal7344zcs6s7d7zjifc5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1zggzn0z7clh6sic4hja5arhhraaldna4pyprxk88hkfs2h7k3s5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "1m8rvvlglivcrqadqjfggrh55c1sm1xyw3fd354v7xxpyd7nsak2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "0rr4xpy6l7pm4zqr2faqihx7qpia9w3y81bzk0zn9rs2wa2g3pj1"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0mdavjwsl7g080ik8brjnxvzvsznqva02854nsba4i8qkrmgq63x"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0a1pnyc8hg1x6q9i0fg1zp5aip7rqxwirnjw7vshdqacadcr86wi"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "00v40ws0qhl87injb20dszay6cz0ig1ralqz0n2v2bymgcdbh1bx"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "0qiqj1i4z3smgpza66cpr1ad8ycbbk9iqs150ribwz350ypa5b00"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0ir0njnhcig7b9drq3qjlid38111h7810b1i8nz0qs1hjza3iryg"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0x7yvqh099bhvsb5zg1mjxyglf1hahz7w36cvz1x5i4d6z63639m"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "0nw4gmjndfnlxaxji31k9llgn6cf4csxzjfpp01qkn7v2wmfl5jx"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "1kx93ay2gx48llqd6l4l8ii29im1ilp5axz99ggfarbsvz8iw648"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0rbhkxhd1aias78dqhyj3h0byw0pj72nvqydsl3s6zzb44a42v1l"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0dzcdapx5pi24zc2zrxgbz82y0p06s7hg7wh56waa4kbgc7rzfbx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "0crsvb0hdp0c5a7d0mrc3i0dwvlvfv1hw44acf3z832q41py3gid"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "1ps9lwwnww8s877sx8lpp6m03kgxgv3bvi9d3rxhfq83yzhawg2v"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "068s9idrwapxsfv169chsdrsw3v74ihhing3x8mvyfwjkswnfm1p"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1qqphry16s89i7dwnb6n65vkc18mpivin2mdjp357a3jgi2c8z2m"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "0m7qph06wxhsw8id1xshyp1bdfk04bdiwfrz3j6ayk6ihg2mw2fg"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "06khkpzfhscsrw7bcvq1ag6by6n2296w8ik0zbi5mq2jm5lx4h4s"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "06sq2dsxg1gl3g5g2x9y2snh9xczi09ci90mb4im21x2dd5i91m2"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0bmhncabzz56r2ac46k1jqsjzgaflvnycbwkh9ksdywm91fcca8k"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "01q00rdyg4dby0zvfkzc8sgyn2434bpzfzjxv3xpc4am05n7nikf"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "1n55lqdriy3kvxmcg2kfgri6si4avf6hi7hxl3pxi3y7ki2aqgq6"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "04yzid7r8ahscjsbphi1272vwjwy6frz1817w15wwby2szprwhqm"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "17xkhj0c41zwpfxm0yvllp12f3zqvl85kg0kwjjfi6z3v3grw9wa"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "1lcbw3yvrm5iha9wjnsvw79nhjcb1px3h5pwhhy3dqcr9l09jnql"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "114s3bqv2diclr44mgshpsvybcldjprh40i51ibz7n4i0kf43km3"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1a068b45d9wh489mv3cnkxk64qb7piqf4nbc6li37mnk5vqkkkan"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "08p6d8h7sfliy3ynzz9wnrp3b4gvdn9ldkyrqgph57kyjgvalk1k"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "17zrq7cvbmd89rfyhykllijhdlbb9yf90rfv8bkb3cwm12mxibdn"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "0698kzvm0fpgyq1m4h09x3d0nzzf9xvypds1zbn32nynil2wrfi1"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "15wbakil6wmcbq65zdn6lsnslzi3lcpsxqiycqk97s9h735n7r88"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0vvfd9rw5xbhxvid2qsbssnvfjimjadpckkh1cjh2wwb5phx2za6"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "1j6cvvgxjpqzvf81i0daizcr01fxabbvggba1ljsvzn08ky14azg"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "1s0b8aphk0yzikfsfd40mnq70x5izx9gwxk3rh5q52fk2h7p8vn0"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0vv5a04q6k5ch1xacz96dgvj9174fbmq03i6lfj1pkmvmknxwmk3"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1kwm3zwwijqf52piv867463injdnajx8hhv2bszbl569v0mpyald"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "06zl77hfg9ha54xmwqmd4nvjzj1zfpdl3gxw72wqi98w1imfakjj"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "0fnx3ig9mx68kwcqp3hqzxys6vqfwc4iz1acxqbs1h0r7k83ka40"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "0n54h4b8l7xhxz6vx3qbz7b466dvlc7sjyrw9v4p3axzpgaz63yp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1cyacd6297nm6cw8w0wxkwl06khb4ng94qdwlzfx5hs2gday34mc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "15ldwj8r25lric5hnyp0kgj3fi1rzlhbvzr1pyzndhb79kqmw9h5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1r3lssmrxjs4r1qfkxm4hq60n9hzdalv8637fzyrp0gqxd7nzl2f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.0-rc.2.23479.6"; sha256 = "1l9a6flcj2ysxp0msvdz3p9zj6rc3r8dvr7gngn0qh17nklifk4x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "0vds01dh5wzwiicjx9zvbhf9sdn6g22y5vy46w6c8vyr5kj9bhw5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1qza3phfq6hmiig4qy0x14ghcsr9ha69yabsds84fpa7mx2w8xsd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1d106zdvv90z6da6w5lxn31x79hnb7in3mm1c0hxmy7lfs2nx33j"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1bykc1r1ljvqqz6v5qzvh2zqzbiav8983657fn1yn5qwdqrfc19l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0cac6scv56d4l8bfni7nan7jkj6c79c0vipxl3pabdpsyhkpw7fb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0i1wkbi0ld3a8mnk809z1vw9zla0w2b5q1gkxj9p59jgyp4hvgy2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "0h70028z3dvvdh2r0v3m21w8zqi4w6x6fcqb58k2981dcrvgfzza"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.0-rc.2.23479.6"; sha256 = "0y8fr3940y8w4qz2pm07h3kv0gvjmygpij6h0nshkmbvhmx76ccw"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0mf4vmh7sx8lshrc8b6al3nnx9lzylrz8xklngqnskbdw25a6z0i"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0z0z98zx7b146lbyl5rhf9vx8sq8qmra0sf9yh99k83dxi17lcgl"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "1rs79c6lw9clp735p8bh48wwfiz93kwb8d8dj2zksa4hp1s5am31"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "108qga3arini479gpr5l4abgrg9aiqshj2iyyrsn4g39b3k2kys7"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "1fn7hqmlqihxprqkig3kpi7mm7qiqm0knrpn1pj94r5bf089jhyl"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.0-rc.2.23479.6"; sha256 = "0x45ii2slpfbh2ln3d6bdmvl1dmqm0m282lfk57fxlp89ra2n37v"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.0-rc.2.23479.6"; sha256 = "1ph3lijgmj9n1ah1s88h4509l20ljlylzra8fl2397nrk5nampnj"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.0-rc.2.23479.6"; sha256 = "0biam46326xx3f07vbz2pa0xvcs6j7v6hy9sdzvvzjdlbr2vkxch"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "1ln1sqw852h2aamksl4xbrxn8rpsf9v0f302nj86rlnkcd36nvgg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1vkdzpsma3h6fkd2q6p7igffhiih2w33mnmihjjcqyg0abxcrisf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "1c9c4sdz7ijywj1h2lrqh0g66kwphawh9wz4n1liqdc8iczq5s33"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.0-rc.2.23479.6"; sha256 = "0c6waw5dwkj0s9l51bbgk1m31a89a6w40m7sq2h4my5pa0fc646p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "02ajhidm312xy397rmw6vvwc84jj59gdv9qwimhkwj3jli51cc5s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "07p2gz8j3pvq6fj1ikp65hzyhw8f76qbsap7ri90myhzy92cfqd7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.0-rc.2.23479.6"; sha256 = "11wdcm9wf2674l3pybv83pi95d7103xh1psq5kkx72zahwjc40sm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.0-rc.2.23479.6"; sha256 = "19v4j3p17hdadgsc6gzqb86iy3ndrkslqfnyvskypcczrk4d272z"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "1rl7n1v9zv6fgxv4g8jrm8b2siic8bglwwylacq9mvmfk4ckcnd2"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "1gc5ilas07492zc5fb5iqrhhas4mx86xx3ga7p1dwgwlmhbpzq6l"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "0qb1rz9qxdjs9ig68chxxjcgnya8aff4c0ipd66afn9q1k7faw7r"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "1fipxybzd7vah2y5rndb5kpn2n8mqcizp2m1lbi4fwi4mlmc6mqf"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "0fgfvrxz02p1w1i0s0a5i8xq1cvd4l9pj40m1rj8dr7b2sck45xy"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "0yhql04nzmfawp8qy5m2byx2b768vpf0lj4l88gyjkblpacr37hi"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.0-rc.2.23479.6"; sha256 = "0mmdhddwx8xa1rspcmfakiv4lyk3h8y64yizir252r2pf5knh40q"; }) ]; }; } diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index c71dd278e203a..b72d418a97dcd 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -197,6 +197,15 @@ in lib.makeScope pkgs.newScope (self: with self; { }; }; + elm-graphql = + nodePkgs."@dillonkearns/elm-graphql" // { + meta = with lib; nodePkgs."@dillonkearns/elm-graphql".meta // { + description = " Autogenerate type-safe GraphQL queries in Elm."; + license = licenses.bsd3; + maintainers = [ maintainers.pedrohlc ]; + }; + }; + elm-review = nodePkgs.elm-review // { meta = with lib; nodePkgs.elm-review.meta // { diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json index 6b3f7b585173e..30b2662ba4908 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node-packages.json @@ -13,5 +13,6 @@ "elm-optimize-level-2", "elm-pages", "elm-review", - "elm-git-install" + "elm-git-install", + "@dillonkearns/elm-graphql" ] diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index a30c6ac53d959..5bf0474e66faa 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -40,13 +40,13 @@ let sha512 = "XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w=="; }; }; - "@babel/compat-data-7.22.20" = { + "@babel/compat-data-7.23.2" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.22.20"; + version = "7.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz"; - sha512 = "BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz"; + sha512 = "0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ=="; }; }; "@babel/core-7.12.10" = { @@ -265,13 +265,13 @@ let sha512 = "pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw=="; }; }; - "@babel/helpers-7.23.1" = { + "@babel/helpers-7.23.2" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.23.1"; + version = "7.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz"; - sha512 = "chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz"; + sha512 = "lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ=="; }; }; "@babel/highlight-7.22.20" = { @@ -859,13 +859,13 @@ let sha512 = "QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w=="; }; }; - "@babel/traverse-7.23.0" = { + "@babel/traverse-7.23.2" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.23.0"; + version = "7.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz"; - sha512 = "t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz"; + sha512 = "azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw=="; }; }; "@babel/types-7.23.0" = { @@ -1372,13 +1372,13 @@ let sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="; }; }; - "@jridgewell/trace-mapping-0.3.19" = { + "@jridgewell/trace-mapping-0.3.20" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.19"; + version = "0.3.20"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz"; - sha512 = "kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz"; + sha512 = "R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -1570,22 +1570,22 @@ let sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="; }; }; - "@types/http-cache-semantics-4.0.2" = { + "@types/http-cache-semantics-4.0.3" = { name = "_at_types_slash_http-cache-semantics"; packageName = "@types/http-cache-semantics"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.2.tgz"; - sha512 = "FD+nQWA2zJjh4L9+pFXqWOi0Hs1ryBCfI+985NjluQ1p8EYtoLvjLOKidXBtZ4/IcxDX4o8/E8qDS3540tNliw=="; + url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; + sha512 = "V46MYLFp08Wf2mmaBhvgjStM3tPa+2GAdy/iqoX+noX1//zje2x4XmrIU0cAwyClATsTmahbtoQ2EwP7I5WSiA=="; }; }; - "@types/http-proxy-1.17.12" = { + "@types/http-proxy-1.17.13" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.12"; + version = "1.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.12.tgz"; - sha512 = "kQtujO08dVtQ2wXAuSFfk9ASy3sug4+ogFR8Kd8UgP8PEuc1/G/8yjYRmp//PcDNJEUKOza/MrQu15bouEUCiw=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz"; + sha512 = "GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw=="; }; }; "@types/jest-27.5.2" = { @@ -1597,13 +1597,13 @@ let sha512 = "mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA=="; }; }; - "@types/json-schema-7.0.13" = { + "@types/json-schema-7.0.14" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.13"; + version = "7.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz"; - sha512 = "RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz"; + sha512 = "U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw=="; }; }; "@types/keyv-3.1.4" = { @@ -1615,13 +1615,13 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/lodash-4.14.199" = { + "@types/lodash-4.14.200" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.199"; + version = "4.14.200"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz"; - sha512 = "Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.200.tgz"; + sha512 = "YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q=="; }; }; "@types/minimatch-5.1.2" = { @@ -1642,13 +1642,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-20.8.2" = { + "@types/node-20.8.9" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.8.2"; + version = "20.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz"; - sha512 = "Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.8.9.tgz"; + sha512 = "UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg=="; }; }; "@types/node-8.10.66" = { @@ -1660,31 +1660,31 @@ let sha512 = "tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw=="; }; }; - "@types/parse-json-4.0.0" = { + "@types/parse-json-4.0.1" = { name = "_at_types_slash_parse-json"; packageName = "@types/parse-json"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; + url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.1.tgz"; + sha512 = "3YmXzzPAdOTVljVMkTMBdBEvlOLg2cDQaDhnnhT3nT9uDbnJzjWhKlzb+desT12Y7tGqaN6d+AbozcKzyL36Ng=="; }; }; - "@types/q-1.5.6" = { + "@types/q-1.5.7" = { name = "_at_types_slash_q"; packageName = "@types/q"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/q/-/q-1.5.6.tgz"; - sha512 = "IKjZ8RjTSwD4/YG+2gtj7BPFRB/lNbWKTiSj3M7U/TD2B7HfYCxvp2Zz6xA2WIY7pAuL1QOUPw8gQRbUrrq4fQ=="; + url = "https://registry.npmjs.org/@types/q/-/q-1.5.7.tgz"; + sha512 = "HBPgtzp44867rkL+IzQ3560/E/BlobwCjeXsuKqogrcE99SKgZR4tvBBCuNJZMhUFMz26M7cjKWZg785lllwpA=="; }; }; - "@types/responselike-1.0.1" = { + "@types/responselike-1.0.2" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.1.tgz"; - sha512 = "TiGnitEDxj2X0j+98Eqk5lv/Cij8oHd32bU4D/Yw6AOq7vvTk0gSD2GPj0G/HkvhMoVsdlhYF4yqqlyPBTM6Sg=="; + url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.2.tgz"; + sha512 = "/4YQT5Kp6HxUDb4yhRkm0bJ7TbjvTddqX7PZ5hz6qV3pxSo72f/6YPRo+Mu2DU307tm9IioO69l7uAwn5XNcFA=="; }; }; "@types/rimraf-2.0.5" = { @@ -1696,22 +1696,22 @@ let sha512 = "YyP+VfeaqAyFmXoTh3HChxOQMyjByRMsHU7kc5KOJkSlXudhMhQIALbYV7rHh/l8d2lX3VUQzprrcAgWdRuU8g=="; }; }; - "@types/source-list-map-0.1.3" = { + "@types/source-list-map-0.1.4" = { name = "_at_types_slash_source-list-map"; packageName = "@types/source-list-map"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.3.tgz"; - sha512 = "I9R/7fUjzUOyDy6AFkehCK711wWoAXEaBi80AfjZt1lIkbe6AcXKd3ckQc3liMvQExWvfOeh/8CtKzrfUFN5gA=="; + url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.4.tgz"; + sha512 = "Kdfm7Sk5VX8dFW7Vbp18+fmAatBewzBILa1raHYxrGEFXT0jNl9x3LWfuW7bTbjEKFNey9Dfkj/UzT6z/NvRlg=="; }; }; - "@types/tapable-1.0.9" = { + "@types/tapable-1.0.10" = { name = "_at_types_slash_tapable"; packageName = "@types/tapable"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.9.tgz"; - sha512 = "fOHIwZua0sRltqWzODGUM6b4ffZrf/vzGUmNXdR+4DzuJP42PMbM5dLKcdzlYvv8bMJ3GALOzkk1q7cDm2zPyA=="; + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.10.tgz"; + sha512 = "q8F20SdXG5fdVJQ5yxsVlH+f+oekP42QeHv4s5KlrxTMT0eopXn7ol1rhxMcksf8ph7XNv811iVDE2hOpUvEPg=="; }; }; "@types/tmp-0.0.33" = { @@ -1723,31 +1723,31 @@ let sha512 = "gVC1InwyVrO326wbBZw+AO3u2vRXz/iRWq9jYhpG4W8LXyIgDv3ZmcLQ5Q4Gs+gFMyqx+viFoFT+l3p61QFCmQ=="; }; }; - "@types/uglify-js-3.17.2" = { + "@types/uglify-js-3.17.3" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.17.2"; + version = "3.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.2.tgz"; - sha512 = "9SjrHO54LINgC/6Ehr81NjAxAYvwEZqjUHLjJYvC4Nmr9jbLQCIZbWSvl4vXQkkmR1UAuaKDycau3O1kWGFyXQ=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.3.tgz"; + sha512 = "ToldSfJ6wxO21cakcz63oFD1GjqQbKzhZCD57eH7zWuYT5UEZvfUoqvrjX5d+jB9g4a/sFO0n6QSVzzn5sMsjg=="; }; }; - "@types/webpack-4.41.34" = { + "@types/webpack-4.41.35" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.34"; + version = "4.41.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.34.tgz"; - sha512 = "CN2aOGrR3zbMc2v+cKqzaClYP1ldkpPOgtdNvgX+RmlWCSWxHxpzz6WSCVQZRkF8D60ROlkRzAoEpgjWQ+bd2g=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.35.tgz"; + sha512 = "XRC6HLGHtNfN8/xWeu1YUQV1GSE+28q8lSqvcJ+0xt/zW9Wmn4j9pCSvaXPyRlCKrl5OuqECQNEJUy2vo8oWqg=="; }; }; - "@types/webpack-sources-3.2.1" = { + "@types/webpack-sources-3.2.2" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.1.tgz"; - sha512 = "iLC3Fsx62ejm3ST3PQ8vBMC54Rb3EoCprZjeJGI5q+9QjfDLGt9jeg/k245qz1G9AQnORGk0vqPicJFPT1QODQ=="; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.2.tgz"; + sha512 = "acCzhuVe+UJy8abiSFQWXELhhNMZjQjQKpLNEi1pKGgKXZj0ul614ATcx4kkhunPost6Xw+aCq8y8cn1/WwAiA=="; }; }; "@webassemblyjs/ast-1.9.0" = { @@ -1957,13 +1957,13 @@ let sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; }; }; - "acorn-8.10.0" = { + "acorn-8.11.0" = { name = "acorn"; packageName = "acorn"; - version = "8.10.0"; + version = "8.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz"; - sha512 = "F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.11.0.tgz"; + sha512 = "hNiSyky+cuYVALBrsjB7f9gMN9P4u09JyAiMNMLaVfsmkDJuH84M1T/0pfDX/OJfGWcobd2A7ecXYzygn8wibA=="; }; }; "address-1.0.3" = { @@ -2875,13 +2875,13 @@ let sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; }; }; - "browserify-sign-4.2.1" = { + "browserify-sign-4.2.2" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz"; - sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz"; + sha512 = "1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg=="; }; }; "browserify-zlib-0.2.0" = { @@ -2965,13 +2965,13 @@ let sha512 = "9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ=="; }; }; - "bufferutil-4.0.7" = { + "bufferutil-4.0.8" = { name = "bufferutil"; packageName = "bufferutil"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz"; - sha512 = "kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw=="; + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz"; + sha512 = "4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw=="; }; }; "builtin-status-codes-3.0.0" = { @@ -3091,13 +3091,13 @@ let sha512 = "v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg=="; }; }; - "call-bind-1.0.2" = { + "call-bind-1.0.5" = { name = "call-bind"; packageName = "call-bind"; - version = "1.0.2"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz"; + sha512 = "C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ=="; }; }; "call-me-maybe-1.0.2" = { @@ -3190,13 +3190,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001546" = { + "caniuse-lite-1.0.30001554" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001546"; + version = "1.0.30001554"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz"; - sha512 = "zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001554.tgz"; + sha512 = "A2E3U//MBwbJVzebddm1YfNp7Nud5Ip+IPn4BozBmn4KqVX7AvluoIDFWjsv5OkGnKUXQVmMSoMKLa3ScCblcQ=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -3478,6 +3478,15 @@ let sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; }; + "cliui-8.0.1" = { + name = "cliui"; + packageName = "cliui"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; + }; + }; "clone-1.0.4" = { name = "clone"; packageName = "clone"; @@ -3937,13 +3946,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.33.0" = { + "core-js-compat-3.33.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.33.0"; + version = "3.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.0.tgz"; - sha512 = "0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.1.tgz"; + sha512 = "6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ=="; }; }; "core-util-is-1.0.2" = { @@ -4018,6 +4027,15 @@ let sha512 = "2qCRJwBmPlRQXzd50k9gt9PaItultOP8lj/cKSH2Eai9aeBuNqAnDuyolAm9TGn6Pw/4BgbxtPJLU1S+tQ4WMQ=="; }; }; + "cross-fetch-3.1.8" = { + name = "cross-fetch"; + packageName = "cross-fetch"; + version = "3.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz"; + sha512 = "cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg=="; + }; + }; "cross-spawn-5.0.1" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -4414,13 +4432,13 @@ let sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; - "define-data-property-1.1.0" = { + "define-data-property-1.1.1" = { name = "define-data-property"; packageName = "define-data-property"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz"; - sha512 = "UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g=="; + url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz"; + sha512 = "E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ=="; }; }; "define-properties-1.2.1" = { @@ -4792,13 +4810,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.542" = { + "electron-to-chromium-1.4.567" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.542"; + version = "1.4.567"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.542.tgz"; - sha512 = "6+cpa00G09N3sfh2joln4VUXHquWrOFx3FLZqiVQvl45+zS9DskDBTPvob+BhvFRmTBkyDSk0vvLMMRo/qc6mQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.567.tgz"; + sha512 = "8KR114CAYQ4/r5EIEsOmOMqQ9j0MRbJZR3aXD/KFA8RuKzyoUB4XrUCg+l8RUGqTVQgKNIgTpjaG8YHRPAbX2w=="; }; }; "elliptic-6.5.4" = { @@ -4981,6 +4999,15 @@ let sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; + "encoding-0.1.13" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; + sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; + }; + }; "end-of-stream-1.4.4" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -5044,13 +5071,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.22.2" = { + "es-abstract-1.22.3" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz"; - sha512 = "YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz"; + sha512 = "eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -5062,13 +5089,13 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; - "es-set-tostringtag-2.0.1" = { + "es-set-tostringtag-2.0.2" = { name = "es-set-tostringtag"; packageName = "es-set-tostringtag"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"; - sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="; + url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz"; + sha512 = "BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q=="; }; }; "es-to-primitive-1.2.1" = { @@ -5422,6 +5449,15 @@ let sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; + "extract-files-9.0.0" = { + name = "extract-files"; + packageName = "extract-files"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-files/-/extract-files-9.0.0.tgz"; + sha512 = "CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ=="; + }; + }; "extsprintf-1.3.0" = { name = "extsprintf"; packageName = "extsprintf"; @@ -5818,6 +5854,15 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; + "form-data-3.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"; + sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; + }; + }; "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; @@ -5827,13 +5872,13 @@ let sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; - "fraction.js-4.3.6" = { + "fraction.js-4.3.7" = { name = "fraction.js"; packageName = "fraction.js"; - version = "4.3.6"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.6.tgz"; - sha512 = "n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg=="; + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz"; + sha512 = "ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew=="; }; }; "fragment-cache-0.2.1" = { @@ -5890,15 +5935,6 @@ let sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="; }; }; - "fs-extra-5.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz"; - sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ=="; - }; - }; "fs-extra-6.0.1" = { name = "fs-extra"; packageName = "fs-extra"; @@ -6025,13 +6061,13 @@ let sha512 = "5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="; }; }; - "function-bind-1.1.1" = { + "function-bind-1.1.2" = { name = "function-bind"; packageName = "function-bind"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"; + sha512 = "7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="; }; }; "function.prototype.name-1.1.6" = { @@ -6079,13 +6115,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.2.1" = { + "get-intrinsic-1.2.2" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz"; - sha512 = "2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz"; + sha512 = "0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -6367,6 +6403,24 @@ let sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; }; }; + "graphql-16.8.1" = { + name = "graphql"; + packageName = "graphql"; + version = "16.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz"; + sha512 = "59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw=="; + }; + }; + "graphql-request-3.7.0" = { + name = "graphql-request"; + packageName = "graphql-request"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-request/-/graphql-request-3.7.0.tgz"; + sha512 = "dw5PxHCgBneN2DDNqpWu8QkbbJ07oOziy8z+bK/TAXufsOLaETuVO4GkXrbs0WjhdKhBMN3BkpN/RIvUHkmNUQ=="; + }; + }; "gray-matter-4.0.3" = { name = "gray-matter"; packageName = "gray-matter"; @@ -6457,13 +6511,13 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-property-descriptors-1.0.0" = { + "has-property-descriptors-1.0.1" = { name = "has-property-descriptors"; packageName = "has-property-descriptors"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz"; + sha512 = "VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg=="; }; }; "has-proto-1.0.1" = { @@ -6565,6 +6619,15 @@ let sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; + "hasown-2.0.0" = { + name = "hasown"; + packageName = "hasown"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz"; + sha512 = "vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="; + }; + }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -7069,13 +7132,13 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "internal-slot-1.0.5" = { + "internal-slot-1.0.6" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"; - sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz"; + sha512 = "Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg=="; }; }; "invert-kv-1.0.0" = { @@ -7150,13 +7213,13 @@ let sha512 = "e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="; }; }; - "is-accessor-descriptor-1.0.0" = { + "is-accessor-descriptor-1.0.1" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz"; + sha512 = "YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA=="; }; }; "is-arguments-1.1.1" = { @@ -7258,13 +7321,13 @@ let sha512 = "H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA=="; }; }; - "is-core-module-2.13.0" = { + "is-core-module-2.13.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.13.0"; + version = "2.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz"; - sha512 = "Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz"; + sha512 = "hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw=="; }; }; "is-data-descriptor-0.1.4" = { @@ -7276,13 +7339,13 @@ let sha512 = "+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg=="; }; }; - "is-data-descriptor-1.0.0" = { + "is-data-descriptor-1.0.1" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz"; + sha512 = "bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw=="; }; }; "is-date-object-1.0.5" = { @@ -8023,13 +8086,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.5.3" = { + "keyv-4.5.4" = { name = "keyv"; packageName = "keyv"; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz"; - sha512 = "QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz"; + sha512 = "oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw=="; }; }; "killable-1.0.1" = { @@ -9031,6 +9094,15 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; + "mkdirp-3.0.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz"; + sha512 = "+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="; + }; + }; "moment-2.29.4" = { name = "moment"; packageName = "moment"; @@ -9256,6 +9328,15 @@ let sha512 = "DWTRQR8b54rvschcZRREdsz7K84lnS8A6YJu8du3QLQ8f204SJbyTaA6NzYYbfUG97OTRKRv/0KZl82cTfpLhA=="; }; }; + "node-fetch-2.7.0" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"; + sha512 = "c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="; + }; + }; "node-forge-0.10.0" = { name = "node-forge"; packageName = "node-forge"; @@ -9472,13 +9553,13 @@ let sha512 = "79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="; }; }; - "object-inspect-1.12.3" = { + "object-inspect-1.13.1" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.12.3"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"; - sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz"; + sha512 = "5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="; }; }; "object-is-1.1.5" = { @@ -11434,13 +11515,13 @@ let sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; - "resolve-1.22.6" = { + "resolve-1.22.8" = { name = "resolve"; packageName = "resolve"; - version = "1.22.6"; + version = "1.22.8"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz"; - sha512 = "njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz"; + sha512 = "oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw=="; }; }; "resolve-alpn-1.2.1" = { @@ -11740,13 +11821,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.68.0" = { + "sass-1.69.5" = { name = "sass"; packageName = "sass"; - version = "1.68.0"; + version = "1.69.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz"; - sha512 = "Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz"; + sha512 = "qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ=="; }; }; "sax-1.2.4" = { @@ -11965,6 +12046,15 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; + "set-function-length-1.1.1" = { + name = "set-function-length"; + packageName = "set-function-length"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz"; + sha512 = "VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ=="; + }; + }; "set-function-name-2.0.1" = { name = "set-function-name"; packageName = "set-function-name"; @@ -12370,13 +12460,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.15" = { + "spdx-license-ids-3.0.16" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.15"; + version = "3.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz"; - sha512 = "lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz"; + sha512 = "eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="; }; }; "spdy-4.0.2" = { @@ -12424,13 +12514,13 @@ let sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; - "sshpk-1.17.0" = { + "sshpk-1.18.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; - sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz"; + sha512 = "2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ=="; }; }; "ssri-10.0.5" = { @@ -13018,13 +13108,13 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.21.0" = { + "terser-5.22.0" = { name = "terser"; packageName = "terser"; - version = "5.21.0"; + version = "5.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz"; - sha512 = "WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.22.0.tgz"; + sha512 = "hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw=="; }; }; "terser-5.3.8" = { @@ -13252,6 +13342,15 @@ let sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; + "tr46-0.0.3" = { + name = "tr46"; + packageName = "tr46"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; + sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; + }; + }; "traverse-0.3.9" = { name = "traverse"; packageName = "traverse"; @@ -13504,6 +13603,15 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; + "undici-types-5.26.5" = { + name = "undici-types"; + packageName = "undici-types"; + version = "5.26.5"; + src = fetchurl { + url = "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"; + sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="; + }; + }; "unicode-canonical-property-names-ecmascript-2.0.0" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; @@ -13882,13 +13990,13 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vite-4.4.11" = { + "vite-4.5.0" = { name = "vite"; packageName = "vite"; - version = "4.4.11"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz"; - sha512 = "ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A=="; + url = "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz"; + sha512 = "ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw=="; }; }; "vm-browserify-1.1.2" = { @@ -13999,6 +14107,15 @@ let sha512 = "weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ=="; }; }; + "webidl-conversions-3.0.1" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; + }; + }; "webpack-4.44.2" = { name = "webpack"; packageName = "webpack"; @@ -14098,6 +14215,15 @@ let sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="; }; }; + "whatwg-url-5.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; + sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; + }; + }; "which-1.3.1" = { name = "which"; packageName = "which"; @@ -14161,13 +14287,13 @@ let sha512 = "iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="; }; }; - "which-typed-array-1.1.11" = { + "which-typed-array-1.1.13" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.11"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz"; - sha512 = "qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz"; + sha512 = "P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow=="; }; }; "winston-2.1.1" = { @@ -14359,6 +14485,15 @@ let sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; }; + "wrap-ansi-7.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + }; "wrap-ansi-8.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -14485,6 +14620,15 @@ let sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; }; }; + "y18n-5.0.8" = { + name = "y18n"; + packageName = "y18n"; + version = "5.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; + }; + }; "yaeti-0.0.6" = { name = "yaeti"; packageName = "yaeti"; @@ -14548,6 +14692,15 @@ let sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; }; }; + "yargs-17.7.2" = { + name = "yargs"; + packageName = "yargs"; + version = "17.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"; + sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="; + }; + }; "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; @@ -14575,6 +14728,15 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; + "yargs-parser-21.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "21.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"; + sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -14741,7 +14903,7 @@ in }) sources."serve-static-1.13.2" sources."setprototypeof-1.1.1" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."sums-0.2.4" @@ -14980,7 +15142,7 @@ in ]; }) sources."split-1.0.1" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."stealthy-require-1.1.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -15064,7 +15226,7 @@ in sources."body-parser-1.20.1" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."bytes-3.1.2" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -15072,7 +15234,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."chalk-3.0.0" sources."chokidar-3.5.3" sources."clone-response-1.0.3" @@ -15089,6 +15251,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" + sources."define-data-property-1.1.1" sources."depd-2.0.0" sources."destroy-1.2.0" sources."duplexer3-0.1.5" @@ -15109,16 +15272,18 @@ in sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" + sources."gopd-1.0.1" sources."got-9.6.0" - sources."has-1.0.4" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" @@ -15151,7 +15316,7 @@ in sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-7.4.2" @@ -15192,6 +15357,7 @@ in ]; }) sources."serve-static-1.15.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -15437,7 +15603,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."chokidar-3.4.2" sources."commander-2.20.3" sources."concat-map-0.0.1" @@ -15588,10 +15754,10 @@ in sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.2" - sources."@types/responselike-1.0.1" + sources."@types/node-20.8.9" + sources."@types/responselike-1.0.2" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.4" sources."caw-2.0.1" @@ -15619,7 +15785,7 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" @@ -15640,6 +15806,7 @@ in sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" + sources."undici-types-5.26.5" sources."universalify-0.1.2" sources."url-to-options-1.0.1" sources."which-2.0.2" @@ -15660,15 +15827,16 @@ in elm-verify-examples = nodeEnv.buildNodePackage { name = "elm-verify-examples"; packageName = "elm-verify-examples"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.2.0.tgz"; - sha512 = "YhBRf4S4WxvjzyhHHMmXc2CHVtwwHqXU4h8jxUwcZ+elMz3GiGB4nYRCdZIWrKE1bw5W0TDRcQ4gsc9SgpSxbw=="; + url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.3.0.tgz"; + sha512 = "6TG+4L/yEamiHpxVQUJPRgHoeEOmk5LhWuVRECMHTKPpvuM2BCYMGwCMUGJ0Wh64RW8oERIdnicsvUDlvDwiTg=="; }; dependencies = [ + sources."@isaacs/cliui-8.0.2" sources."ajv-6.12.6" - sources."ansi-regex-4.1.1" - sources."ansi-styles-3.2.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."asn1-0.2.6" sources."assert-plus-1.0.0" @@ -15684,15 +15852,21 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffers-0.1.1" - sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" - sources."chalk-2.4.2" + sources."chalk-4.1.2" sources."chokidar-3.2.1" sources."chownr-1.1.4" - sources."cliui-5.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + (sources."cliui-8.0.1" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."wrap-ansi-7.0.0" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -15702,18 +15876,31 @@ in ]; }) sources."dashdash-1.14.1" - sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" + sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" (sources."elm-test-0.19.1" // { dependencies = [ + sources."ansi-styles-3.2.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."fs-extra-8.1.0" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."has-flag-3.0.0" + (sources."supports-color-7.1.0" // { + dependencies = [ + sources."has-flag-4.0.0" + ]; + }) ]; }) sources."elmi-to-json-1.2.0" - sources."emoji-regex-7.0.3" + sources."emoji-regex-9.2.2" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -15726,11 +15913,16 @@ in ]; }) sources."find-parent-dir-0.3.1" - sources."find-up-3.0.0" sources."firstline-2.0.2" + sources."foreground-child-3.1.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-5.0.0" + (sources."fs-extra-11.1.1" // { + dependencies = [ + sources."jsonfile-6.1.0" + sources."universalify-2.0.0" + ]; + }) sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" @@ -15741,33 +15933,34 @@ in sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."is-typedarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" + sources."jackspeak-2.3.6" sources."jsbn-0.1.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsprim-1.4.2" - sources."locate-path-3.0.0" sources."lodash-4.17.15" + sources."lru-cache-10.0.1" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.6" + sources."mkdirp-3.0.1" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -15781,12 +15974,13 @@ in sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" + (sources."path-scurry-1.10.1" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."psl-1.9.0" @@ -15801,21 +15995,42 @@ in ]; }) sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."rimraf-2.7.1" + (sources."rimraf-5.0.5" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."glob-10.3.10" + sources."minimatch-9.0.3" + sources."minipass-7.0.4" + ]; + }) sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.2" - sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + sources."signal-exit-4.1.0" sources."split-1.0.1" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."stealthy-require-1.1.1" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."supports-color-5.5.0" - sources."tar-4.4.19" + sources."string-width-5.1.2" + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."strip-ansi-6.0.1" + ]; + }) + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" + sources."supports-color-7.2.0" + (sources."tar-4.4.19" // { + dependencies = [ + sources."mkdirp-0.5.6" + ]; + }) (sources."temp-0.9.0" // { dependencies = [ sources."rimraf-2.6.3" @@ -15828,19 +16043,39 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-0.1.2" - sources."unzip-stream-0.3.1" + (sources."unzip-stream-0.3.1" // { + dependencies = [ + sources."mkdirp-0.5.6" + ]; + }) sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-2.0.1" - sources."which-module-2.0.1" - sources."wrap-ansi-5.1.0" + (sources."wrap-ansi-8.1.0" // { + dependencies = [ + sources."ansi-styles-6.2.1" + ]; + }) + (sources."wrap-ansi-cjs-7.0.0" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."wrappy-1.0.2" sources."xmlbuilder-13.0.2" - sources."y18n-4.0.3" + sources."y18n-5.0.8" sources."yallist-3.1.1" - sources."yargs-13.3.2" - sources."yargs-parser-13.1.2" + (sources."yargs-17.7.2" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) + sources."yargs-parser-21.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -15907,7 +16142,7 @@ in dependencies = [ sources."@babel/cli-7.12.10" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.22.20" + sources."@babel/compat-data-7.23.2" sources."@babel/core-7.12.10" sources."@babel/generator-7.23.0" sources."@babel/helper-annotate-as-pure-7.22.5" @@ -15944,7 +16179,7 @@ in sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/helper-validator-option-7.22.15" sources."@babel/helper-wrap-function-7.22.20" - sources."@babel/helpers-7.23.1" + sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" sources."@babel/parser-7.23.0" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -16010,7 +16245,7 @@ in sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.12.5" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.0" + sources."@babel/traverse-7.23.2" sources."@babel/types-7.23.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -16021,30 +16256,30 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" - sources."@types/http-proxy-1.17.12" - sources."@types/json-schema-7.0.13" + sources."@types/http-proxy-1.17.13" + sources."@types/json-schema-7.0.14" sources."@types/minimatch-5.1.2" - sources."@types/node-20.8.2" - sources."@types/parse-json-4.0.0" - sources."@types/q-1.5.6" - sources."@types/source-list-map-0.1.3" - sources."@types/tapable-1.0.9" - (sources."@types/uglify-js-3.17.2" // { + sources."@types/node-20.8.9" + sources."@types/parse-json-4.0.1" + sources."@types/q-1.5.7" + sources."@types/source-list-map-0.1.4" + sources."@types/tapable-1.0.10" + (sources."@types/uglify-js-3.17.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.34" // { + (sources."@types/webpack-4.41.35" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-3.2.1" // { + (sources."@types/webpack-sources-3.2.2" // { dependencies = [ sources."source-map-0.7.4" ]; @@ -16176,7 +16411,7 @@ in sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { + (sources."browserify-sign-4.2.2" // { dependencies = [ sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" @@ -16192,7 +16427,7 @@ in sources."bytes-3.0.0" sources."cacache-12.0.4" sources."cache-base-1.0.1" - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."call-me-maybe-1.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -16200,7 +16435,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001546" + sources."caniuse-lite-1.0.30001554" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -16299,7 +16534,7 @@ in ]; }) sources."core-js-2.6.12" - sources."core-js-compat-3.33.0" + sources."core-js-compat-3.33.1" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -16379,7 +16614,7 @@ in sources."decode-uri-component-0.2.2" sources."deep-equal-0.2.2" sources."default-gateway-4.2.0" - sources."define-data-property-1.1.0" + sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."define-property-2.0.2" (sources."del-4.1.1" // { @@ -16424,7 +16659,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.542" + sources."electron-to-chromium-1.4.567" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -16462,9 +16697,9 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.22.2" + sources."es-abstract-1.22.3" sources."es-array-method-boxes-properly-1.0.0" - sources."es-set-tostringtag-2.0.1" + sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -16598,7 +16833,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.2.0" - sources."fraction.js-4.3.6" + sources."fraction.js-4.3.7" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" @@ -16607,12 +16842,12 @@ in sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" + sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.1" + sources."get-intrinsic-1.2.2" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" @@ -16652,7 +16887,7 @@ in sources."has-1.0.4" sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" @@ -16674,6 +16909,7 @@ in ]; }) sources."hash.js-1.1.7" + sources."hasown-2.0.0" sources."he-1.2.0" sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" @@ -16732,13 +16968,13 @@ in ]; }) sources."internal-ip-4.3.0" - sources."internal-slot-1.0.5" + sources."internal-slot-1.0.6" sources."invert-kv-1.0.0" sources."ip-1.1.8" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" - sources."is-accessor-descriptor-1.0.0" + sources."is-accessor-descriptor-1.0.1" sources."is-arguments-1.1.1" sources."is-array-buffer-3.0.2" sources."is-arrayish-0.2.1" @@ -16748,8 +16984,8 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.7" sources."is-color-stop-1.1.0" - sources."is-core-module-2.13.0" - sources."is-data-descriptor-1.0.0" + sources."is-core-module-2.13.1" + sources."is-data-descriptor-1.0.1" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" @@ -16918,7 +17154,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -17376,7 +17612,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.22.6" + sources."resolve-1.22.8" sources."resolve-cwd-2.0.0" sources."resolve-dir-1.0.1" sources."resolve-from-3.0.0" @@ -17434,6 +17670,7 @@ in }) sources."serve-static-1.15.0" sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" (sources."set-value-2.0.1" // { dependencies = [ @@ -17510,7 +17747,7 @@ in sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" + sources."spdx-license-ids-3.0.16" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -17520,7 +17757,7 @@ in sources."split-1.0.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" + sources."sshpk-1.18.0" sources."ssri-6.0.2" sources."stable-0.1.8" sources."stack-trace-0.0.10" @@ -17677,6 +17914,7 @@ in ]; }) sources."unbox-primitive-1.0.2" + sources."undici-types-5.26.5" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.1.0" @@ -17846,7 +18084,7 @@ in sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-module-1.0.0" - sources."which-typed-array-1.1.11" + sources."which-typed-array-1.1.13" (sources."winston-2.1.1" // { dependencies = [ sources."async-1.0.0" @@ -17987,10 +18225,10 @@ in elm-pages = nodeEnv.buildNodePackage { name = "elm-pages"; packageName = "elm-pages"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/elm-pages/-/elm-pages-3.0.8.tgz"; - sha512 = "ls6ZI5CMlFji/P2yg1A+Krv6A1zjm4Q1+gpkMjZsAcmg2gABjN6R4ZATbD6/+hosSaAvsnZ1rRUTCPRsncYg+w=="; + url = "https://registry.npmjs.org/elm-pages/-/elm-pages-3.0.9.tgz"; + sha512 = "EFwDCYHm3rwCiwXwfSUKeDDcIYrQ61deChDk7ruXPN4y0PkIINIKbljLu3uOnKSYhzc5CGSc7avwiAlkxXnJsA=="; }; dependencies = [ sources."@adobe/css-tools-4.2.0" @@ -18022,7 +18260,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" + sources."@jridgewell/trace-mapping-0.3.20" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -18039,14 +18277,14 @@ in sources."@types/debug-0.0.30" sources."@types/get-port-3.2.0" sources."@types/glob-5.0.38" - sources."@types/lodash-4.14.199" + sources."@types/lodash-4.14.200" sources."@types/minimatch-5.1.2" sources."@types/mkdirp-0.5.2" sources."@types/node-8.10.66" sources."@types/rimraf-2.0.5" sources."@types/tmp-0.0.33" sources."accepts-1.3.8" - sources."acorn-8.10.0" + sources."acorn-8.11.0" (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.4" @@ -18074,7 +18312,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" + sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."bytes-3.1.2" (sources."cacache-17.1.4" // { @@ -18091,7 +18329,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.2" + sources."call-bind-1.0.5" sources."chalk-3.0.0" sources."chokidar-3.5.3" sources."chownr-2.0.0" @@ -18117,6 +18355,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" + sources."define-data-property-1.1.1" sources."depd-2.0.0" sources."destroy-1.2.0" sources."detect-libc-1.0.3" @@ -18177,20 +18416,22 @@ in sources."fs-monkey-1.0.5" sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" + sources."function-bind-1.1.2" + sources."get-intrinsic-1.2.2" sources."get-port-3.2.0" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globby-13.1.4" + sources."gopd-1.0.1" sources."got-9.6.0" sources."graceful-fs-4.2.11" sources."gray-matter-4.0.3" - sources."has-1.0.4" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" + sources."hasown-2.0.0" sources."http-cache-semantics-4.1.1" (sources."http-errors-2.0.0" // { dependencies = [ @@ -18323,7 +18564,7 @@ in sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."object-inspect-1.12.3" + sources."object-inspect-1.13.1" sources."on-finished-2.3.0" sources."once-1.4.0" sources."open-7.4.2" @@ -18369,7 +18610,7 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sass-1.68.0" + sources."sass-1.69.5" sources."sax-1.3.0" sources."section-matter-1.0.0" sources."semver-6.3.1" @@ -18389,6 +18630,7 @@ in ]; }) sources."serve-static-1.15.0" + sources."set-function-length-1.1.1" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -18450,7 +18692,7 @@ in sources."mkdirp-1.0.4" ]; }) - (sources."terser-5.21.0" // { + (sources."terser-5.22.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -18462,6 +18704,7 @@ in sources."tslib-1.14.1" sources."type-fest-0.21.3" sources."type-is-1.6.18" + sources."undici-types-5.26.5" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" sources."universalify-2.0.0" @@ -18470,7 +18713,7 @@ in sources."utf-8-validate-5.0.10" sources."utils-merge-1.0.1" sources."vary-1.1.2" - (sources."vite-4.4.11" // { + (sources."vite-4.5.0" // { dependencies = [ sources."@esbuild/android-arm-0.18.20" sources."@esbuild/android-arm64-0.18.20" @@ -18494,7 +18737,7 @@ in sources."@esbuild/win32-arm64-0.18.20" sources."@esbuild/win32-ia32-0.18.20" sources."@esbuild/win32-x64-0.18.20" - sources."@types/node-20.8.2" + sources."@types/node-20.8.9" sources."esbuild-0.18.20" ]; }) @@ -18544,10 +18787,10 @@ in sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.2" + sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.2" - sources."@types/responselike-1.0.1" + sources."@types/node-20.8.9" + sources."@types/responselike-1.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -18622,7 +18865,7 @@ in sources."jackspeak-2.3.6" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" - sources."keyv-4.5.3" + sources."keyv-4.5.4" sources."kleur-3.0.3" sources."locate-path-5.0.0" sources."log-symbols-4.1.0" @@ -18694,6 +18937,7 @@ in sources."terminal-link-2.1.1" sources."to-regex-range-5.0.1" sources."type-fest-0.21.3" + sources."undici-types-5.26.5" sources."universalify-2.0.0" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" @@ -18752,4 +18996,60 @@ in bypassCache = true; reconstructLock = true; }; + "@dillonkearns/elm-graphql" = nodeEnv.buildNodePackage { + name = "_at_dillonkearns_slash_elm-graphql"; + packageName = "@dillonkearns/elm-graphql"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@dillonkearns/elm-graphql/-/elm-graphql-4.3.1.tgz"; + sha512 = "De5PhJpuv2sqcglfhxLp4iB2Zxha6ejbhvajHeziE8ZZRsVXBcoDdh+aScWOQR0GR/t5cF4iGgNf6a5aPO9faA=="; + }; + dependencies = [ + sources."asynckit-0.4.0" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."cross-fetch-3.1.8" + sources."cross-spawn-5.1.0" + sources."delayed-stream-1.0.0" + sources."encoding-0.1.13" + sources."extract-files-9.0.0" + sources."form-data-3.0.1" + sources."fs.realpath-1.0.0" + sources."glob-7.2.3" + sources."graphql-16.8.1" + sources."graphql-request-3.7.0" + sources."iconv-lite-0.6.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."isexe-2.0.0" + sources."lru-cache-4.1.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."node-fetch-2.7.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."pseudomap-1.0.2" + sources."safer-buffer-2.1.2" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."tr46-0.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."yallist-2.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "[![Build Status](https://github.com/dillonkearns/elm-graphql/workflows/CI/badge.svg)](https://github.com/dillonkearns/elm-graphql/actions?query=branch%3Amaster) [![Elm package](https://img.shields.io/elm-package/v/dillonkearns/elm-graphql.svg)](https://pa"; + homepage = "https://github.com/dillonkearns/elm-graphql#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix index da582e3ea1925..c18e7bcba0068 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.1.0"; + "version" = "23.1.1"; "hashes" = { "aarch64-linux" = { - sha256 = "0n0zz86h7jsqgdiyj6vj7qw57ny40jpmfvylyxq70riy86a4zp67"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-linux-aarch64.tar.gz"; + sha256 = "1jv9icfh3w8gdch0h3l8mm6q96z3lv89s8zv788wvkkb87zv8w8m"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "0nnv255f2bqc4l88iw48f71874ryjn16bb8qn1yk7daj1pck80vj"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-linux-amd64.tar.gz"; + sha256 = "108qdf0ss9l0x6k983v9yg6m5i7aqwfdxjqa5fx62xj027wi5pqk"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "16kp66l0176sbd8jzvq3y3z7d9zvkqzdaw8vrvnk2qkipa136n0k"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-macos-amd64.tar.gz"; + sha256 = "019s7vlr8a6x60g0yh36pdf2vvan1v2wmq8z4xrcgpl96zpwwn5h"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "17clq7n1n5ww22rh9gp5h9ljhjvggcik8amhd70pwl4cjgv9mhsv"; - url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.0/graalpy-community-23.1.0-macos-aarch64.tar.gz"; + sha256 = "0qbanbivkj62cjg2ll4ia23c435i1cvwy7pq19dvj8s204mpl8l2"; + url = "https://github.com/oracle/graalpython/releases/download/graal-23.1.1/graalpy-community-23.1.1-macos-aarch64.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix index 377a05426c9b5..e9454dca7250c 100644 --- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "21.0.0"; + "version" = "21.0.1"; "hashes" = { "aarch64-linux" = { - sha256 = "199h3d6zayw28xlyggldap6nafh5fnpfbshs0rsf94dfgv7r4kmv"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_linux-aarch64_bin.tar.gz"; + sha256 = "0vb1bdbn4lqig4jihynacbyrj551m1pcmj6qh86kdwx0kn9400yy"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-aarch64_bin.tar.gz"; }; "x86_64-linux" = { - sha256 = "06dkb1yimk5q3yzjk6kjsrs2pkbjxgz9jr5vj6wfb2y5ri0jjhkc"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_linux-x64_bin.tar.gz"; + sha256 = "1gvkxqmbsh7pklh9bkhndh08nnjcmgq0xpzc96dgacqnlr4fx0sj"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_linux-x64_bin.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1qbz3xfxj7nwb01cy99hd22k3pim8j43blcdcys48l8xcb234nlk"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_macos-x64_bin.tar.gz"; + sha256 = "0sks663ldc0m3rhc882mzn44kipzbjw7325dhkpwy874p47j9zns"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-x64_bin.tar.gz"; }; "aarch64-darwin" = { - sha256 = "0dqgsp0bhqvv07b9kb0cxqm5cw47kapzbfbw13570ydgc0gfg3f5"; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.0/graalvm-community-jdk-21.0.0_macos-aarch64_bin.tar.gz"; + sha256 = "0i7zzq1czgc4lk1z278zp4cml4kdryafhrma5rqaja75933jpi2h"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.1/graalvm-community-jdk-21.0.1_macos-aarch64_bin.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix index addd6749e7d64..51e40dd590d58 100644 --- a/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix @@ -1,22 +1,22 @@ # Generated by update.sh script { - "version" = "23.1.0"; + "version" = "23.1.1"; "hashes" = { "aarch64-linux" = { - sha256 = "05q0xqm7qa9mw7v4kwyhbqsx27x19msf9rbbzq60dinp5724r721"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-linux-aarch64.tar.gz"; + sha256 = "0d8lxbfafgyirgs06bmfbmww61h8w3sr95z7y4x0ykfs7mghsnpd"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.1/truffleruby-community-23.1.1-linux-aarch64.tar.gz"; }; "x86_64-linux" = { - sha256 = "0bfcqcax9424vsdqzr18mxkhi2wpzc4xaji98anm8mcjkyl1r89q"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-linux-amd64.tar.gz"; + sha256 = "1304yvllffnhwmpbcdsgcwkhc5w5w7r1rhxdwb709if8kglx793y"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.1/truffleruby-community-23.1.1-linux-amd64.tar.gz"; }; "x86_64-darwin" = { - sha256 = "1yj9nk670hgh9104s1j207mqldagfvvvscj4bfgf3jlbcq5hvlhn"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-macos-amd64.tar.gz"; + sha256 = "09lfski3dj3zzp7cdfrndjafx48ln0wdgb7cs3an3krh6xjchi8l"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.1/truffleruby-community-23.1.1-macos-amd64.tar.gz"; }; "aarch64-darwin" = { - sha256 = "1nmqyn4vzwjsvq7dly8qn1xx973jg027xfbs988vf3nljnhkpq5l"; - url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.0/truffleruby-community-23.1.0-macos-aarch64.tar.gz"; + sha256 = "152mrz5hfnmsf5k1gd6rsb6yacy3zyjm2jl8q3zjl18n784np57b"; + url = "https://github.com/oracle/truffleruby/releases/download/graal-23.1.1/truffleruby-community-23.1.1-macos-aarch64.tar.gz"; }; }; } diff --git a/pkgs/development/compilers/sbcl/2.x.nix b/pkgs/development/compilers/sbcl/2.x.nix index a4de7b8b876fa..8156c48256b03 100644 --- a/pkgs/development/compilers/sbcl/2.x.nix +++ b/pkgs/development/compilers/sbcl/2.x.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap, zstd -, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" +{ lib, stdenv, callPackage, clisp, fetchurl, fetchpatch, writeText, zstd , threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system) , linkableRuntime ? stdenv.hostPlatform.isx86 , disableImmobileSpace ? false @@ -26,8 +25,48 @@ let sha256 = "sha256-fSiakSMgIgKL8BKJAMMr8A5MVDDDLyivBZTIpZKphlQ="; }; }; + # Collection of pre-built SBCL binaries for platforms that need them for + # bootstrapping. Ideally these are to be avoided. If CLISP (or any other + # non-binary-distributed Lisp) can run on any of these systems, that entry + # should be removed from this list. + bootstrapBinaries = rec { + # This build segfaults using CLISP. + x86_64-darwin = { + version = "2.2.9"; + system = "x86-64-darwin"; + sha256 = "sha256-b1BLkoLIOELAYBYA9eBmMgm1OxMxJewzNP96C9ADfKY="; + }; + i686-linux = { + version = "1.2.7"; + system = "x86-linux"; + sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j"; + }; + armv7l-linux = { + version = "1.2.14"; + system = "armhf-linux"; + sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; + }; + armv6l-linux = armv7l-linux; + x86_64-freebsd = { + version = "1.2.7"; + system = "x86-64-freebsd"; + sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; + }; + x86_64-solaris = { + version = "1.2.7"; + system = "x86-64-solaris"; + sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0"; + }; + }; + sbclBootstrap = callPackage ./bootstrap.nix { + cfg = bootstrapBinaries.${stdenv.hostPlatform.system}; + }; + bootstrapLisp = + if (builtins.hasAttr stdenv.hostPlatform.system bootstrapBinaries) + then "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" + else "${clisp}/bin/clisp -E UTF-8 --silent -norc"; -in with versionMap.${version}; +in stdenv.mkDerivation rec { pname = "sbcl"; @@ -35,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - inherit sha256; + inherit (versionMap.${version}) sha256; }; nativeBuildInputs = [ texinfo ]; @@ -108,7 +147,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}" ${ + sh make.sh --prefix=$out --xc-host="${bootstrapLisp}" ${ lib.concatStringsSep " " (builtins.map (x: "--with-${x}") enableFeatures ++ builtins.map (x: "--without-${x}") disableFeatures) @@ -142,5 +181,17 @@ stdenv.mkDerivation rec { } ''); - meta = sbclBootstrap.meta; + meta = with lib; { + description = "Lisp compiler"; + homepage = "https://sbcl.org"; + license = licenses.publicDomain; # and FreeBSD + maintainers = lib.teams.lisp.members; + platforms = attrNames bootstrapBinaries ++ [ + # These aren’t bootstrapped using the binary distribution but compiled + # using a separate (lisp) host + "x86_64-linux" + "aarch64-darwin" + "aarch64-linux" + ]; + }; } diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 05634d0c83f33..e23557c5a62fc 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -1,59 +1,12 @@ -{ lib, stdenv, fetchurl, makeWrapper }: +{ lib, stdenv, fetchurl, makeWrapper, cfg }: -let - options = rec { - aarch64-darwin = { - version = "2.1.2"; - system = "arm64-darwin"; - sha256 = "sha256-H0ALigXcWIypdA+fTf7jERscwbb7QIAfcoxCtGDh0RU="; - }; - x86_64-darwin = { - version = "2.2.9"; - system = "x86-64-darwin"; - sha256 = "sha256-b1BLkoLIOELAYBYA9eBmMgm1OxMxJewzNP96C9ADfKY="; - }; - x86_64-linux = { - version = "1.3.16"; - system = "x86-64-linux"; - sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s"; - }; - i686-linux = { - version = "1.2.7"; - system = "x86-linux"; - sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j"; - }; - aarch64-linux = { - version = "1.3.16"; - system = "arm64-linux"; - sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl"; - }; - armv7l-linux = { - version = "1.2.14"; - system = "armhf-linux"; - sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; - }; - armv6l-linux = armv7l-linux; - x86_64-freebsd = { - version = "1.2.7"; - system = "x86-64-freebsd"; - sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; - }; - x86_64-solaris = { - version = "1.2.7"; - system = "x86-64-solaris"; - sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0"; - }; - }; - cfg = options.${stdenv.hostPlatform.system}; -in -assert builtins.hasAttr stdenv.hostPlatform.system options; stdenv.mkDerivation rec { pname = "sbcl-bootstrap"; - version = cfg.version; + inherit (cfg) version; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/sbcl-${version}-${cfg.system}-binary.tar.bz2"; - sha256 = cfg.sha256; + inherit (cfg) sha256; }; nativeBuildInputs = [ makeWrapper ]; @@ -73,12 +26,4 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; - - meta = with lib; { - description = "Lisp compiler"; - homepage = "http://www.sbcl.org"; - license = licenses.publicDomain; # and FreeBSD - maintainers = lib.teams.lisp.members; - platforms = attrNames options; - }; } diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index 79bf8aeca275e..bb60d6903df12 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 16, 17, 18, 19, 20) +feature_versions = (8, 11, 16, 17, 18, 19, 20, 21) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot") diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index fe0c5792a53d4..5122b6ed72945 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -22,4 +22,7 @@ in jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; }; jre-20 = common { sourcePerArch = sources.jre.openjdk20; }; + + jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; + jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index af9202aa40785..87a00a373916f 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -23,4 +23,7 @@ in jdk-20 = common { sourcePerArch = sources.jdk.openjdk20; }; jre-20 = common { sourcePerArch = sources.jre.openjdk20; }; + + jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; + jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index e4744a7996092..00a0e72997ecc 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -6,10 +6,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "45f56d75da2f55b29e7307cc790958e379abbe6b5f160a3824dc26e320c718e5", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "d5e2235d3707526f7c9ba3f0dc194e60d5dec33eceff2a2dcf9d874464cc0e9e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk16": { @@ -26,10 +26,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "b6edac2fa669876ef16b4895b36b61d01066626e7a69feba2acc19760c8d18cb", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "c2a571a56e5bd3f30956b17b048880078c7801ed9e8754af6d1e38b9176059a9", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -57,19 +57,35 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "68d0f0c468064e944e304cab64fc162335d4d9bc0ddab7e6ff7a395a0bceda74", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_alpine-linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "b03aced4b7a1c49bc00297e35e45480fd03818862b93e17e1551a3b721e89306", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_alpine-linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "77006c0a753808c2a6662007906eb6eb230f2fb6eb9d201a39cc46113e68f82c", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "422f23f5109056cacb9227247bebf8532e2dc3c9d505e71637ba610569d6b3ff", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "cfdf8e07c8eeb087b7a2895b90fc0a19986bcff85006f1e2b708e3964909aa8e", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "6cf2d4925c387c4cdc0bf2e71de3690527141b5244695d0b3109ce83a8512235", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" } } }, @@ -78,20 +94,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "b5d71cdf3032040e7d2a577712bf525e32e87686af3430219308a39878b98851", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "6a3d1759bdf91433411d37ca2ad1505a7f214c1401797834e9884165c2457368", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk17": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "711f837bacf8222dee9e8cd7f39941a4a0acf869243f03e6038ca3ba189f66ca", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "70e5d108f51ae7c7b2435d063652df058723e303a18b4f72f17f75c5320052d3", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -119,19 +135,35 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "0e95fa3719f7989908dfcc77ef701c6fe1111c4195ee3c6858faab5fd37525c5", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_alpine-linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "53b34747a3c042a4cccb2b8b78fba3330b105bc523f0861237baa9143dc39115", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_alpine-linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "2898ea1ddf6f70f09b09cf99d928f6d4c862f78f81104f5dce3e44a832b8444a", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "a8fcc43927664ba191c9a77d1013f1f32fec1acc22fe6f0c29d687221f2cc95d", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "95d8cb8b5375ec00a064ed728eb60d925d44c1a79fe92f6ca7385b5863d4f78c", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "7040d865493f13204194c5a1add63e22516b1fa4481264baa6a5b2614a275a0e", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" } } } @@ -140,36 +172,36 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "7", - "sha256": "0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "8c3146035b99c55ab26a2982f4b9abd2bf600582361cf9c732539f713d271faf", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "armv6l": { - "build": "7", - "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "1", + "sha256": "e83674aee238ebb5f359b9395b3c5e3fad5b645846095494662802d2f0fd01c9", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.20.1_1.tar.gz", + "version": "11.0.20" }, "armv7l": { - "build": "7", - "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "1", + "sha256": "e83674aee238ebb5f359b9395b3c5e3fad5b645846095494662802d2f0fd01c9", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.20.1_1.tar.gz", + "version": "11.0.20" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "1e3704c8e155f8f894953c2a6708a52e6f449bbf5a85450be6fbb2ec76581700", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "262ff98d6d88a7c7cc522cb4ec4129491a0eb04f5b17dcca0da57cfcdcf3830d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "60ea98daa09834fdd3162ca91ddc8d92a155ab3121204f6f643176ee0c2d0d5e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk16": { @@ -208,36 +240,36 @@ }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "e2c5e26f8572544b201bc22a9b28f2b1a3147ab69be111cea07c7f52af252e75", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "armv6l": { - "build": "7", - "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "1", + "sha256": "b1f1d8b7fcb159a0a8029b6c3106d1d16207cecbb2047f9a4be2a64d29897da5", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.8.1_1.tar.gz", + "version": "17.0.8" }, "armv7l": { - "build": "7", - "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "1", + "sha256": "b1f1d8b7fcb159a0a8029b6c3106d1d16207cecbb2047f9a4be2a64d29897da5", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.8.1_1.tar.gz", + "version": "17.0.8" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "8f4366ff1eddb548b1744cd82a1a56ceee60abebbcbad446bfb3ead7ac0f0f85", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "3ae4b254d5b720f94f986481e787fbd67f0667571140ba2e2ae5020ceddbc826", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -311,9 +343,9 @@ "openjdk20": { "aarch64": { "build": "9", - "sha256": "b16c0271899de1f0e277dc0398bfff11b54511765f104fa938929ac484dc926d", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "b475bcc23db0bd618c815bb8f11d8e084dc58288ea3bcdf4e7f389ed41c89f56", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" }, "packageType": "jdk", "powerpc64le": { @@ -325,113 +357,135 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "43ad054f135a7894dc87ad5d10ad45d8e82846186515892acdbc17c2c5cd27e4", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "3d91842e9c172967ac397076523249d05a82ead51b0006838f5f0315ad52222c", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "e184dc29a6712c1f78754ab36fb48866583665fa345324f1a79e569c064f95e9", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jdk", + "powerpc64le": { + "build": "12", + "sha256": "9574828ef3d735a25404ced82e09bf20e1614f7d6403956002de9cfbfcb8638f", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "1a6fa8abda4c5caed915cfbeeb176e7fbd12eb6b222f26e290ee45808b529aa1", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "aarch64": { - "build": "7", - "sha256": "195808eb42ab73535c84de05188914a52a47c1ac784e4bf66de95fe1fd315a5a", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "70636c2fa4927913e9e869d471607a99d3a521c1fa3f3687b889c2acba67c493", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" }, "armv6l": { - "build": "7", - "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "5d805ff157f272acf0f7d192f21af4a3b68c840333ca95568e4e07142efc369d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" }, "armv7l": { - "build": "7", - "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "5d805ff157f272acf0f7d192f21af4a3b68c840333ca95568e4e07142efc369d", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_arm_linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" }, "packageType": "jdk", "powerpc64le": { - "build": "7", - "sha256": "bb85303848fe402d4f1004f748f80ccb39cb11f356f50a513555d1083c3913b8", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "9d9813d2840360ffdbc449c45e71124e8170c31a3b6cce9151fbb31352064406", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "15d091e22aa0cad12a241acff8c1634e7228b9740f8d19634250aa6fe0c19a33", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "7", - "sha256": "1fe4b20d808f393422610818711c728331992a4455eeeb061d3d05b45412771d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "8dc527e5c5da62f80ad3b6a2cd7b1789f745b1d90d5e83faba45f7a1d0b6cab8", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "armv6l": { - "build": "7", - "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "1", + "sha256": "2fc1cc935897312c0bc2515b2e7ea1fa3b267e77305a1b51a8c3917d92af380f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.20.1_1.tar.gz", + "version": "11.0.20" }, "armv7l": { - "build": "7", - "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "1", + "sha256": "2fc1cc935897312c0bc2515b2e7ea1fa3b267e77305a1b51a8c3917d92af380f", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.20.1_1.tar.gz", + "version": "11.0.20" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "8019d938e5525938ec8e68e2989c4413263b0d9b7b3f20fe0c45f6d967919cfb", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "286e37ce06316185377eea847d2aa9f1523b9f1428684e59e772f2f6055e89b9", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "156861bb901ef18759e05f6f008595220c7d1318a46758531b957b0c950ef2c3", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "2ff6a4fd1fa354047c93ba8c3179967156162f27bd683aee1f6e52a480bcbe6a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "05b192f81ed478178ba953a2a779b67fc5a810acadb633ad69f8c4412399edb8", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "armv6l": { - "build": "7", - "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "1", + "sha256": "8af898c5d356f0b2cee2db67ff9c8e7a8e738c0f6b3a61c383150b3168b9ea58", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.8.1_1.tar.gz", + "version": "17.0.8" }, "armv7l": { - "build": "7", - "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "1", + "sha256": "8af898c5d356f0b2cee2db67ff9c8e7a8e738c0f6b3a61c383150b3168b9ea58", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.8.1_1.tar.gz", + "version": "17.0.8" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "cc25e74c0817cd4d943bba056b256b86e0e9148bf41d7600c5ec2e1eadb2e470", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "79c85ecf1320c67b828310167e1ced62e402bc86a5d47ca9cc7bfa3b708cb07a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "bb025133b96266f6415d5084bb9b260340a813968007f1d2d14690f20bd021ca", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "c37f729200b572884b8f8e157852c739be728d61d9a1da0f920104876d324733", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -505,9 +559,9 @@ "openjdk20": { "aarch64": { "build": "9", - "sha256": "4b04fcfabf833403cc74dd19105a387563f9ff0fef975c4101f3d74c53eb7745", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_aarch64_linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "63a730d5a3b6d21d31f7cba15dc44b019a8a4d8652e13acec45040f98584112c", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_aarch64_linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" }, "packageType": "jre", "powerpc64le": { @@ -519,43 +573,65 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "daacf24c15bf7f38a957a98a312911a36ba7f7d97004920a7875791f20e8e1ed", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_linux_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "e3592e86290c192804d9c6b5035d42cc32cf04141d1c0b9d1ecb67739826c8c5", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_linux_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "4582c4cc0c6d498ba7a23fdb0a5179c9d9c0d7a26f2ee8610468d5c2954fcf2f", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jre", + "powerpc64le": { + "build": "12", + "sha256": "05cc9b7bfbe246c27d307783b3d5095797be747184b168018ae3f7cc55608db2", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "277f4084bee875f127a978253cfbaad09c08df597feaf5ccc82d2206962279a3", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "aarch64": { - "build": "7", - "sha256": "f8e440273c8feb3fcfaca88ba18fec291deae18a548adde8a37cd1db08107b95", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_aarch64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "37b997f12cd572da979283fccafec9ba903041a209605b50fcb46cc34f1a9917", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_aarch64_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" }, "armv6l": { - "build": "7", - "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "b92fb3972372b5d1f9fb51815def903105722b747f680b7ecf2ba2ba863ab156", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_arm_linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" }, "armv7l": { - "build": "7", - "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "5", + "sha256": "b92fb3972372b5d1f9fb51815def903105722b747f680b7ecf2ba2ba863ab156", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_arm_linux_hotspot_8u382b05.tar.gz", + "version": "8.0.382" }, "packageType": "jre", "powerpc64le": { - "build": "7", - "sha256": "ba5f8141a16722e39576bf42b69d2b8ebf95fc2c05441e3200f609af4dd9f1ea", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_ppc64le_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "0ecb0aeb54fb9d3c9e1a7ea411490127e8e298d93219fafc4dd6051a5b74671f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_ppc64le_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" }, "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "b6fdfe32085a884c11b31f66aa67ac62811df7112fb6fb08beea61376a86fbb4", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_linux_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "91d31027da0d985be3549714389593d9e0da3da5057d87e3831c7c538b9a2a0f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_x64_linux_hotspot_8u392b08.tar.gz", + "version": "8.0.392" } } } @@ -564,18 +640,18 @@ "jdk": { "openjdk11": { "aarch64": { - "build": "7", - "sha256": "f3b416ecccf51f45cc8c986975eb7bd35e7e1ad953656ab0a807125963fcf73b", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "3be236f2cf9612cd38cd6b7cfa4b8eef642a88beab0cd37c6ccf1766d755b4cc", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "fc34c4f0e590071dcd65a0f93540913466ccac3aa8caa984826713b67afb696d", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "39e30e333d01f70765f0fdc57332bc2c5ae101392bcc315ef06f472d80d8e2d7", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk16": { @@ -590,18 +666,18 @@ }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "823777266415347983bbd87ccd8136537242ff27e62f307b7e8521494c665f0d", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "c69b37ea72136df49ce54972408803584b49b2c91b0fbc876d7125e963c7db37", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_mac_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -639,61 +715,77 @@ "openjdk20": { "aarch64": { "build": "9", - "sha256": "e743f7a4aebb46bfb02e164c7aa009a29bcce1d7dd0c4926541893ea6ed21d82", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "6ef42b63581c0265c5a6b734e203bb922ee720571a8de46532ecca50a804c596", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_mac_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "7cccfc4fb9f63410b7fdc315fd1c7739cf61888930d7f88f3eee6589d14e861f", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "bdeb37322a7c9292434e417d4db9f5debd7477cf413335d3a653a4e5e50a2473", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_mac_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "0d29257c9bcb5f20f5c4643ef9437f36b10376863eddaf6248d09093796c6b30", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "35f3cbc86d7ff0a01facefd741d5cfb675867e0a5ec137f62ba071d2511a45c9", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_mac_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "9c33db312cc46b6bfe705770fdc5c08edb7d790ba70be4e8b12a98e79da5f4a1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "d152f5b2ed8473ee0eb29c7ee134958d75ea86c8ccbafb5ee04a5545dd76108f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u392b08.tar.gz", + "version": "8.0.392" } } }, "jre": { "openjdk11": { "aarch64": { - "build": "7", - "sha256": "78a07bd60c278f65bafd0df93890d909ff60259ccbd22ad71a1c3b312906508e", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "bcac3231195a95cac397a35410bfa3f0945ec03e5194e7b0c1d0e785a48f8b76", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "87e439b2193e1a2cf1a8782168bba83b558f54e2708f88ea8296184ea2735c89", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.19_7.tar.gz", - "version": "11.0.19" + "build": "9", + "sha256": "43d29affe994a09de31bf2fb6f8ab6d6792ba4267b9a2feacaa1f6e042481b9b", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.21%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.21_9.tar.gz", + "version": "11.0.21" } }, "openjdk17": { "aarch64": { - "build": "7", - "sha256": "625d070a297a3c856badbaa5c65adaaa1adb3ea3813363fb8335c47709b69140", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "89831d03b7cd9922bd178f1a9c8544a36c54d52295366db4e6628454b01acaef", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "62559a927a8dbac2ea1d7879f590a62fea87d61bfaa92894e578d2045b8d921b", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.7_7.tar.gz", - "version": "17.0.7" + "build": "9", + "sha256": "ba214f2217dc134e94432085cff4fc5a97e964ffc211d343725fd535f3cd98a0", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_mac_hotspot_17.0.9_9.tar.gz", + "version": "17.0.9" } }, "openjdk18": { @@ -731,27 +823,43 @@ "openjdk20": { "aarch64": { "build": "9", - "sha256": "ee8be9190324285ebc7e9bd47b948eec349221845fa48f1e673e5a1489708750", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_aarch64_mac_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "81b475ab029ab224b2c711ccdfa9c25e0300539faad342a4ceefd33772fb38b4", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_aarch64_mac_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "b59a5f8b7f8fd1502df274e8ba58215b06934c8261413cb40e344f6ad81e7f1f", - "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.1%2B9/OpenJDK20U-jre_x64_mac_hotspot_20.0.1_9.tar.gz", - "version": "20.0.1" + "sha256": "565d62faac325c098670705fb26a5cc3d4af0a25e86444ddd643f779ad2a3417", + "url": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jre_x64_mac_hotspot_20.0.2_9.tar.gz", + "version": "20.0.2" + } + }, + "openjdk21": { + "aarch64": { + "build": "12", + "sha256": "bc384961d3a866198b1055a80fdff7fb6946aa6823b3ce624cc8c3125a26bed5", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_mac_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "c21a2648ec21bc4701acfb6b7a1fd90aca001db1efb8454e2980d4c8dcd9e310", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_mac_hotspot_21.0.1_12.tar.gz", + "version": "21.0.1" } }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "7", - "sha256": "6c876ea7bfa778ae78ec5a976e557b2b981a592a3639eb0d3dc3c8d3dda8d321", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_mac_hotspot_8u372b07.tar.gz", - "version": "8.0.372" + "build": "8", + "sha256": "f1f15920ed299e10c789aef6274d88d45eb21b72f9a7b0d246a352107e344e6a", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_x64_mac_hotspot_8u392b08.tar.gz", + "version": "8.0.392" } } } diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 8ce57eef9a759..77c5c66891df6 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -97,6 +97,7 @@ stdenv.mkDerivation { $out/lib/v -v $out/lib/cmd/tools/vdoc $out/lib/v -v $out/lib/cmd/tools/vast $out/lib/v -v $out/lib/cmd/tools/vvet + $out/lib/v -v $out/lib/cmd/tools/vcreate runHook postInstall ''; diff --git a/pkgs/development/compilers/yosys/plugins/synlig-makefile-for-nix.patch b/pkgs/development/compilers/yosys/plugins/synlig-makefile-for-nix.patch deleted file mode 100644 index 7d1f407d6fdcb..0000000000000 --- a/pkgs/development/compilers/yosys/plugins/synlig-makefile-for-nix.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/Makefile b/Makefile -index 4c96ae7..9e1a2e3 100755 ---- a/Makefile -+++ b/Makefile -@@ -3,7 +3,7 @@ - # Setup make itself. - - .ONESHELL: --override SHELL := /bin/bash -+SHELL := bash - override .SHELLFLAGS := -e -u -o pipefail -O nullglob -O extglob -O globstar -c - - # Unset all default build- and recipe-related variables. -@@ -315,7 +315,6 @@ endif - GetTargetStructName = target[${1}] - - makefiles_to_include := \ -- third_party/Build.*.mk \ - frontends/*/Build.mk \ - tests/*/Build.mk \ - lib/*/Build.mk -diff --git a/frontends/systemverilog/Build.mk b/frontends/systemverilog/Build.mk -index acd9cb6..c039994 100644 ---- a/frontends/systemverilog/Build.mk -+++ b/frontends/systemverilog/Build.mk -@@ -1,6 +1,7 @@ - t := systemverilog-plugin - ts := $(call GetTargetStructName,${t}) - out_dir := $(call GetTargetBuildDir,${t}) -+mod_dir := third_party/yosys_mod - - cxx_is_clang := $(findstring clang,$(notdir ${CXX})) - -@@ -13,9 +14,9 @@ ${ts}.sources := \ - ${${ts}.src_dir}uhdm_ast_frontend.cc \ - ${${ts}.src_dir}uhdm_common_frontend.cc \ - ${${ts}.src_dir}uhdm_surelog_ast_frontend.cc \ -- ${$(call GetTargetStructName,yosys).mod_dir}const2ast.cc \ -- ${$(call GetTargetStructName,yosys).mod_dir}edif.cc \ -- ${$(call GetTargetStructName,yosys).mod_dir}simplify.cc -+ $(mod_dir)/const2ast.cc \ -+ $(mod_dir)/edif.cc \ -+ $(mod_dir)/simplify.cc - - define ${ts}.env = - export PKG_CONFIG_PATH=$(call ShQuote,${$(call GetTargetStructName,surelog).output_vars.PKG_CONFIG_PATH}$(if ${PKG_CONFIG_PATH},:${PKG_CONFIG_PATH})) -@@ -35,8 +36,8 @@ endif - endif - - ${ts}.cxxflags = \ -- -I${$(call GetTargetStructName,yosys).src_dir} \ -- -I${$(call GetTargetStructName,yosys).mod_dir} \ -+ -I$(shell yosys-config --cxxflags) \ -+ -I$(mod_dir) \ - -D_YOSYS_ \ - -DYOSYS_ENABLE_PLUGINS \ - $(shell ${${ts}.env}; pkg-config --cflags Surelog) \ -@@ -55,7 +56,7 @@ ${ts}.ldflags = \ - $(shell ${${ts}.env}; pkg-config --libs-only-L Surelog) \ - ${build_type_ldflags} \ - ${LDFLAGS} \ -- -Wl,--export-dynamic -+ $(shell yosys-config --ldflags --ldlibs) - - ${ts}.ldlibs = \ - $(shell ${${ts}.env}; pkg-config --libs-only-l --libs-only-other Surelog) \ diff --git a/pkgs/development/compilers/yosys/plugins/synlig.nix b/pkgs/development/compilers/yosys/plugins/synlig.nix index ccbf881593132..cc4ce429b3113 100644 --- a/pkgs/development/compilers/yosys/plugins/synlig.nix +++ b/pkgs/development/compilers/yosys/plugins/synlig.nix @@ -12,21 +12,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "yosys-synlig"; - version = "2023.10.12"; # Currently no tagged versions upstream plugin = "synlig"; + # The module has automatic regular releases, with date + short git hash + GIT_VERSION = "2023-10-26-f0252f6"; + + # Derive our package version from GIT_VERSION, remove hash, just keep date. + version = builtins.concatStringsSep "-" ( + lib.take 3 (builtins.splitVersion finalAttrs.GIT_VERSION)); + src = fetchFromGitHub { - owner = "chipsalliance"; - repo = "synlig"; - rev = "c5bd73595151212c61709d69a382917e96877a14"; - sha256 = "sha256-WJhf5gdZTCs3EeNocP9aZAh6EZquHgYOG/xiTo8l0ao="; + owner = "chipsalliance"; + repo = "synlig"; + rev = "${finalAttrs.GIT_VERSION}"; + hash = "sha256-BGZQbUcIImpz3SjFvMq3Pr1lseNLZnsMvpHy0IsICe4="; fetchSubmodules = false; # we use all dependencies from nix }; - patches = [ - ./synlig-makefile-for-nix.patch # Remove assumption submodules available. - ]; - nativeBuildInputs = [ pkg-config ]; @@ -42,16 +44,32 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - make -j $NIX_BUILD_CORES build@systemverilog-plugin + + # Remove assumptions that submodules are available. + rm -f third_party/Build.*.mk + + # Create a stub makefile include that delegates the parameter-gathering + # to yosys-config + cat > third_party/Build.yosys.mk << "EOF" + t := yosys + ts := ''$(call GetTargetStructName,''${t}) + + ''${ts}.src_dir := ''$(shell yosys-config --datdir/include) + ''${ts}.mod_dir := ''${TOP_DIR}third_party/yosys_mod/ + EOF + + make -j $NIX_BUILD_CORES build@systemverilog-plugin \ + LDFLAGS="''$(yosys-config --ldflags --ldlibs)" runHook postBuild ''; - # Very simple litmus test that the plugin can be loaded successfully. + # Check that the plugin can be loaded successfully and parse simple file. doCheck = true; checkPhase = '' runHook preCheck + echo "module litmustest(); endmodule;" > litmustest.sv yosys -p "plugin -i build/release/systemverilog-plugin/systemverilog.so;\ - help read_systemverilog" | grep "Read SystemVerilog files using" + read_systemverilog litmustest.sv" runHook postCheck ''; diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix index fc40fc9789df5..7ca44f39e0e8d 100644 --- a/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -7,15 +7,15 @@ mkCoqDerivation rec { useDune = true; - release."0.1.7+8.16".sha256 = "sha256-ZBxwrnnCmT5q4C7ocQ+M+aSJQNnEjeN2HFw4bzPozYs="; - release."0.1.7+8.17".sha256 = "sha256-f671wzGQannGjRbmBRHFKXz24BTPX7oVeHUxnv4Vd6Y="; - release."0.1.7+8.18".sha256 = "sha256-J+bRIzjdIPRu7DvAGVBKB43O3UJliTo8XQ87OTzsFyc="; + release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo="; + release."0.1.8+8.17".sha256 = "sha256-TmaE+osn/yAPU1Dyni/UTd5w/L2+qyPE3H/g6IWvHLQ="; + release."0.1.8+8.18".sha256 = "sha256-UYmiDdbax4wxp5dLia/1t1gFyK6UELtJJvDMd5Hd14s="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = isEq "8.16"; out = "0.1.7+8.16"; } - { case = isEq "8.17"; out = "0.1.7+8.17"; } - { case = isEq "8.18"; out = "0.1.7+8.18"; } + { case = isEq "8.16"; out = "0.1.8+8.16"; } + { case = isEq "8.17"; out = "0.1.8+8.17"; } + { case = isEq "8.18"; out = "0.1.8+8.18"; } ] null; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/development/guile-modules/guile-gnutls/default.nix index ae666077bf8ff..952d2558d0502 100644 --- a/pkgs/development/guile-modules/guile-gnutls/default.nix +++ b/pkgs/development/guile-modules/guile-gnutls/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, buildPackages , gnutls , guile , libtool @@ -19,16 +20,21 @@ stdenv.mkDerivation rec { strictDeps = true; + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + nativeBuildInputs = [ + gnutls guile + libtool + texinfo pkg-config ]; buildInputs = [ gnutls guile - libtool - texinfo ]; configureFlags = [ diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 30b7aabbcdcd8..1bafd6cb728e8 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-D9maTCNNJ9ivj76SEjddFSYNu+RLEZG+3SgOWEAD7aU="; + sha256 = "sha256-9SsSXLZFwqsAeWFGsba8OG9bdmfQjn6qQHHQK6IdHK8="; }; - vendorHash = "sha256-ioC7R5Pm2nmHXI+/ko1UoNJCvEFzvhZcAcVtaFECz2c="; + vendorHash = "sha256-VRQUbGJTC2v8w/l4iaNn3vPX3AdV9Likp2nuG0PQieU="; doCheck = false; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 7c329f56fedc9..a316a407d80dd 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, mkRubyVersion, makeBinaryWrapper, jre }: +{ lib, stdenv, callPackage, fetchurl, gitUpdater, mkRubyVersion, makeBinaryWrapper, jre }: let # The version number here is whatever is reported by the RUBY_VERSION string @@ -6,11 +6,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jruby"; - version = "9.4.3.0"; + version = "9.4.4.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-sJfgjFZp6KGIKI4RORHRK0rSvWeiwgnW36hEXWOk2Mk="; + hash = "sha256-arEmcK/Y5ciskwX6vkIFV5XF3fn46PGh5g4mDy1yTMA="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -52,12 +52,15 @@ stdenv.mkDerivation (finalAttrs: { devEnv = callPackage ../ruby/dev.nix { ruby = finalAttrs.finalPackage; }; + updateScript = gitUpdater { + url = "https://github.com/jruby/jruby.git"; + }; }; meta = with lib; { description = "Ruby interpreter written in Java"; homepage = "https://www.jruby.org/"; - changelog = "https://github.com/jruby/jruby/releases/tag/${version}"; + changelog = "https://github.com/jruby/jruby/releases/tag/${finalAttrs.version}"; license = with licenses; [ cpl10 gpl2 lgpl21 ]; platforms = jre.meta.platforms; maintainers = [ maintainers.fzakaria ]; diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index ed6f3d27157f8..51651c5d405b8 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.24"; - hash = "sha256-sK5YBKmtU6fijQoyYpSV+Bb5NbEIMMcfTsFYJxhac8k="; + version = "8.1.25"; + hash = "sha256-qGqIwYQMG8gyvP0vvsO4oZQsgxTaXf9T8J+cmNDBLoo="; }); in diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index a38b0d3957128..072012657588a 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.11"; - hash = "sha256-OBktrv+r9K9sQnvxesH4JWXZx1IuDb0yIVFilEQ0sos="; + version = "8.2.12"; + hash = "sha256-cEMl9WsbTBf5+VHh/+9cZOFIiWBT804mJhUsuqLwWJM="; }); in diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 8031ab1c6a284..63e7ec8e31b65 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -2,12 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0RC4"; + version = "8.3.0RC5"; hash = null; })).overrideAttrs (oldAttrs: { src = fetchurl { - url = "https://downloads.php.net/~eric/php-8.3.0RC4.tar.xz"; - hash = "sha256-i02aivxsRIRo5ZFrzKCGAOXffvbhPiWnMFEGqQMr5h0="; + url = "https://downloads.php.net/~jakub/php-8.3.0RC5.tar.xz"; + hash = "sha256-I42ded2tZO5ZQ+iU5DeNKjT+mNNoowew8gNOYDeB5aY="; }; }); in diff --git a/pkgs/development/interpreters/rune/default.nix b/pkgs/development/interpreters/rune/default.nix index 944741a21b10d..510ab71bdc68a 100644 --- a/pkgs/development/interpreters/rune/default.nix +++ b/pkgs/development/interpreters/rune/default.nix @@ -7,18 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "rune"; - version = "0.12.4"; + version = "0.13.1"; src = fetchCrate { pname = "rune-cli"; inherit version; - hash = "sha256-Fw6vCy6EMLzNbhwOUwCCsGSueDxfh7KMjLhhbvTzclc="; + hash = "sha256-7GScETlQ/rl9vOB9zSfsCM1ay1F5YV6OAxKe82lMU1I="; }; - cargoHash = "sha256-F1FI7ZVNXIFzxIzimq0KXtGNWw26x1eQyqv+hVYaS1E="; + cargoHash = "sha256-T6uYe+ZgXgsGN1714Ka+fxeVDoXgjVdfrrw5Rj/95cE="; buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index e2e75a80cebe6..f2238eb5fa85c 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "14.0.1"; + version = "14.0.2"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-9Bpq96k/AOuKPXHeVv3zCqinGUu3rBqKsIryV/RUVlE="; + hash = "sha256-/YAu2wIeDhMojWfutJSEp7SELOV4G/EfQjypLQI+jo8="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-q/PTPiaggqYQwZZ9QyFi9ctgqYsFSy/ITHfOBgSHG+U="; + cargoHash = "sha256-4Ca3RlpJQ67zwje0SowqqEcBGLnht5QL/PCrrtFTc4o="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index cb1cc3e95f3fa..3dc82f9c0761c 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "postgresql-jdbc"; - version = "42.5.1"; + version = "42.6.0"; src = fetchMavenArtifact { artifactId = "postgresql"; groupId = "org.postgresql"; - sha256 = "sha256-iei/+os3uUh5RgEsaQzwTzEDlTBRwcGT2I7ja2jTZa4="; + hash = "sha256-uBfGekDJQkn9WdTmhuMyftDT0/rkJrINoPHnVlLPxGE="; inherit version; }; @@ -19,8 +19,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jdbc.postgresql.org/"; + changelog = "https://github.com/pgjdbc/pgjdbc/releases/tag/REL${version}"; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; license = licenses.bsd2; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index eacf704aa688a..41466a9d77314 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2023.Q3.3"; + version = "2023.Q4.1"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "HHnMiU6mzhUSicXev53PP8y9ealtDMavJLp2F/JAWhI="; + sha256 = "5fSz8sksH3K9k0nIx9DUmGGUfIo4Fc4NMettaVqRsY8="; }; buildInputs = [ diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 178b9cf15ec0d..609d29ed69096 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.18.2"; + version = "5.18.3"; src = fetchurl { - sha256 = "sha256-zT3z7C95HUf0NRvA5dX5iAwiCkUaMYIO2/g5li7IQwo="; + sha256 = "sha256-lDOBqm00BwfebELq2/e0G3/fk99gQVbZctUMTaeDVE8="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/development/libraries/audio/qm-dsp/default.nix index 59f7d169291b5..01a3933fe2b3e 100644 --- a/pkgs/development/libraries/audio/qm-dsp/default.nix +++ b/pkgs/development/libraries/audio/qm-dsp/default.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { "LIBDIR=${placeholder "out"}/lib" ]; + postInstall = '' + mv $out/include/qm-dsp/* $out/include + rmdir $out/include/qm-dsp + ''; + env.NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft"; meta = with lib; { diff --git a/pkgs/development/libraries/cassandra-cpp-driver/default.nix b/pkgs/development/libraries/cassandra-cpp-driver/default.nix index ce310593e2246..4e8175d0585ac 100644 --- a/pkgs/development/libraries/cassandra-cpp-driver/default.nix +++ b/pkgs/development/libraries/cassandra-cpp-driver/default.nix @@ -9,13 +9,13 @@ , examples ? false }: stdenv.mkDerivation rec { pname = "cassandra-cpp-driver"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "datastax"; repo = "cpp-driver"; rev = "refs/tags/${version}"; - sha256 = "sha256-sLKLaBFnGq3NIQV7Tz5aAfsL+LeLw8XDbcJt//H468k="; + sha256 = "sha256-GuvmKHJknudyn7ahrn/8+kKUA4NW5UjCfkYoX3aTE+Q="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/clap/default.nix b/pkgs/development/libraries/clap/default.nix index 832ca66d6d78a..dd4d410bb874c 100644 --- a/pkgs/development/libraries/clap/default.nix +++ b/pkgs/development/libraries/clap/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clap"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = version; - hash = "sha256-UY6HSth3xuXVfiKolttpYf19rZ2c/X1FXHV7TA/hAiM="; + hash = "sha256-z2P0U2NkDK1/5oDV35jn/pTXCcspuM1y2RgZyYVVO3w="; }; postPatch = '' diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 66e05dc9af117..f84b44007e299 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.12"; + version = "1.1.13"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - hash = "sha256-KxlUuoj2HJhkqkIX+Pic/0+36g/N3qfAAlnvYO2Y6uQ="; + hash = "sha256-NA+jr27aYu0XPG9sxnBtjeBTFHmV7TENRsFy8dDdNUc="; }; postPatch = '' diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 8d25e36ad7342..1b31cef96550f 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.6.1"; + version = "2.6.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-8k4SRpE3rh0DFAu5AypHpZR8NvTR4vErkpBhAF6xUnk="; + hash = "sha256-ZoanKOVudg+N7gmiLw+1O0bunb59ZM+eW7NaZYv/fh0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index 617d51d85ed53..fdfb203ba12b4 100644 --- a/pkgs/development/libraries/gl3w/default.nix +++ b/pkgs/development/libraries/gl3w/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gl3w"; - version = "unstable-2022-03-24"; + version = "unstable-2023-10-10"; src = fetchFromGitHub { owner = "skaslev"; repo = pname; - rev = "5f8d7fd191ba22ff2b60c1106d7135bb9a335533"; - hash = "sha256-qV/PZmaP5iCHhIzTA2bE4d1RMB6LzRbTsB5gWVvi9bU="; + rev = "3a33275633ce4be433332dc776e6a5b3bdea6506"; + hash = "sha256-kEm5QItpasSFJQ32YBHPpc+itz/nQ8bQMCavbOTGT/w="; }; nativeBuildInputs = [ python3 cmake ]; diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/development/libraries/java/jffi/default.nix index 9bbd2135e0b2d..b4351f4e9df9f 100644 --- a/pkgs/development/libraries/java/jffi/default.nix +++ b/pkgs/development/libraries/java/jffi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jffi"; - version = "1.3.11"; + version = "1.3.12"; src = fetchFromGitHub { owner = "jnr"; repo = "jffi"; rev = "jffi-${version}"; - sha256 = "sha256-fZnZH2j/IXbfsJkJG8s2ArOrWwVE2kgvSREVaSVoDyo="; + sha256 = "sha256-U0pBoKewZEen7aH3rIvZ8dKKeXKE1+Z5WtfM0HK6/LQ="; }; nativeBuildInputs = [ jdk ant texinfo pkg-config ]; diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index a14a220f51994..ff2fca37fba47 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0-6"; + version = "6.0-7"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-jOKVS+BMADS/jIagOnYwxeGTpTMySmGlOHkPD2LJdkA="; + sha256 = "sha256-Z4getn/mVYIRANkIOyt7jMpcqHBvq5GXLK/ST5zV1r4="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/development/libraries/libcifpp/default.nix index e45cbcecf2753..33f174dfc7191 100644 --- a/pkgs/development/libraries/libcifpp/default.nix +++ b/pkgs/development/libraries/libcifpp/default.nix @@ -10,24 +10,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-9je4oj5XvclknD14Nh0LnBONHMeO40nY0+mZ9ACQYmY="; + hash = "sha256-+OVfMXkBALT8v/30JU8v2gTsw12FM5n1I2COV/b5vGY="; }; - patches = [ - (fetchpatch { - # https://github.com/PDB-REDO/libcifpp/issues/51 - name = "fix-build-on-darwin.patch"; - url = "https://github.com/PDB-REDO/libcifpp/commit/641f06a7e7c0dc54af242b373820f2398f59e7ac.patch"; - hash = "sha256-eWNfp9nA/+2J6xjZR6Tj+5OM3L5MxdfRi0nBzyaqvS0="; - }) - ]; - nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index f5a9974f3bcfa..142e329fd09e5 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcmis"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "tdf"; repo = pname; rev = "v${version}"; - sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57"; + sha256 = "sha256-E2A4uJUayqMMxVifzeAeYKLL+FiV2vShNNdXe5ZLXZ4="; }; nativeBuildInputs = [ autoreconfHook pkg-config docbook2x ]; diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index d7f60b9ad6b10..dae73136c7d55 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w0DxZLEuR9m7udmlBQ7TyCoQvGVmJCffKHsxynQV+oo="; + sha256 = "sha256-QvDYdplPhivG4a2otT4MuSY546a2Dw/amWly5aheabQ="; }; postPatch = lib.optionalString stdenv.cc.isClang '' diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix index e981945ccbd35..be8be13602afe 100644 --- a/pkgs/development/libraries/libcxxrt/default.nix +++ b/pkgs/development/libraries/libcxxrt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "unstable-2022-08-08"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; - rev = "a0f7f5c139a7daf71de0de201b6c405d852b1dc1"; - sha256 = "6ErOhlD6pOudbTkFTlI2hjBuYT3QuzEiL33/mLnw1aI="; + rev = "03c83f5a57be8c5b1a29a68de5638744f17d28ba"; + sha256 = "ldwE0j9P9h5urWIUCRdY6qrJqKe45hid+NrSNeKEixE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index 00fe35202101b..4561f04ba06b5 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = pname; rev = "v${version}"; - hash = "sha256-jsJTECSR3ptiByfYQ00laeKMKJCv5IDkZmilY3jpRrU="; + hash = "sha256-x7/jgoaFVfx5j+CP8S/uIwkzjGskEqsY2Jxsd/Mj4VM="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix index 2ad7539ef1fdc..8e036cc663cde 100644 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/pkgs/development/libraries/libhugetlbfs/default.nix @@ -40,10 +40,14 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-docs" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "library and utilities for Linux hugepages"; maintainers = with maintainers; [ qyliss ]; license = licenses.lgpl21Plus; platforms = platforms.linux; + badPlatforms = flatten [ + systems.inspect.platformPatterns.isStatic + systems.inspect.patterns.isMusl + systems.inspect.patterns.isAarch64 + ]; }; } diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 5569fdf9025ea..e0ee93c162869 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.6.1"; + version = "3.7.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-zqtPBxjTJ+/XxVpfVpyFIwvlj5xCcnTrUv2RGzP8UQc="; + sha256 = "sha256-BIEe3DhPqyK+vAAk/6x8Ui+4t+IUyvtHf5Lk2AZVuC8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix deleted file mode 100644 index 2e8b788ecc25c..0000000000000 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, fetchurl, pkg-config, m4}: - -stdenv.mkDerivation rec { - pname = "libsigc++"; - version = "1.2.7"; - - src = fetchurl { - url = "mirror://gnome/sources/libsigc++/1.2/libsigc++-${version}.tar.bz2"; - sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ m4]; - - meta = with lib; { - broken = stdenv.isDarwin; - homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; - description = "A typesafe callback system for standard C++"; - branch = "1.2"; - platforms = platforms.unix; - license = licenses.lgpl3; - }; -} diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/development/libraries/miniaudio/default.nix index f49a17a67f93a..2df349b83dcc6 100644 --- a/pkgs/development/libraries/miniaudio/default.nix +++ b/pkgs/development/libraries/miniaudio/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "miniaudio"; - version = "0.11.17"; + version = "0.11.18"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; rev = version; - hash = "sha256-nPQ53+9CDEn91LZgF5RkVur+XckTDcS38FHomPXbtMI="; + hash = "sha256-y0o33hnKoZ8gWWFNFIOUJcXMWENaYzMLZzeTOoVETOY="; }; installPhase = '' diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 33126eeb60d6d..2606edc760988 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "zlib-ng"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-3bCGZupdJWcwp2d+XeqKZG3GxzXFm1UftV/PiN0u5iA="; + hash = "sha256-aJ6KYR9DazVQoPuc4w/gClKH9ditNE1JDU/F9dCJOsw="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 225ce967080d4..a8afd6e038f8e 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl +, bash , gnome , meson , python3 @@ -15,12 +17,20 @@ stdenv.mkDerivation rec { sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao="; }; + strictDeps = true; + nativeBuildInputs = [ meson python3 ninja ]; + # for shebangs + buildInputs = [ + python3 + bash + ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/openturns/default.nix b/pkgs/development/libraries/openturns/default.nix index d6735e77d4607..e20499b9206c0 100644 --- a/pkgs/development/libraries/openturns/default.nix +++ b/pkgs/development/libraries/openturns/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "openturns"; - version = "1.21"; + version = "1.21.1"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${version}"; - sha256 = "sha256-zWCwuxJEiyhnllVCsfm3zNz2Xorvuj2Vl2fufS3qixY="; + sha256 = "sha256-Lg42QqsHYFxeUjZjYFVJFxeJv2MzOpjoShfbIg/095A="; }; nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix index b3ba508220f50..589233a195931 100644 --- a/pkgs/development/libraries/physics/clhep/default.nix +++ b/pkgs/development/libraries/physics/clhep/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clhep"; - version = "2.4.6.4"; + version = "2.4.7.1"; src = fetchurl { url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-SciTMPGQPvcH08XXnBanxabyyQ/CkOIDTuODSAlInlc="; + hash = "sha256-HIMEp3cqxrmRlfEwA3jG4930rQfIXWSgRQVlKruKVfk="; }; prePatch = '' diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 9df86514edec0..8259d05a36537 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "sha256-Ju22lCpwbNxiFeQoaUh3LmtI6RlTO3hOw2Z4/O8PQ6E="; + sha256 = "sha256-3tKXqYICuLSrJzWnp0ClXcz61XO5gXLTOLFeTk0g3mo="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/quictls/default.nix b/pkgs/development/libraries/quictls/default.nix index 1e08912fabfbd..ab53b5cc9b6b4 100644 --- a/pkgs/development/libraries/quictls/default.nix +++ b/pkgs/development/libraries/quictls/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quictls"; - version = "3.1.2-quic1"; + version = "3.1.4-quic1"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; rev = "openssl-${finalAttrs.version}"; - hash = "sha256-erMSGQDmq1S57Y/0GL5Zxw2aygB9XoMJ0x5g+vG6WoM="; + hash = "sha256-WOWoY6rmAAUvuWWXPTWsllUkew5ZIULjL1CEg/RRPsE="; }; patches = [ diff --git a/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/pkgs/development/libraries/science/astronomy/libxisf/default.nix index 17e454e13e217..8f2adb85424b2 100644 --- a/pkgs/development/libraries/science/astronomy/libxisf/default.nix +++ b/pkgs/development/libraries/science/astronomy/libxisf/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxisf"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitea { domain = "gitea.nouspiro.space"; owner = "nou"; repo = "libXISF"; rev = "v${finalAttrs.version}"; - hash = "sha256-Jh3NWtQSV0uePDMCDNzdI4qpRGbHTel3neRZAA3anQk="; + hash = "sha256-ME0x+1VyfuhJCldwJfjQCtfe9XQk1ptmhv4ghOyNuGA="; }; patches = [ diff --git a/pkgs/development/libraries/science/chemistry/tblite/python.nix b/pkgs/development/libraries/science/chemistry/tblite/python.nix index 8bf30f9700565..3a72cfaaa6a32 100644 --- a/pkgs/development/libraries/science/chemistry/tblite/python.nix +++ b/pkgs/development/libraries/science/chemistry/tblite/python.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, fetchpatch , meson , ninja , pkg-config @@ -42,8 +43,17 @@ buildPythonPackage { propagatedBuildInputs = [ tblite simple-dftd3 cffi numpy ]; - # Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors - patches = [ ./0001-fix-multicharge-dep-needed-for-static-compilation.patch ]; + + patches = [ + # Add multicharge to the meson deps; otherwise we get missing mod_multicharge errors + ./0001-fix-multicharge-dep-needed-for-static-compilation.patch + + # Toml-f 0.4.0 compatibility https://github.com/tblite/tblite/pull/108 + (fetchpatch { + url = "https://github.com/tblite/tblite/commit/e4255519b58a5198a5fa8f3073bef1c78a4bbdbe.diff"; + hash = "sha256-BMwYsdWfK+vG3BFgzusLYfwo0WXrYSPxJoEJIyOvbPg="; + }) + ]; format = "other"; pythonImportsCheck = [ "tblite" "tblite.interface" ]; diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/development/libraries/science/math/bonmin/default.nix index 7f494b245c304..5a736f976957d 100644 --- a/pkgs/development/libraries/science/math/bonmin/default.nix +++ b/pkgs/development/libraries/science/math/bonmin/default.nix @@ -17,13 +17,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "bonmin"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "coin-or"; repo = "Bonmin"; rev = "releases/${version}"; - sha256 = "sha256-HU25WjvG01oL3U1wG6ivTcYaN51MMxgLdKZ3AkDNe2Y="; + sha256 = "sha256-nqjAQ1NdNJ/T4p8YljEWRt/uy2aDwyBeAsag0TmRc5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix index 40c00dfea88f0..4d820c0e36dc1 100644 --- a/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sdbus-cpp"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "kistler-group"; repo = "sdbus-cpp"; rev = "v${version}"; - hash = "sha256-S/8/I2wmWukpP+RGPxKbuO44wIExzeYZL49IO+KOqg4="; + hash = "sha256-AOqwC7CABvQsG9P1PnUg2DIhNmHqYpgbKzm9C2gWNIQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 873e107513a15..5ac49ac278fc9 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-81CvuQduIV1R/FN7nbVIQQs79B/Cy1ylOldNXix1KMw="; + sha256 = "sha256-d1tJJCHbx+7klS918Db7S2N8zCdvd9MhI5ybxJpncUw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/text-engine/default.nix b/pkgs/development/libraries/text-engine/default.nix index f578ae000baf6..0a9004d01a588 100644 --- a/pkgs/development/libraries/text-engine/default.nix +++ b/pkgs/development/libraries/text-engine/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , json-glib @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-YSG4Vk3hrmtaJkK1WAlQcdgiDdgC4Un0t6UdaoIcUes="; }; + patches = [ + # Fixes build with newer versions of clang + (fetchpatch { + url = "https://github.com/mjakeman/text-engine/commit/749c94d853c0b0e29e79a1b270ec61947b65c319.patch"; + hash = "sha256-vs/a8IBovArw8tc1ZLUsaDHRVyA71KMB1NGENOKNOdk="; + }) + ]; + nativeBuildInputs = [ gobject-introspection gtk4 meson ninja pkg-config ]; buildInputs = [ libadwaita json-glib libxml2 ]; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 559ef8d207006..02b202365b9bf 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Vc"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "sha256-fv0FHAl0xvAFybR/jwhX2LkozwEDy1TNcbVAmRRnLVU="; + sha256 = "sha256-tbHDGbul68blBAvok17oz7AfhHpEY9Y7RIEsqCQvOJ0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 4c60ccf6c8ba1..35280e4b5eb3c 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -5,37 +5,63 @@ , autoreconfHook , util-linux , openssl +# The primary --enable-XXX variant. 'all' enables most features, but causes build-errors for some software, +# requiring to build a special variant for that software. Example: 'haproxy' +, variant ? "all" +, extraConfigureFlags ? [] +, enableLto ? !(stdenv.isDarwin || stdenv.hostPlatform.isStatic || stdenv.cc.isClang) }: - -stdenv.mkDerivation rec { - pname = "wolfssl"; +stdenv.mkDerivation (finalAttrs: { + pname = "wolfssl-${variant}"; version = "5.6.3"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; - rev = "refs/tags/v${version}-stable"; + rev = "refs/tags/v${finalAttrs.version}-stable"; hash = "sha256-UN4zs+Rxh/bsLD1BQA+f1YN/UOJ6OB2HduhoetEp10Y="; }; postPatch = '' patchShebangs ./scripts - # ocsp tests require network access - sed -i -e '/ocsp\.test/d' -e '/ocsp-stapling\.test/d' scripts/include.am + # ocsp stapling tests require network access, so skip them + sed -i -e'2s/.*/exit 77/' scripts/ocsp-stapling.test # ensure test detects musl-based systems too substituteInPlace scripts/ocsp-stapling2.test \ --replace '"linux-gnu"' '"linux-"' ''; - # Almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed configureFlags = [ - "--enable-all" - "--enable-base64encode" + "--enable-${variant}" + "--enable-reproducible-build" + ] ++ lib.optionals (variant == "all") [ + # Extra feature flags to add while building the 'all' variant. + # Since they conflict while building other variants, only specify them for this one. "--enable-pkcs11" "--enable-writedup" - "--enable-reproducible-build" - "--enable-tls13" - ]; + "--enable-base64encode" + ] ++ [ + # We're not on tiny embedded machines. + # Increase TLS session cache from 33 sessions to 20k. + "--enable-bigcache" + + # Use WolfSSL's Single Precision Math with timing-resistant cryptography. + "--enable-sp=yes${lib.optionalString (!stdenv.isx86_32) ",asm"}" + "--enable-sp-math-all" + "--enable-harden" + ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ + # Enable AVX/AVX2/AES-NI instructions, gated by runtime detection via CPUID. + "--enable-intelasm" + "--enable-aesni" + ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + # No runtime detection under ARM and no platform function checks like for X86. + # However, all ARM macOS systems have the supported extensions autodetected in the configure script. + "--enable-armasm=inline" + ] ++ extraConfigureFlags; + + # LTO should help with the C implementations. + env.NIX_CFLAGS_COMPILE = lib.optionalString enableLto "-flto"; + env.NIX_LDFLAGS_COMPILE = lib.optionalString enableLto "-flto"; outputs = [ "dev" @@ -60,19 +86,19 @@ stdenv.mkDerivation rec { ]; postInstall = '' - # fix recursive cycle: - # wolfssl-config points to dev, dev propagates bin - moveToOutput bin/wolfssl-config "$dev" - # moveToOutput also removes "$out" so recreate it - mkdir -p "$out" + # fix recursive cycle: + # wolfssl-config points to dev, dev propagates bin + moveToOutput bin/wolfssl-config "$dev" + # moveToOutput also removes "$out" so recreate it + mkdir -p "$out" ''; meta = with lib; { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; - changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${version}-stable"; + changelog = "https://github.com/wolfSSL/wolfssl/releases/tag/v${finalAttrs.version}-stable"; platforms = platforms.all; license = licenses.gpl2Plus; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab vifino ]; }; -} +}) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 45de5b603b674..280602eee59b1 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-u+INjo9EkW433OYoCDZpw5pcW1DyF/t/J5ntLZX+6aA="; + hash = "sha256-tuLNNhQA9HGax1aueZHQ+eB2dyIQnKjlmarp7e6Jplc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 49d042886b731..2a44ffc443825 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ xgb ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "dmlc"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-HKITioCvBZHZWKFWwe9KbrFP+Nbz8adbZJvQiqApjUQ="; + hash = "sha256-tRx6kJwIoVSN701ppuyZpIFUQIFy4LBMFyirLtwApjA="; }; nativeBuildInputs = [ cmake ] @@ -144,7 +144,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; platforms = platforms.unix; - broken = stdenv.isDarwin; maintainers = with maintainers; [ abbradar nviets ]; }; } diff --git a/pkgs/development/lua-modules/updater/default.nix b/pkgs/development/lua-modules/updater/default.nix new file mode 100644 index 0000000000000..40c93b21e8318 --- /dev/null +++ b/pkgs/development/lua-modules/updater/default.nix @@ -0,0 +1,49 @@ +{ buildPythonApplication +, nix +, makeWrapper +, python3Packages +, lib +# , nix-prefetch-git +, nix-prefetch-scripts +, luarocks-nix +}: +let + + path = lib.makeBinPath [ nix nix-prefetch-scripts luarocks-nix ]; +in +buildPythonApplication { + pname = "luarocks-packages-updater"; + version = "0.1"; + + format = "other"; + + nativeBuildInputs = [ + makeWrapper + python3Packages.wrapPython + ]; + propagatedBuildInputs = [ + python3Packages.gitpython + ]; + + dontUnpack = true; + + installPhase = + '' + mkdir -p $out/bin $out/lib + cp ${./updater.py} $out/bin/luarocks-packages-updater + cp ${../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py + + # wrap python scripts + makeWrapperArgs+=( --prefix PATH : "${path}" --prefix PYTHONPATH : "$out/lib" ) + wrapPythonProgramsIn "$out" + ''; + + shellHook = '' + export PYTHONPATH="maintainers/scripts:$PYTHONPATH" + export PATH="${path}:$PATH" + ''; + + meta.mainProgram = "luarocks-packages-updater"; +} + + diff --git a/maintainers/scripts/update-luarocks-packages b/pkgs/development/lua-modules/updater/updater.py index 32c2b44260b32..89a9bd9823a72 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/pkgs/development/lua-modules/updater/updater.py @@ -1,6 +1,4 @@ -#!/usr/bin/env nix-shell -#!nix-shell update-luarocks-shell.nix -i python3 - +#!/usr/bin/env python # format: # $ nix run nixpkgs#python3Packages.black -- update.py # type-check: @@ -32,12 +30,9 @@ from pluginupdate import update_plugins, FetchConfig, CleanEnvironment PKG_LIST = "maintainers/scripts/luarocks-packages.csv" TMP_FILE = "$(mktemp)" GENERATED_NIXFILE = "pkgs/development/lua-modules/generated-packages.nix" -LUAROCKS_CONFIG = "maintainers/scripts/luarocks-config.lua" HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! -Regenerate it with: -nixpkgs$ ./maintainers/scripts/update-luarocks-packages - +Regenerate it with: nix run nixpkgs#update-luarocks-packages You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ """.format( @@ -76,6 +71,12 @@ class LuaPlugin: # rename Editor to LangUpdate/ EcosystemUpdater class LuaEditor(pluginupdate.Editor): + + def create_parser(self): + parser = super().create_parser() + parser.set_defaults(proc=1) + return parser + def get_current_plugins(self): return [] @@ -101,9 +102,8 @@ class LuaEditor(pluginupdate.Editor): with tempfile.NamedTemporaryFile("w+") as f: f.write(HEADER) header2 = textwrap.dedent( - # header2 = inspect.cleandoc( """ - { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: + { stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: final: prev: { """ @@ -165,12 +165,7 @@ def generate_pkg_nix(plug: LuaPlugin): Our cache key associates "p.name-p.version" to its rockspec """ log.debug("Generating nix expression for %s", plug.name) - custom_env = os.environ.copy() - custom_env["LUAROCKS_CONFIG"] = LUAROCKS_CONFIG - # we add --dev else luarocks wont find all the "scm" (=dev) versions of the - # packages - # , "--dev" cmd = ["luarocks", "nix"] if plug.maintainers: @@ -201,7 +196,7 @@ def generate_pkg_nix(plug: LuaPlugin): log.debug("running %s", " ".join(cmd)) - output = subprocess.check_output(cmd, env=custom_env, text=True) + output = subprocess.check_output(cmd, text=True) output = "callPackage(" + output.strip() + ") {};\n\n" return (plug, output) @@ -211,8 +206,8 @@ def main(): "lua", ROOT, "", - default_in=ROOT.joinpath(PKG_LIST), - default_out=ROOT.joinpath(GENERATED_NIXFILE), + default_in=PKG_LIST, + default_out=GENERATED_NIXFILE, ) editor.run() @@ -220,5 +215,3 @@ def main(): if __name__ == "__main__": main() - -# vim: set ft=python noet fdm=manual fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : diff --git a/pkgs/development/misc/breakpad/default.nix b/pkgs/development/misc/breakpad/default.nix index 045e2e8f9a6e4..29c1b8b642a4f 100644 --- a/pkgs/development/misc/breakpad/default.nix +++ b/pkgs/development/misc/breakpad/default.nix @@ -1,30 +1,27 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchgit, zlib }: let lss = fetchgit { url = "https://chromium.googlesource.com/linux-syscall-support"; - rev = "d9ad2969b369a9f1c455fef92d04c7628f7f9eb8"; - sha256 = "952dv+ZE1ge/WF5RyHmEqht+AofoRHKAeFmGasVF9BA="; + rev = "v2022.10.12"; + hash = "sha256-rF10v5oH4u9i9vnmFCVVl2Ew3h+QTiOsW64HeB0nRQU="; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { pname = "breakpad"; - version = "unstable-3b3469e"; + version = "2023.01.27"; src = fetchgit { url = "https://chromium.googlesource.com/breakpad/breakpad"; - rev = "3b3469e9ed0de3d02e4450b9b95014a4266cf2ff"; - sha256 = "bRGOBrGPK+Zxp+KK+E5MFkYlDUNVhVeInVSwq+eCAF0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-8msKz0K10r13TwM3oS6GCIlMdf8k8HBKfKJkPmrUrIs="; }; + buildInputs = [ zlib ]; + postUnpack = '' ln -s ${lss} $sourceRoot/src/third_party/lss ''; - postPatch = '' - substituteInPlace src/client/linux/handler/exception_handler.cc \ - --replace "max(16384" "max(static_cast<long>(16384)" - ''; - meta = with lib; { description = "An open-source multi-platform crash reporting system"; homepage = "https://chromium.googlesource.com/breakpad"; @@ -32,4 +29,4 @@ in stdenv.mkDerivation { maintainers = with maintainers; [ berberman ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 53c1dc13cdc93..f8b5c9f5610c3 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "genymotion"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin"; name = "genymotion-${version}-linux_x64.bin"; - sha256 = "sha256-rZyTdVn0mnNLrGPehah62/AvTgUpNEtzn+Di1O3G3Sg="; + sha256 = "sha256-Bgp2IB8af5FV2W22GlAkzybLB/5UYnJSC607OZHejjo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 5f491a1bb6d35..2449308567e4e 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -5,13 +5,13 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-expat"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-expat"; rev = "v${version}"; - sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q"; + hash = "sha256-eDA6MUcztaI+fpunWBdanNnPo9Y5gvbj/ViVcxYYEBg="; }; prePatch = '' diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index b1e447a4a7c77..fec3b438abbe3 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -2,23 +2,23 @@ php.buildComposerProject (finalAttrs: { pname = "box"; - version = "4.3.8"; + version = "4.5.0"; src = fetchFromGitHub { owner = "box-project"; repo = "box"; rev = finalAttrs.version; - hash = "sha256-v1J84nqaX36DrLLH5kld+8NIymqtt5/5nJWJNCBVFRE="; + hash = "sha256-6icHXRxqre2RBIRoc3zfQnxGRHh2kIen2oLJ3eQjD/0="; }; - vendorHash = "sha256-LWggAUBMKljxa7HNdJMqOD/sx3IWCOQSqbYEnGntjN0="; + vendorHash = "sha256-n/F/il1u+3amSVf8fr0scZSkXuwxW43iq5F2XQJ3xfM="; meta = { changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}"; description = "An application for building and managing Phars"; - license = lib.licenses.mit; homepage = "https://github.com/box-project/box"; - maintainers = lib.teams.php.members; + license = lib.licenses.mit; mainProgram = "box"; + maintainers = lib.teams.php.members; }; }) diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix index 9a81321898ccd..7cb150264cf71 100644 --- a/pkgs/development/python-modules/a2wsgi/default.nix +++ b/pkgs/development/python-modules/a2wsgi/default.nix @@ -4,24 +4,22 @@ , asgiref , httpx , pdm-backend -, pdm-pep517 , pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "a2wsgi"; - version = "1.7.0"; + version = "1.8.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-qQb2LAJQ6wIBEguTQX3QsSsQW12zWvQxv+hu8NxburI="; + hash = "sha256-sgQ2uS8z25/xQ2vmS4boLhhwluu10aUt4nlKcNuYFRA="; }; nativeBuildInputs = [ pdm-backend - pdm-pep517 ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 0362b5b3d4c24..589799c1b848f 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.9.2"; + version = "2.9.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-6SZHr81OiqzKh977RrJtrDvFlAIjguK+1imP3bjxhS8="; + hash = "sha256-aO0+O7Ts9phsV4ghunNolxfAruGBbC+tHjVkmFedcCI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index dcfdece2ef604..a62031c079d9d 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.73"; + version = "9.2.74"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wMHyp6l7a5MuVX/q1QVfwZbuqBT6NbFltZsGopCjj3I="; + hash = "sha256-lZJLYIZ44FXGavDCrO90DYSl4yaNDpAYeIIihk5Bk14="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 2a52a28d007d8..de5d1184b2b79 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -1,21 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder + +# build-system +, cython_3 +, setuptools + +# dependencies , async-timeout , chacha20poly1305-reuseable -, mock , noiseprotocol , protobuf +, zeroconf + +# tests +, mock , pytest-asyncio , pytestCheckHook -, pythonOlder -, zeroconf }: buildPythonPackage rec { pname = "aioesphomeapi"; - version = "18.1.0"; - format = "setuptools"; + version = "18.2.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -23,31 +31,36 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aKE2/xVkO2uYg9BuDT9/ZxcKB9rARCipPn7B/eeth9M="; + hash = "sha256-uOF9VSASzGA4pVW3puQtGrr2dy7sRESa1a6DPUsMmL4="; }; + nativeBuildInputs = [ + setuptools + cython_3 + ]; + propagatedBuildInputs = [ - async-timeout chacha20poly1305-reuseable noiseprotocol protobuf zeroconf + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout ]; + pythonImportsCheck = [ + "aioesphomeapi" + ]; nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook ]; - pythonImportsCheck = [ - "aioesphomeapi" - ]; - meta = with lib; { + changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/v${version}"; description = "Python Client for ESPHome native API"; homepage = "https://github.com/esphome/aioesphomeapi"; - changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab hexa ]; }; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index b988abe60108f..f01b17639e8b2 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -18,9 +18,7 @@ , aiodns , brotli , faust-cchardet -, asynctest , typing-extensions -, idna-ssl # tests_require , async-generator , freezegun @@ -75,11 +73,6 @@ buildPythonPackage rec { aiodns brotli faust-cchardet - ] ++ lib.optionals (pythonOlder "3.8") [ - asynctest - typing-extensions - ] ++ lib.optionals (pythonOlder "3.7") [ - idna-ssl ]; # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info. diff --git a/pkgs/development/python-modules/aionotify/default.nix b/pkgs/development/python-modules/aionotify/default.nix deleted file mode 100644 index 0483793c7bb00..0000000000000 --- a/pkgs/development/python-modules/aionotify/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, asynctest -, pythonOlder -}: - -buildPythonPackage rec { - pname = "aionotify"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "rbarrois"; - repo = "aionotify"; - rev = "v${version}"; - sha256 = "1sk9i8czxgsbrswsf1nlb4c82vgnlzi8zrvrxdip92w2z8hqh43y"; - }; - - disabled = pythonOlder "3.5"; - - preCheck = '' - substituteInPlace tests/test_usage.py \ - --replace "asyncio.wait_for(task, timeout, loop=self.loop)" "asyncio.wait_for(task, timeout)" - ''; - - nativeCheckInputs = [ - asynctest - ]; - - meta = with lib; { - homepage = "https://github.com/rbarrois/aionotify"; - description = "Simple, asyncio-based inotify library for Python"; - license = with lib.licenses; [ bsd2 ]; - platforms = platforms.linux; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index 0e8e7927ddca2..43f3ae89f1383 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiostream"; - version = "0.5.1"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YdVvUP1b/NfXpbJ83ktjtXaVLHS6CQUGCw+EVygB4fU="; + hash = "sha256-g2W2TtCh2ANPjeTdASVgEu+qKfz/Ugh1rDWJcFvOJpI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 9767a0475a825..a4bd117d8e674 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.73"; + version = "9.2.74"; pyproject = true; disabled = pythonOlder "3.11"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-WwgcKZWKM6x36AuynVHaDJgDt4B2b3K1ZaX9efxiDKc="; + hash = "sha256-8t7S+VR9AqYpaAP772Wn1foVy/XN9MiEUZb5+u47G+k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index ef0ffe778e462..8086ecec1139a 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling , anyio , distro , httpx @@ -16,8 +16,8 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.3.13"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -25,11 +25,11 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-2sw/tzbKd0d4sSHM+PYTE/XeqkycFFLfG1c/lyrU4Jc="; + hash = "sha256-+EiFp55tPsILl6uuTh9qmeQDMKlUzegn3xUo6BupN2E="; }; nativeBuildInputs = [ - poetry-core + hatchling ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index a83d8748d477e..2565a3475104c 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "anytree"; - version = "2.9.0"; + version = "2.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "c0fec0de"; repo = "anytree"; rev = "refs/tags/${version}"; - hash = "sha256-e7mmOOvrZuMCcyUg74YLLXGzkb5nCtuYmhNzAbY65gg="; + hash = "sha256-9rxrHZBlQarfpYQvo6bJPGF+cdSROlwq+8TjXI18HDs="; }; patches = lib.optionals withGraphviz [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 928a386e59cd5..1e059d7c82bc2 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.73"; + version = "9.2.74"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-D6ZMZzuWoCSKSAEnVqU5iM4ttpeBNojofMW/vsV8gVw="; + hash = "sha256-n/51N1D5UI2FTKv7GBN/iPYE/+/o/2JnFTRee+1FVWg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index cc0ae612ce559..5eec27d6782f6 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.1.1"; + version = "3.1.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kislyuk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-N1Us/dpF/y638qIuwTzBiuv4vXfBMtWxmQnMBxNTUuc="; + hash = "sha256-vKXHmCcZZTjVBwQZWtyRjJT4tTuIiK5Qos9yJT/mpag="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 8179d054a97f3..6f6ba426687ee 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.17.0"; + version = "1.18.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ggw6ABPn3d+aOj+0ETKYWWTha/2Recdnp/LGBXG1HY4="; + hash = "sha256-2VWzmNMdd4WXSBrMSmclpjSZ9jDKNG7GbndUh8zLmgQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index 5d138ae856670..c990c9477bbf8 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "asciimatics"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - hash = "sha256-FtIM5CIQtDTrBbpGns24KTrH7TwM4N1PcOMNctdgIic="; + hash = "sha256-z905gEJydRnYtz5iuO+CwL7P7U60IImcO5bJjQuWgho="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index bdc436c8fdc47..663c71b926ea8 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.13.2"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mR5THEu32+xit1SHjZajJGM4qsEaKM48PpkBj7L1gow="; + hash = "sha256-4D7y0TH7tDcbQBhxhFLOjHNaSO3+ATnSq9zkwYekWcM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index b40a680fb381d..165665b5a1b37 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.4.2"; + version = "4.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "auth0"; repo = "auth0-python"; rev = "refs/tags/${version}"; - hash = "sha256-RBkAuZQx7mBxVCpo5PoBiEge8+yTmp0XpcnxCkOsM6U="; + hash = "sha256-kWlfckSjBxgzLd1ND4M0btt/+zfSHj5h4V/uDLmnHaA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index b55977ffdb61e..00e01ba80bf1d 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "24"; + version = "25"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-KJE/zw9+5NaZNXQsED+kIu1R+Ng7ZOywy+mebmY/SwY="; + hash = "sha256-Fhq6XUt5CYz/l+Lf9WcCnt9rs3byMQIQs7hFexr2tjM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index 85220841e0417..3b6c5fd88b7bf 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -1,31 +1,28 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common -, azure-mgmt-nspkg , azure-mgmt-core -, isPy3k +, buildPythonPackage +, fetchPypi +, isodate +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "12.0.0"; + version = "13.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; + hash = "sha256-yJ8jTeT4Gu23YSHl5GZ0+zdlC3s+GIxS4ir8z/HBkA4="; }; propagatedBuildInputs = [ - msrest - msrestazure + isodate azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; # has no tests @@ -34,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure CDN Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-cdn_${version}/sdk/cdn/azure-mgmt-cdn/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index f75b262df3a09..bc20dcdfb6020 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -4,29 +4,25 @@ , pythonOlder , azure-common , azure-mgmt-core -, msrest -, typing-extensions +, isodate }: buildPythonPackage rec { pname = "azure-mgmt-containerregistry"; - version = "10.1.0"; + version = "10.2.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc="; - extension = "zip"; + hash = "sha256-i7i/5ofGxiF9/wTAPnUOaZ6FAgK3EaBqoHeSC8HuXCo="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions + isodate ]; # no tests included @@ -40,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Container Registry Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerregistry_${version}/sdk/containerregistry/azure-mgmt-containerregistry/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 4707f8bc2ae9a..04cff63317d13 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "26.0.0"; + version = "27.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BpvnSqee5wodtMXPxo/pHCBk8Yy4yPnEdK164d9ILuM="; + hash = "sha256-IdGo2A65YiMJJ8S18Ji+FfnnylNhs8vFOQpfA91wgNM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 46061f5a00285..8b5ae2435d0db 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -4,28 +4,25 @@ , pythonOlder , azure-common , azure-mgmt-core -, msrest -, msrestazure +, isodate }: buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "10.1.0"; + version = "11.0.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM="; - extension = "zip"; + hash = "sha256-00cDFHpaEciRQLHM+Kt3uOtw/geOn5+onrY7lav6EeU="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate ]; # no tests included @@ -39,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure NetApp Files Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_${version}/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix index 01c079225f105..5a3a23a4e3d07 100644 --- a/pkgs/development/python-modules/bambi/default.nix +++ b/pkgs/development/python-modules/bambi/default.nix @@ -2,31 +2,29 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, pytestCheckHook +, setuptools , arviz -, blackjax , formulae , graphviz -, numpy -, numpyro , pandas , pymc -, scipy -, setuptools +, blackjax +, numpyro +, pytestCheckHook }: buildPythonPackage rec { pname = "bambi"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bambinos"; repo = "bambi"; rev = "refs/tags/${version}"; - hash = "sha256-36D8u813v2vWQdNqBWfM8YVnAJuLGvn5vqdHs94odmU="; + hash = "sha256-9+uTyV3mQlHOKAjXohwkhTzNe/+I5XR/LuH1ZYvhc8I="; }; nativeBuildInputs = [ @@ -36,10 +34,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ arviz formulae - numpy + graphviz pandas pymc - scipy ]; preCheck = '' @@ -48,7 +45,6 @@ buildPythonPackage rec { nativeCheckInputs = [ blackjax - graphviz numpyro pytestCheckHook ]; @@ -56,17 +52,32 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_alias_equal_to_name" + "test_average_by" + "test_ax" + "test_basic" + "test_censored_response" "test_custom_prior" "test_data_is_copied" "test_distributional_model" + "test_elasticity" "test_extra_namespace" + "test_fig_kwargs" "test_gamma_with_splines" + "test_group_effects" + "test_hdi_prob" + "test_legend" "test_non_distributional_model" "test_normal_with_splines" "test_predict_offset" "test_predict_new_groups" "test_predict_new_groups_fail" "test_set_alias_warnings" + "test_subplot_kwargs" + "test_transforms" + "test_use_hdi" + "test_with_groups" + "test_with_group_and_panel" + "test_with_user_values" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 13cc8d9917742..846b58a677b8e 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.36.7"; + version = "0.36.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-j7Awqt14/J0BbYcKwIR10UtVeqt9BpQkzT8dqGRVEOU="; + hash = "sha256-+p3As+fi6mw9i5q2klFTM9QQ2JoQarwrphc6tB6C94M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix index ee6dcb44d57db..1bb3a5b46eb4b 100644 --- a/pkgs/development/python-modules/bincopy/default.nix +++ b/pkgs/development/python-modules/bincopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bincopy"; - version = "17.14.5"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - hash = "sha256-X03nw3o9t63PPtxIM6Ij8zVtm/CL5y7G5DHJ8KzSnxg="; + hash = "sha256-aDVkrTBEhrTP1Oc/kiE9ZsJ+8fDGXcb2+FSMQP0X0lY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix index 176c49819dbf1..1a77c2bcb881c 100644 --- a/pkgs/development/python-modules/camel-converter/default.nix +++ b/pkgs/development/python-modules/camel-converter/default.nix @@ -9,21 +9,21 @@ buildPythonPackage rec { pname = "camel-converter"; - version = "3.0.3"; - format = "pyproject"; + version = "3.1.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sanders41"; - repo = pname; + repo = "camel-converter"; rev = "refs/tags/v${version}"; - hash = "sha256-0sNb1zg8cnDjQQnStfe1k8uB1GpmNtd/VwqSqTcLmj0="; + hash = "sha256-ASUwSA63iUgeRfYdO6InZ8YzEbifQh1hr3fUbE3FYac="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov=camel_converter --cov-report term-missing" "" + --replace "--cov=camel_converter --cov-report term-missing --no-cov-on-fail" "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/casa-formats-io/default.nix b/pkgs/development/python-modules/casa-formats-io/default.nix index dd9d94715ecf2..4e4d10bd2731f 100644 --- a/pkgs/development/python-modules/casa-formats-io/default.nix +++ b/pkgs/development/python-modules/casa-formats-io/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "casa-formats-io"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-8iZ+wcSfh5ACTb3/iQAf2qQpwZ6wExWwcdJoLmCEjB0="; + hash = "sha256-EOX+tal9nrON2K7mHVYSTTxja6mu2k3Bag8bhL3JHJs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 6caadcff5af80..b4d0c4b407656 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "9.9.0"; + version = "9.9.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YZYawFGpGPK0T4MlWHwONqcx1fwcoZiNalhU2ydM+mo="; + hash = "sha256-9h/d1w5toxWMHMvVkQiuHySf3+IjeumD4EipgI1kaEs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index f0b833396838f..14e6cbd811fad 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.73"; + version = "9.2.74"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-6wXhGMpMCh/xKmwQwvzQCgk8IQaZqDrgBh12paagkpE="; + hash = "sha256-TNnv2V8QtSA5oiCHVqIuvbgGNTjfIw4WS1K2MxXfJIw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 47d2715290cdd..6dbaac73b6bd0 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.73"; + version = "9.2.74"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-x67mvpRvqJIrYrqdNt8AueHahCOt0AHurzWIkYx1veQ="; + hash = "sha256-KaHAgGPspFGFPNULfXcVwXpl5RdkKHAQV/coJeMSGLQ="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-IBqNr5ILPzsRLSf7tsu/oTXXOnMPon6LrMnUq4i6oDA="; + hash = "sha256-e13tsrLAZu67eyUvBYtfkBASEsxdcVwJmKCHBiU78Dg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix new file mode 100644 index 0000000000000..ae22d4bcafbfa --- /dev/null +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, flit-core +, importlib-metadata +, typing-extensions +, cloudpathlib +, azure-storage-blob +, google-cloud-storage +, boto3 +, psutil +, pydantic +, pytestCheckHook +, pytest-cases +, pytest-cov +, pytest-xdist +, python-dotenv +, shortuuid +}: + +buildPythonPackage rec { + pname = "cloudpathlib"; + version = "0.16.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "drivendataorg"; + repo = "cloudpathlib"; + rev = "v${version}"; + hash = "sha256-d4CbzPy3H5HQ4YmSRCRMEYaTpwB7F0Bznd26aKWiHTA="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + importlib-metadata + typing-extensions + ]; + + passthru.optional-dependencies = { + all = [ + cloudpathlib + ]; + azure = [ + azure-storage-blob + ]; + gs = [ + google-cloud-storage + ]; + s3 = [ + boto3 + ]; + }; + + pythonImportsCheck = [ "cloudpathlib" ]; + + nativeCheckInputs = [ + azure-storage-blob + boto3 + google-cloud-storage + psutil + pydantic + pytestCheckHook + pytest-cases + pytest-cov + pytest-xdist + python-dotenv + shortuuid + ]; + + meta = with lib; { + description = "Python pathlib-style classes for cloud storage services such as Amazon S3, Azure Blob Storage, and Google Cloud Storage"; + homepage = "https://github.com/drivendataorg/cloudpathlib"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/complycube/default.nix b/pkgs/development/python-modules/complycube/default.nix new file mode 100644 index 0000000000000..ee99ae8d28bd3 --- /dev/null +++ b/pkgs/development/python-modules/complycube/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyhumps +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "complycube"; + version = "1.1.6"; + pyproject = true; + + src = fetchPypi rec { + inherit version; + pname = "complycube"; + hash = "sha256-hetcn5RX582CRVmtG5dAvr+NXD+7NKJjaqgOo8LlpqM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pyhumps + requests + ]; + + pythonImportsCheck = [ + "complycube" + ]; + + meta = { + homepage = "https://complycube.com"; + description = "Official Python client for the ComplyCube API"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/compressai/default.nix b/pkgs/development/python-modules/compressai/default.nix new file mode 100644 index 0000000000000..47487a6f633f4 --- /dev/null +++ b/pkgs/development/python-modules/compressai/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pybind11 +, setuptools +, wheel +, numpy +, matplotlib +, pytorch-msssim +, scipy +, torch +, torchvision +, ipywidgets +, jupyter +, plotly +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "compressai"; + version = "1.2.4"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "InterDigitalInc"; + repo = "CompressAI"; + rev = "refs/tags/v${version}"; + hash = "sha256-nT2vd7t67agIWobJalORbRuns0UJGRGGbTX2/8vbTiY="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pybind11 + setuptools + wheel + ]; + + propagatedBuildInputs = [ + numpy + matplotlib + pytorch-msssim + scipy + torch + torchvision + ]; + + passthru.optional-dependencies = { + tutorials = [ + ipywidgets + jupyter + ]; + }; + + pythonImportsCheck = [ + "compressai" + "compressai._CXX" + ]; + + preCheck = '' + # We have to delete the source because otherwise it is used intead the installed package. + rm -rf compressai + + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + plotly + pytestCheckHook + ]; + + disabledTests = [ + # Those tests require internet access to download some weights + "test_image_codec" + "test_update" + "test_eval_model_pretrained" + "test_cheng2020_anchor" + "test_pretrained" + ]; + + meta = with lib; { + description = "A PyTorch library and evaluation platform for end-to-end compression research"; + homepage = "https://github.com/InterDigitalInc/CompressAI"; + license = licenses.bsd3Clear; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix index 9185fe48bb9d3..79faced6c3c5b 100644 --- a/pkgs/development/python-modules/coredis/default.nix +++ b/pkgs/development/python-modules/coredis/default.nix @@ -60,6 +60,6 @@ buildPythonPackage rec { homepage = "https://github.com/alisaifee/coredis"; changelog = "https://github.com/alisaifee/coredis/blob/${src.rev}/HISTORY.rst"; license = licenses.mit; - maintainers = with maintainers; [ netali ]; + maintainers = teams.wdz.members; }; } diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index 1eab372381bc0..d0a9c3d7eb9f8 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "cryptoparser"; - version = "0.10.0"; + version = "0.10.3"; format = "pyproject"; src = fetchPypi { pname = "CryptoParser"; inherit version; - hash = "sha256-43V82/nxtOa9y4fVOMsxhoSQpDxTyOcHIGsbRr0euAk="; + hash = "sha256-FvSs0LeyuobkJhJd5vlR+Bm4LqGxPvPTogsYKtHOpVw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix index 1959794fcc693..85d20fc6f464b 100644 --- a/pkgs/development/python-modules/cwcwidth/default.nix +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cwcwidth"; - version = "0.1.8"; + version = "0.1.9"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-WtwDS3yQ5qhYa9BGvL9gBONeFrDX4x3jlVE6UNcpu/Y="; + hash = "sha256-8Z0RoBSNSoys0GTJbpO8qM40FaGGroIEA49F4Qjbdrg="; }; nativeBuildInputs = [ cython setuptools ]; diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix index 09ff7c52bdded..3d756312dedab 100644 --- a/pkgs/development/python-modules/digitalocean/default.nix +++ b/pkgs/development/python-modules/digitalocean/default.nix @@ -40,6 +40,9 @@ buildPythonPackage rec { cd digitalocean ''; + # Test tries to access the network + disabledTests = ["TestFirewall"]; + pythonImportsCheck = [ "digitalocean" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/django-allauth-2fa/default.nix b/pkgs/development/python-modules/django-allauth-2fa/default.nix new file mode 100644 index 0000000000000..60a2d61bac275 --- /dev/null +++ b/pkgs/development/python-modules/django-allauth-2fa/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, django +, django-allauth +, django-otp +, fetchFromGitHub +, pythonOlder +, qrcode +, hatchling +}: + +buildPythonPackage rec { + pname = "django-allauth-2fa"; + version = "0.11.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "valohai"; + repo = "django-allauth-2fa"; + rev = "refs/tags/v${version}"; + hash = "sha256-bm2RwhvX2nfhYs74MM0iZl9U2gHgm0lLlh2tuRRcGso="; + }; + + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + django + django-allauth + django-otp + qrcode + ]; + + pythonImportsCheck = [ + "allauth_2fa" + ]; + + meta = with lib; { + description = "django-allauth-2fa adds two-factor authentication to django-allauth"; + homepage = "https://github.com/valohai/django-allauth-2fa"; + changelog = "https://github.com/valohai/django-allauth-2fa/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/django-pwa/default.nix b/pkgs/development/python-modules/django-pwa/default.nix new file mode 100644 index 0000000000000..91a216f0ac5cd --- /dev/null +++ b/pkgs/development/python-modules/django-pwa/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, django +, fetchFromGitHub +, python +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "django-pwa"; + version = "1.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "silviolleite"; + repo = "django-pwa"; + rev = "refs/tags/v${version}"; + hash = "sha256-tP1+Jm9hdvN/ZliuVHN8tqy24/tOK1LUUiJv1xUqRrY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + django + ]; + + pyImportCheck = [ + "pwa" + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} runtests.py + runHook postCheck + ''; + + meta = with lib; { + description = "A Django app to include a manifest.json and Service Worker instance to enable progressive web app behavoir"; + homepage = "https://github.com/silviolleite/django-pwa"; + changelog = "https://github.com/silviolleite/django-pwa/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix index e8763988fdb95..6cc982c5df532 100644 --- a/pkgs/development/python-modules/dns-lexicon/default.nix +++ b/pkgs/development/python-modules/dns-lexicon/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "dns_lexicon"; - version = "3.16.0"; + version = "3.16.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Analogj"; repo = "lexicon"; rev = "refs/tags/v${version}"; - hash = "sha256-GUYsTZPvsqGemViSqgEvYhyjTEut42akMq2ZK2P1fX0="; + hash = "sha256-79/zz0TOCpx26TEo6gi9JDBQeVW2azWnxAjWr/FGRLA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 81d4719db1df8..4645293981bb3 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.18.2"; + version = "2.19.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gfb4FtuaOEtzOwNcBPa/KM6dMI8ckf91ch1TZOxFHck="; + hash = "sha256-8VjKuYI4/IyQSMM/He5dQv5edoWChfB5+LLkLsjVSm0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 9dad3e76369ea..b577179abc7e5 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tEdYa3YkCE8qg6/XOxNm7kKULGk+KXxMkMNtW6T7+yw="; + hash = "sha256-yaZCx9NPdr2136Z8ig+5Db8+wUbZpSgzMSyILOQZCR8="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index a07eb1c2d07cd..d0c3e46dcc669 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.0.1"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jcgNNraMgsqTPNCbBcqEewe3jAXer4wn0aKqiUos+k8="; + hash = "sha256-qPGtYMpUFGQfSYEPabn4eC74lmr8xvet07RR5brV5No="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 21210376eca15..fb4c4561388ae 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.19.1"; + version = "0.19.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-xSW9ZeE2+vo2m2KaCW8lyotkHy7WVvNX16TDQEeQbQ4="; + hash = "sha256-EoBv7mxdT6G1n9as0V8Ad5QckMkqgC2GvcjRDc1+RzA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/enhancements/default.nix b/pkgs/development/python-modules/enhancements/default.nix deleted file mode 100644 index c9042e3d085ee..0000000000000 --- a/pkgs/development/python-modules/enhancements/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, argcomplete -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, typeguard -}: - -buildPythonPackage rec { - pname = "enhancements"; - version = "0.4.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "ssh-mitm"; - repo = "python-enhancements"; - rev = version; - hash = "sha256-Nff44WAQwSbkRpUHb9ANsQWWH2B819gtwQdXAjWJJls="; - }; - - propagatedBuildInputs = [ - argcomplete - typeguard - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "enhancements" - ]; - - meta = with lib; { - description = "Library which extends various Python classes"; - homepage = "https://enhancements.readthedocs.io"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 55685e35eb09b..b1b1080d20b75 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.19.0"; + version = "2.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-EFgd7NnHcA4T/BZZUR/z3Z4JxA0dWricasKyJAaDsHc="; + hash = "sha256-pRvUgK4OXVP2GR+Iu4ddqwApw0gYN4FkKjTpwbC1oWM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 4a05efc146baf..7a3bd82a51456 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -5,8 +5,6 @@ , mccabe , pycodestyle , pyflakes -, importlib-metadata -, pythonAtLeast , pytestCheckHook }: @@ -29,13 +27,8 @@ buildPythonPackage rec { mccabe pycodestyle pyflakes - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; - # Tests fail on Python 3.7 due to importlib using a deprecated interface - doCheck = pythonAtLeast "3.7"; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 42132b2da5399..6fd8b6b7330b8 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -5,6 +5,7 @@ , aniso8601 , jsonschema , flask +, importlib-resources , werkzeug , pytz , faker @@ -19,22 +20,23 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "python-restx"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-alXuo6TGDX2ko6VIKpAtyrg0EBkxEnC3DabH8GYqEs0="; + hash = "sha256-9o0lgDtjsZta9fVJnD02In6wvxNwPA667WeIkpRv8Z4="; }; propagatedBuildInputs = [ aniso8601 flask + importlib-resources jsonschema pytz werkzeug @@ -71,7 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fully featured framework for fast, easy and documented API development with Flask"; homepage = "https://github.com/python-restx/flask-restx"; - changelog = "https://github.com/python-restx/flask-restx/raw/${version}/CHANGELOG.rst"; + changelog = "https://github.com/python-restx/flask-restx/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 529a1a63913aa..81abf369a8a41 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools # extras: babel , babel @@ -11,7 +12,6 @@ , bcrypt , bleach , flask-mailman -, qrcode # extras: fsqla , flask-sqlalchemy @@ -21,20 +21,21 @@ # extras: mfa , cryptography , phonenumbers +, webauthn +, qrcode # propagates -, blinker , email-validator , flask , flask-login , flask-principal , flask-wtf -, itsdangerous , passlib +, importlib-resources +, wtforms # tests , argon2-cffi -, flask-mongoengine , mongoengine , mongomock , peewee @@ -46,31 +47,30 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.3.0"; - format = "setuptools"; + version = "5.3.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - hash = "sha256-n12DCRPqxm8YhFeVrl99BEvdDYNq6rzP662rain3k1Q="; + hash = "sha256-wLUHXfDWSp7zWwTIjTH79AWlkkNzb21tChpLSEWr8+U="; }; - postPatch = '' - # This should be removed after updating to version 5.3.0. - sed -i '/filterwarnings =/a ignore:pkg_resources is deprecated:DeprecationWarning' pytest.ini - ''; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ - blinker email-validator flask flask-login flask-principal flask-wtf - itsdangerous passlib + importlib-resources + wtforms ]; passthru.optional-dependencies = { @@ -82,7 +82,6 @@ buildPythonPackage rec { bcrypt bleach flask-mailman - qrcode ]; fsqla = [ flask-sqlalchemy @@ -92,12 +91,13 @@ buildPythonPackage rec { mfa = [ cryptography phonenumbers + webauthn + qrcode ]; }; nativeCheckInputs = [ argon2-cffi - flask-mongoengine mongoengine mongomock peewee @@ -112,6 +112,11 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.mfa; + disabledTests = [ + # needs /etc/resolv.conf + "test_login_email_whatever" + ]; + pythonImportsCheck = [ "flask_security" ]; diff --git a/pkgs/development/python-modules/floret/default.nix b/pkgs/development/python-modules/floret/default.nix new file mode 100644 index 0000000000000..08f59292a206e --- /dev/null +++ b/pkgs/development/python-modules/floret/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pybind11 +, setuptools +, wheel +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "floret"; + version = "0.10.4"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "floret"; + rev = "refs/tags/v${version}"; + hash = "sha256-cOVyvRwprR7SvZjH4rtDK8uifv6+JGyRR7XYzOP5NLk="; + }; + + nativeBuildInputs = [ + pybind11 + setuptools + wheel + ]; + + propagatedBuildInputs = [ + numpy + pybind11 + ]; + + pythonImportsCheck = [ "floret" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "FastText + Bloom embeddings for compact, full-coverage vectors with spaCy"; + homepage = "https://github.com/explosion/floret"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 89d493bc87d6b..a90fe66a48cc7 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -29,16 +29,16 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2023.9.1"; + version = "2023.10.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fsspec"; repo = "filesystem_spec"; - rev = version; - hash = "sha256-1ai+/8akUlP9kfzSKYEpDnobBfUC6EAPFPVVxh4jb/0="; + rev = "refs/tags/${version}"; + hash = "sha256-cLkCQQbb/AakDSz1NTrVlHh8LdgoqtjX8OPT+Nb1NA4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index aff899a188786..423cfd34a70f8 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -1,25 +1,25 @@ { lib , buildPythonPackage -, cloudscraper , fetchFromGitHub , garth , pdm-backend , pythonOlder , requests +, withings-sync }: buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.8"; + version = "0.2.9"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-jNDFSA6Mz0+7UhEVrCKcKDEX3B7yk6igBf59A6YlW2M="; + hash = "sha256-wQWOksI0nfzIMdxgZehMmNytuXWD22GLUNoI7Ki0C3s="; }; nativeBuildInputs = [ @@ -27,9 +27,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - cloudscraper garth requests + withings-sync ]; # Tests require a token diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 401508f566229..38b4af1e3adaf 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.31"; + version = "0.2.32"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h5FXb8abSpyCDnaRox3J0XFLvl6V9IMcePtTZ3wbTPM="; + hash = "sha256-Uj4f3OcPRqbMaM0ADP6OlPQAXFfCYZS0/qbz9eXGLv0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 0869a6e7f221c..fee868f6f0cee 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.12.0"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Pu3JsiONj9tsJkXaRV3nuo3wqaHSU4FZMqw6mMXuyc0="; + hash = "sha256-QKI6rrgJeC93AGL8JTWZMqbj4P/2WPs+LP0VunrQnlk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 91d97e68b096b..95c2ed0662cae 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.4.4"; + version = "3.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QFdErlCFIDTMR7MqmxuuUNP7Cc0eIWABQYKJHvV2ZpU="; + hash = "sha256-DfgkGrJ3GZuRnKODen3oUFk2P+oOPWYAYIcL587/wEc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 91b83b0f4eaaa..314a2249cdbd1 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.36.8"; + version = "0.36.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2lpmEfHUsnqoEXXyVZqly5ADxaqk+n5GsFTemAuwokU="; + hash = "sha256-5j6boIy2LnB3Y0ZzheTdflON8KaQkeQS5vkaPIsETGk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 97a7a55b26a4f..77d57a0a500bc 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.10.12"; + version = "2023.10.13"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mlZlaUcpVflz1mTiI0rIAOnJD5+NqXjsb1xp+wvoQvs="; + hash = "sha256-7zJhdFgEP/QSX78XMt+dxt0x7gUj011LHGi/+grPux0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index cb7e154887e04..0bb7f35e288f9 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.9.0"; + version = "4.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ikalchev"; repo = "HAP-python"; rev = "refs/tags/${version}"; - hash = "sha256-bFSqMAZWE3xTfnc7FSQMfAhxhKlYm65VFpm+q3yrqpE="; + hash = "sha256-nnh8PSEcuPN1qGuInJ7uYe83zdne8axbTrHd4g1xoJs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 7cb1daa10cf2e..ed9ea595a1af2 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -5,28 +5,34 @@ , requests , pytestCheckHook , pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "heatzypy"; - version = "2.1.5"; - format = "setuptools"; + version = "2.1.7"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Cyr-ius"; - repo = pname; + repo = "heatzypy"; rev = "refs/tags/${version}"; - hash = "sha256-Z60apquRzhkPbxgGKgDswtW9GUXGt9MbdAsh3Yh31b0="; + hash = "sha256-bMhxxVZs6fTKlUWtSO0jfzYCHa1WPf2faEjfrmfUg8E="; }; postPatch = '' - # https://github.com/Cyr-ius/heatzypy/issues/7 - substituteInPlace setup.py \ - --replace 'version="replace_by_workflow"' 'version="${version}"' + substituteInPlace pyproject.toml \ + --replace "replace_by_workflow" "${version}" ''; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ aiohttp requests @@ -40,8 +46,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python module to interact with Heatzy devices"; + description = "Module to interact with Heatzy devices"; homepage = "https://github.com/Cyr-ius/heatzypy"; + changelog = "https://github.com/cyr-ius/heatzypy/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index d91b01f52cc90..b7f08d38d6bfc 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2023.6.0"; + version = "2023.10.1"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-8LYB3BEDHOj6ItfFRK7ewbhjN604xXKY0YlymNjEO+g="; + hash = "sha256-KI5idrD8SIpzSYopELYWJJaaiAFQzwRwhFBfb4BEw2o="; }; propagatedBuildInputs = [ @@ -25,6 +25,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "chip.clusters" + "chip.clusters.ClusterObjects" + "chip.tlv" ]; doCheck = false; # no tests diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index ea6dc79d51d99..b8b865574f792 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2023.6.0"; + version = "2023.10.1"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-bRP82jTVSJS46WuO8MVWFvte+2mCOSsGFDBaXdmdPHI="; + hash = "sha256-mffjJtn0LmRz9DOWMMw9soYDDm/M1C5Tdj6YbWHaq2o="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { @@ -78,12 +78,17 @@ buildPythonPackage rec { pygobject3 ]; + pythonNamespaces = [ + "chip" + "chip.clusters" + ]; + pythonImportsCheck = [ "chip" "chip.ble" - # https://github.com/project-chip/connectedhomeip/pull/24376 - #"chip.configuration" + "chip.configuration" "chip.discovery" + "chip.exceptions" "chip.native" "chip.storage" ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 891d03cfc04c7..d53408aa1aca2 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.30"; + version = "2.5.31"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e3+yjd3jrcv4hU+0vCTl+bAzlYcfTdhLHr93briFxdI="; + hash = "sha256-rov80COnU8e6NXwHkafGGbJyhDTMLUSwxkmjmlw8QYU="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix index 6266e60f72844..a38fbf9f5a077 100644 --- a/pkgs/development/python-modules/intellifire4py/default.nix +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -1,51 +1,50 @@ { lib , aenum -, aiohttp -, asynctest , buildPythonPackage , fetchFromGitHub +, httpx +, poetry-core , pydantic -, pytest-mock +, pytest-asyncio +, pytest-httpx , pytestCheckHook , pythonOlder -, requests +, rich }: buildPythonPackage rec { pname = "intellifire4py"; - version = "2.2.2"; - format = "setuptools"; + version = "3.1.29"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jeeftor"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-iqlKfpnETLqQwy5sNcK2x/TgmuN2hCfYoHEFK2WWVXI="; + rev = "refs/tags/v${version}"; + hash = "sha256-isAVq45UnKB8uMg7bhehpxIk5OOLcWx+VNZhJ8dE52Y="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aenum - aiohttp + httpx pydantic - requests - ]; - - nativeCheckInputs = [ - asynctest - pytest-mock - pytestCheckHook - ]; - - disabledTests = [ - # Test file is missing - "test_json_files" + rich ]; pythonImportsCheck = [ "intellifire4py" ]; + nativeCheckInputs = [ + pytest-asyncio + pytest-httpx + pytestCheckHook + ]; meta = with lib; { description = "Module to read Intellifire fireplace status data"; diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix index 3c48dcc4d60be..eab0c1c360aa8 100644 --- a/pkgs/development/python-modules/invisible-watermark/default.nix +++ b/pkgs/development/python-modules/invisible-watermark/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -9,36 +10,61 @@ , pillow , pywavelets , numpy +, callPackage +, withOnnx ? false # Enables the rivaGan en- and decoding method }: buildPythonPackage rec { pname = "invisible-watermark"; - version = "0.1.5"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ShieldMnt"; repo = "invisible-watermark"; - rev = version; - hash = "sha256-NGDPEETuM7rYbo8kXYoRWLJWpa/lWLKEvaaiDzSWYZ4="; + rev = "e58e451cff7e092457cd915e445b1a20b64a7c8f"; # No git tag, see https://github.com/ShieldMnt/invisible-watermark/issues/22 + hash = "sha256-6SjVpKFtiiLLU7tZ3hBQr0KT/YEQyywJj0e21/dJRzk="; }; propagatedBuildInputs = [ opencv4 torch - onnx - onnxruntime pillow pywavelets numpy + ] ++ lib.optionals withOnnx [ + onnx + onnxruntime ]; postPatch = '' substituteInPlace setup.py \ --replace 'opencv-python>=4.1.0.25' 'opencv' + substituteInPlace imwatermark/rivaGan.py --replace \ + 'You can install it with pip: `pip install onnxruntime`.' \ + 'You can install it with an override: `python3Packages.invisible-watermark.override { withOnnx = true; };`.' ''; + passthru.tests = let + image = "${src}/test_vectors/original.jpg"; + methods = [ "dwtDct" "dwtDctSvd" "rivaGan" ]; + testCases = builtins.concatMap (method: [ + { method = method; withOnnx = true; } + { method = method; withOnnx = false; } + ]) methods; + createTest = { method, withOnnx }: let + testName = "${if withOnnx then "withOnnx" else "withoutOnnx"}-${method}"; + # This test fails in the sandbox on aarch64-linux, see https://github.com/microsoft/onnxruntime/issues/10038 + skipTest = stdenv.isLinux && stdenv.isAarch64 && withOnnx && method == "rivaGan"; + in lib.optionalAttrs (!skipTest) { + "${testName}" = callPackage ./tests/cli.nix { inherit image method testName withOnnx; }; + }; + allTests = builtins.map createTest testCases; + in (lib.attrsets.mergeAttrsList allTests) // { + python = callPackage ./tests/python { inherit image; }; + }; + pythonImportsCheck = [ "imwatermark" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/invisible-watermark/tests/cli.nix b/pkgs/development/python-modules/invisible-watermark/tests/cli.nix new file mode 100644 index 0000000000000..9cb936465786b --- /dev/null +++ b/pkgs/development/python-modules/invisible-watermark/tests/cli.nix @@ -0,0 +1,64 @@ +{ image +, method +, python3Packages +, runCommand +, testName +, withOnnx +}: + +# This file runs one test case. +# There are six test cases in total. method can have three possible values and +# withOnnx two possible values. 3 * 2 = 6. +# +# The case where the method is rivaGan and invisible-watermark is built +# without onnx is expected to fail and this case is handled accordingly. +# +# The test works by first encoding a message into a test image, +# then decoding the message from the image again and checking +# if the message was decoded correctly. + +let + message = if method == "rivaGan" then + "asdf" # rivaGan only supports 32 bits + else + "fnörd1"; + length = (builtins.stringLength message) * 8; + invisible-watermark' = python3Packages.invisible-watermark.override { inherit withOnnx; }; + expected-exit-code = if method == "rivaGan" && !withOnnx then "1" else "0"; +in +runCommand "invisible-watermark-test-${testName}" { nativeBuildInputs = [ invisible-watermark' ]; } '' + set +e + invisible-watermark \ + --verbose \ + --action encode \ + --type bytes \ + --method '${method}' \ + --watermark '${message}' \ + --output output.png \ + '${image}' + exit_code="$?" + set -euf -o pipefail + if [ "$exit_code" != '${expected-exit-code}' ]; then + echo "Exit code of invisible-watermark was $exit_code while ${expected-exit-code} was expected." + exit 1 + fi + if [ '${expected-exit-code}' == '1' ]; then + echo 'invisible-watermark failed as expected.' + touch "$out" + exit 0 + fi + decoded_message="$(invisible-watermark \ + --action decode \ + --type bytes \ + --method '${method}' \ + --length '${toString length}' \ + output.png \ + )" + + if [ '${message}' != "$decoded_message" ]; then + echo "invisible-watermark did not decode the watermark correctly." + echo "The original message was ${message} but the decoded message was $decoded_message." + exit 1 + fi + touch "$out" +'' diff --git a/pkgs/development/python-modules/invisible-watermark/tests/python/decode.py b/pkgs/development/python-modules/invisible-watermark/tests/python/decode.py new file mode 100644 index 0000000000000..c1b7e52ff6f51 --- /dev/null +++ b/pkgs/development/python-modules/invisible-watermark/tests/python/decode.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +import os +import cv2 +from imwatermark import WatermarkDecoder + +input_file = os.environ['image'] +output_file_path = os.environ['out'] +num_bits = int(os.environ['num_bits']) +method = os.environ['method'] + +bgr = cv2.imread(input_file) + +decoder = WatermarkDecoder('bytes', num_bits) +watermark = decoder.decode(bgr, method) +message = watermark.decode('utf-8') + +with open(output_file_path, 'w') as f: + f.write(message) diff --git a/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix b/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix new file mode 100644 index 0000000000000..63db588673711 --- /dev/null +++ b/pkgs/development/python-modules/invisible-watermark/tests/python/default.nix @@ -0,0 +1,42 @@ +{ image +, invisible-watermark +, opencv4 +, python3 +, runCommand +, stdenvNoCC +}: + +# This test checks if the python code shown in the README works correctly + +let + message = "fnörd1"; + method = "dwtDct"; + + pythonWithPackages = python3.withPackages (pp: with pp; [ invisible-watermark opencv4 ]); + pythonInterpreter = pythonWithPackages.interpreter; + + encode = stdenvNoCC.mkDerivation { + name = "encode"; + realBuilder = pythonInterpreter; + args = [ ./encode.py ]; + inherit image message method; + }; + + decode = stdenvNoCC.mkDerivation { + name = "decode"; + realBuilder = pythonInterpreter; + args = [ ./decode.py ]; + inherit method; + image = "${encode}/test_wm.png"; + num_bits = (builtins.stringLength message) * 8; + }; +in +runCommand "invisible-watermark-test-python" { } '' + decoded_message="$(cat '${decode}')" + if [ '${message}' != "$decoded_message" ]; then + echo "invisible-watermark did not decode the watermark correctly." + echo "The original message was ${message} but the decoded message was $decoded_message." + exit 1 + fi + touch "$out" +'' diff --git a/pkgs/development/python-modules/invisible-watermark/tests/python/encode.py b/pkgs/development/python-modules/invisible-watermark/tests/python/encode.py new file mode 100644 index 0000000000000..59a72cffe70d6 --- /dev/null +++ b/pkgs/development/python-modules/invisible-watermark/tests/python/encode.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- + +import os +import cv2 +from imwatermark import WatermarkEncoder + +input_file_path = os.environ['image'] +output_dir = os.environ['out'] +message = os.environ['message'] +method = os.environ['method'] + +os.mkdir(output_dir) + +bgr = cv2.imread(input_file_path) + +encoder = WatermarkEncoder() +encoder.set_watermark('bytes', message.encode('utf-8')) +bgr_encoded = encoder.encode(bgr, method) + +output_file = os.path.join(output_dir, 'test_wm.png') +cv2.imwrite(output_file, bgr_encoded) diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 8b673d6040d53..ba3a6adffb748 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -47,38 +47,101 @@ let # official instructions recommend installing CPU-only versions via PyPI. cpuSrcs = let - getSrcFromPypi = { platform, hash }: fetchPypi { - inherit version platform hash; + getSrcFromPypi = { platform, dist, hash }: fetchPypi { + inherit version platform dist hash; pname = "jaxlib"; format = "wheel"; # See the `disabled` attr comment below. - dist = "cp310"; - python = "cp310"; - abi = "cp310"; + python = dist; + abi = dist; }; in { - "x86_64-linux" = getSrcFromPypi { + "3.9-x86_64-linux" = getSrcFromPypi { + platform = "manylinux2014_x86_64"; + dist = "cp39"; + hash = "sha256-8bTrWutuK0qVnbkcwMfgBf414YdaLc3GK5IsCm/JNPE="; + }; + "3.9-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_11_0_arm64"; + dist = "cp39"; + hash = "sha256-Tmv2iOqlNbZqw/rYjef6GmM0N18EA5JTt6T3lQe+4Rs="; + }; + "3.9-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_14_x86_64"; + dist = "cp39"; + hash = "sha256-mDT1INLqPdCkxtMMFR0qHLOIZdWEy8Iuzw1/vOoECsA="; + }; + + "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; + dist = "cp310"; hash = "sha256-ksnY+CPEstact5lKjbSg+ZSPJtSt0Y0NFWEFufBCByk="; }; - "aarch64-darwin" = getSrcFromPypi { + "3.10-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; + dist = "cp310"; hash = "sha256-O7dHvdKLKfNELGfF4TKy7N5EX6Ca7Zu8OtLXWvFykR8="; }; - "x86_64-darwin" = getSrcFromPypi { + "3.10-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; + dist = "cp310"; hash = "sha256-gqKMUZSXrt8sQtTAoQbzAfCzO8gM9Y1/tZpuJVWyN0Y="; }; - }; + "3.11-x86_64-linux" = getSrcFromPypi { + platform = "manylinux2014_x86_64"; + dist = "cp311"; + hash = "sha256-m+NDzwXMNboNjDl2nLY+vqAoN2dQJZVWb1UQDpqqDPw="; + }; + "3.11-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_11_0_arm64"; + dist = "cp311"; + hash = "sha256-zCOAjaWWCQT9Jnm1jjc1Rh5gemqy7ACtTKLM0MqSJzM="; + }; + "3.11-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_14_x86_64"; + dist = "cp311"; + hash = "sha256-gOLIxkk+2hew2GqWu1WgMVEx1YEutx7Zod7QbwsuUVQ="; + }; + + "3.12-x86_64-linux" = getSrcFromPypi { + platform = "manylinux2014_x86_64"; + dist = "cp312"; + hash = "sha256-BZTmkgNuV4nWtfbY4t/19aP43szZQEdgpFXh5qwGRXk="; + }; + "3.12-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_11_0_arm64"; + dist = "cp312"; + hash = "sha256-aAMTrLXU9EYwPv+kdeyI88/D7b4NANB39Fn8vuXUqFA="; + }; + "3.12-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_14_x86_64"; + dist = "cp312"; + hash = "sha256-KHzlIfa9KtYcHX+i/F/SKaYTpD4/XjHVu5j3BdRTUmc="; + }; + }; # Find new releases at https://storage.googleapis.com/jax-releases/jax_releases.html. # When upgrading, you can get these hashes from prefetch.sh. See # https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index. - gpuSrc = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-zfN0n31+5GohwBkeQrqHus4qOyhM/GEdqG6KUupCZ4o="; + gpuSrcs = { + "3.9" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp39-cp39-manylinux2014_x86_64.whl"; + hash = "sha256-WB5Vbr/XeYKXCP/3DIXF20jR6/1xE3huX1h5ow8ETl0="; + }; + "3.10" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl"; + hash = "sha256-zfN0n31+5GohwBkeQrqHus4qOyhM/GEdqG6KUupCZ4o="; + }; + "3.11" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp311-cp311-manylinux2014_x86_64.whl"; + hash = "sha256-Q8ZtF2GCrG30GFbCeCZTWPmW2TBybeXzh2u+NRiYpx4="; + }; + "3.12" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp312-cp312-manylinux2014_x86_64.whl"; + hash = "sha256-lphkSDOJ9SwbO0hp/xC1bYn5fWgth9A9Iwsc9zV0buI="; + }; }; in @@ -87,15 +150,15 @@ buildPythonPackage { inherit version; format = "wheel"; - disabled = !(pythonVersion == "3.10"); + disabled = !(pythonVersion == "3.9" || pythonVersion == "3.10" || pythonVersion == "3.11" || pythonVersion == "3.12"); # See https://discourse.nixos.org/t/ofborg-does-not-respect-meta-platforms/27019/6. src = if !cudaSupport then ( - cpuSrcs."${stdenv.hostPlatform.system}" + cpuSrcs."${pythonVersion}-${stdenv.hostPlatform.system}" or (throw "jaxlib-bin is not supported on ${stdenv.hostPlatform.system}") - ) else gpuSrc; + ) else gpuSrcs."${pythonVersion}"; # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index d02cb0aa5dee2..82ef5a953d8f4 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -264,10 +264,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-Z5cSgdRxdKxidaz4b1RlUF4rVcQiUTmQ1OorlBWlpt0="; + x86_64-linux = "sha256-Hw4uFvltH7nlNN3qAEcQ+IR2FAOjRkvwyWA3rCPi7Vo="; } else { - x86_64-linux = "sha256-sn7p8FFHWIVdBWnsLsVj5jLiSaTlRm7s/qj2RqvQ3jU="; - aarch64-linux = "sha256-oAYF5AeuPHTlwtpDMs2+tAhRAJH0yeSVnB7Ni7wmzS8="; + x86_64-linux = "sha256-LEugnFwTV3EyeTZWgMvXzHbgeDPdmuT3daXCXJRMYVY="; + aarch64-linux = "sha256-0AYF5AeuPHTlwtpDMs2+tAhRAJH0yeSVnB7Ni7wmzS8="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; diff --git a/pkgs/development/python-modules/jaxlib/prefetch.sh b/pkgs/development/python-modules/jaxlib/prefetch.sh index 3362e2d0b7813..46b2573e3c305 100755 --- a/pkgs/development/python-modules/jaxlib/prefetch.sh +++ b/pkgs/development/python-modules/jaxlib/prefetch.sh @@ -1,7 +1,8 @@ -#!/usr/bin/env bash +#! /usr/bin/env nix-shell +#! nix-shell -i sh -p jq prefetch () { - expr="(import <nixpkgs> { system = \"$1\"; config.cudaSupport = $2; }).python3.pkgs.jaxlib-bin.src.url" + expr="(import <nixpkgs> { system = \"$2\"; config.cudaSupport = $3; }).python$1.pkgs.jaxlib-bin.src.url" url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r) echo "$url" sha256=$(nix-prefetch-url "$url") @@ -9,7 +10,9 @@ prefetch () { echo } -prefetch "x86_64-linux" "false" -prefetch "aarch64-darwin" "false" -prefetch "x86_64-darwin" "false" -prefetch "x86_64-linux" "true" +for py in "39" "310" "311" "312"; do + prefetch "$py" "x86_64-linux" "false" + prefetch "$py" "aarch64-darwin" "false" + prefetch "$py" "x86_64-darwin" "false" + prefetch "$py" "x86_64-linux" "true" +done diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index 10969de0673e5..fca4a554d328b 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.41.0"; + version = "0.41.1-unstable-2023-10-04"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pappasam"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-1ujEhoxWcCM1g640aLE60YGiNQLB+G7t7oLVZXW8AMM="; + rev = "c4c470cff67e54593a626b22d1b6b05e56fde3a3"; + hash = "sha256-qFBni97B/GkabbznnZtWTG4dCHFkOx5UQjuevxq+Uvo="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index 031ae5a65c392..c387c10ebc34e 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytest-runner, pytest }: +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, keyutils +, pytestCheckHook +}: buildPythonPackage rec { pname = "keyutils"; @@ -16,8 +22,19 @@ buildPythonPackage rec { substituteInPlace setup.py --replace '"pytest-runner"' "" ''; + preBuild = '' + cython keyutils/_keyutils.pyx + ''; + + preCheck = '' + rm -rf keyutils + ''; + buildInputs = [ keyutils ]; - nativeCheckInputs = [ pytest pytest-runner ]; + nativeBuildInputs = [ cython ]; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = { description = "A set of python bindings for keyutils"; diff --git a/pkgs/development/python-modules/krfzf-py/default.nix b/pkgs/development/python-modules/krfzf-py/default.nix new file mode 100644 index 0000000000000..d55334d21e8ce --- /dev/null +++ b/pkgs/development/python-modules/krfzf-py/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +}: + +buildPythonPackage rec { + pname = "krfzf-py"; + version = "0.0.6"; + format = "pyproject"; + + src = fetchPypi { + pname = "krfzf_py"; + inherit version; + hash = "sha256-/M9Atu9MLAGmnEdx6tknMJAit2o4Xt971uQ7pb0CBCk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ "fzf" ]; + + meta = with lib; { + description = "A Pythonic Fzf Wrapper"; + downloadPage = "https://github.com/justfoolingaround/fzf.py"; + homepage = "https://pypi.org/project/krfzf-py/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 2e19ff0d9b342..f312371afe9d6 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "2.2.0"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - hash = "sha256-BLK41TRaYNtpeeDeGZhlvnvkQwWo0uGB19g34waRqFk="; + hash = "sha256-Ex5ZPlteDaiyex90QumucVdTTbpp9uWiBrvw1kMr++8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix index d03bcb2c50e05..a5b38b525f7d2 100644 --- a/pkgs/development/python-modules/model-bakery/default.nix +++ b/pkgs/development/python-modules/model-bakery/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-bakery"; - version = "1.16.0"; + version = "1.17.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; rev = "refs/tags/${version}"; - hash = "sha256-pLGSrwRsbxB5no9nQr1THr9wXrtISOMqHrW+FeZ24Bw="; + hash = "sha256-o3BI2lMwctR9tiGmY07dAOQUfv9K4rWkc/xI6uHnVfs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index b1de4350f500c..5028ab345f03c 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.4.0"; + version = "2.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-6t4BTUWjzTbegPvySv9Y6pQrRDwparuYb6rC+HOXWLo="; + hash = "sha256-gpQXCihKvuXzCt1WNOd5W7RxxfVAvpaVP6OuHUiAQkw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 9e31ebadf6bda..e973c2289e5ed 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.13.0"; + version = "5.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-ykbKNLMnbAGUavyfRtF3q97FRLaeuKOt0pcWHtJ9mCY="; + hash = "sha256-HNgH01ZoQLuZ3K9sSYAYa6/ZTbVYsOUFhOqgP7y2F3Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index 9b94c6da08a2f..e00491290a3e3 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "nextdns"; - version = "1.4.0"; + version = "2.0.0"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bieniu"; - repo = pname; + repo = "nextdns"; rev = "refs/tags/${version}"; - hash = "sha256-fW/fLbL4IMLN6LmFijH4+ew+cDdJY9tOha+010YEfNs="; + hash = "sha256-AgxBJXPBYkJR8W8tGKcHJaAP52guNVvm190ZlZ9BhA4="; }; propagatedBuildInputs = [ @@ -41,9 +41,9 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/bieniu/nextdns/releases/tag/${version}"; description = "Module for the NextDNS API"; homepage = "https://github.com/bieniu/nextdns"; + changelog = "https://github.com/bieniu/nextdns/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/notmuch2/default.nix b/pkgs/development/python-modules/notmuch2/default.nix index b8ed00ca2579f..9bb930d6cfa4b 100644 --- a/pkgs/development/python-modules/notmuch2/default.nix +++ b/pkgs/development/python-modules/notmuch2/default.nix @@ -16,9 +16,11 @@ buildPythonPackage { cffi ]; buildInputs = [ - python notmuch cffi + python notmuch ]; + propagatedBuildInputs = [ cffi ]; + # since notmuch 0.35, this package expects _notmuch_config.py that is # generated by notmuch's configure script. We write one which references our # built libraries. diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index ca2272ac1bd52..f10cbb7493043 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -1,49 +1,51 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage +, ccache , fetchFromGitHub -, vmprof , isPyPy -, pkgs -, scons -, chrpath +, ordered-set +, python3 +, setuptools +, zstandard }: buildPythonPackage rec { pname = "nuitka"; - version = "1.1.5"; - format = "setuptools"; + version = "1.8.4"; + pyproject = true; src = fetchFromGitHub { owner = "Nuitka"; repo = "Nuitka"; rev = version; - hash = "sha256-8eWOcxATVS866nlN39b2VU1CuXAfcn0yQsDweHS2yDU="; + hash = "sha256-spa3V9KEjqmwnHSuxLLIu9hJk5PrRwNyOw72sfxBVKo="; }; - nativeCheckInputs = [ vmprof ]; - nativeBuildInputs = [ scons ]; - propagatedBuildInputs = [ chrpath ]; + nativeBuildInputs = [ setuptools ]; + nativeCheckInputs = [ ccache ]; - postPatch = '' - patchShebangs tests/run-tests - '' + lib.optionalString stdenv.isLinux '' - substituteInPlace nuitka/plugins/standard/ImplicitImports.py --replace 'locateDLL("uuid")' '"${lib.getLib pkgs.util-linux}/lib/libuuid.so"' - ''; - - # We do not want any wrappers here. - postFixup = ""; + propagatedBuildInputs = [ + ordered-set + zstandard + ]; checkPhase = '' - tests/run-tests + runHook preCheck + + ${python3.interpreter} tests/basics/run_all.py search + + runHook postCheck ''; - # Problem with a subprocess (parts) - doCheck = false; + pythonImportsCheck = [ "nuitka" ]; # Requires CPython disabled = isPyPy; meta = with lib; { + # tests fail with linker errors on darwin + broken = stdenv.isDarwin; description = "Python compiler with full language support and CPython compatibility"; license = licenses.asl20; homepage = "https://nuitka.net/"; diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index d2b341f5e3bc4..e6e6f42aaafab 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nunavut"; - version = "2.1.1"; + version = "2.3.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ENP1uhzQwFEk990b1RX2wNVpInaSSH80KNihX6XpQtU="; + hash = "sha256-+wqQ7JKC4aSgdM8YcYlO289CRpwX4VPxVqNlSABJJ0U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 34a79c198309e..5101460704fd7 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.112.4"; + version = "2.113.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-ilYlG0bPoMlCs0D49ZJaDgh/xoY+qsHlfJKHPkepe9Q="; + hash = "sha256-Ui7/rD307fSdAPexZF9VU4NC9udjEGcFpjg/Ob6GVvo="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index d62c8450cda4b..5b7a0bc0f8f21 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,14 +1,14 @@ { lib , fetchFromGitHub }: rec { - version = "3.5.1"; + version = "3.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - hash = "sha256-6YU2tl17LpDZe9pQ1a+B2SGIhqGdwME3Db6umVz7RLc="; + hash = "sha256-bboTRZqJq5tKeBQuiEQAXxTHYvoldDQlwbfehjDA8EE="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix index 26c44f0b070be..0562be6ee7390 100644 --- a/pkgs/development/python-modules/paypalrestsdk/default.nix +++ b/pkgs/development/python-modules/paypalrestsdk/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "paypalrestsdk"; - version = "1.13.1"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "238713208031e8981bf70b3350b3d7f85ed64d34e0f21e4c1184444a546fee7f"; + sha256 = "sha256-kZUfNtsw1oW5ceFASYSRo1bPHfjv9xZWYDrKTtcs81o="; }; propagatedBuildInputs = [ requests six pyopenssl ]; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index ba746d5a302b0..cc2d71914dc62 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.5.6"; + version = "19.5.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kpSmwMDAvUC9LV/oKiMdm+J9aUEPiPlNKLnVG/eW3hI="; + hash = "sha256-NsQrfJQ1+WZ4wNBH8ZGGo9IMJ+yvWrVQmesDBQrfRKg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix index 9ed6cd9b52495..f5de2371e01ef 100644 --- a/pkgs/development/python-modules/pgcli/default.nix +++ b/pkgs/development/python-modules/pgcli/default.nix @@ -22,11 +22,11 @@ # integrating with ipython-sql buildPythonPackage rec { pname = "pgcli"; - version = "3.5.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-zESNlRWfwJA9NhgpkneKCW7aV1LWYNR2cTg8jiv2M/E="; + hash = "sha256-C/X427yQR+BkbQFqQhMoomDEbP8hCJCLEbtVyWR17o0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pgvector/default.nix b/pkgs/development/python-modules/pgvector/default.nix index 03fbef0bd48b2..389a917668bff 100644 --- a/pkgs/development/python-modules/pgvector/default.nix +++ b/pkgs/development/python-modules/pgvector/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pgvector"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "pgvector"; repo = "pgvector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-qvLDFnrTYibdhjSeeIFI4YdpPRsvNBnQ23uqsLCblEo="; + hash = "sha256-KQROG0cHvKmdWssr7Git3JH0YguRPno/ZzYiQL7VhwU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/picosvg/default.nix b/pkgs/development/python-modules/picosvg/default.nix index d344fca85e597..f543b61b2bc9f 100644 --- a/pkgs/development/python-modules/picosvg/default.nix +++ b/pkgs/development/python-modules/picosvg/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , setuptools-scm , absl-py , lxml @@ -20,17 +19,6 @@ buildPythonPackage rec { hash = "sha256-jG1rfamegnX8GXDwqkGFBFzUeycRLDObJvGbxNk6OpM="; }; - patches = [ - # see https://github.com/googlefonts/picosvg/issues/299 - # this patch fixed a failing test case after the update to skia-pathops 0.8 - # as soon as skia-pathops in nixpkgs is updated to 0.8, this patch should be removed - (fetchpatch { - url = "https://github.com/googlefonts/picosvg/commit/4e971ed6cd9afb412b2845d29296a0c24f086562.patch"; - hash = "sha256-OZEipNPCSuuqcy4XggBiuGv4HN604dI4N9wlznyAwF0="; - revert = true; - }) - ]; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pmdarima/default.nix b/pkgs/development/python-modules/pmdarima/default.nix index 428511bdca3a1..f1d152decc1fe 100644 --- a/pkgs/development/python-modules/pmdarima/default.nix +++ b/pkgs/development/python-modules/pmdarima/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pmdarima"; - version = "2.0.3"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "alkaline-ml"; repo = "pmdarima"; - rev = "v${version}"; - hash = "sha256-uX4iZZ2deYqVWnqVZT6J0Djf2pXo7ug4MsOsPkKjvSU="; + rev = "refs/tags/v${version}"; + hash = "sha256-LHwPgQRB/vP3hBM8nqafoCrN3ZSRIMWLzqTqDOETOEc="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 1aadffd70324e..00edd1433813f 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -5,20 +5,25 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20231022"; - format = "setuptools"; + version = "0.10.0.20231030"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sXmntukr4m876x4Hu45tHlT01rI28l7YT59u2TW8TV4="; + hash = "sha256-1yRv6zg9mKJTinR57QHvCx/0mi0b2O3CkcoH1v4QuNo="; }; + nativeBuildInputs = [ + setuptools + ]; + passthru.optional-dependencies = { update = [ requests diff --git a/pkgs/development/python-modules/py-radix-sr/default.nix b/pkgs/development/python-modules/py-radix-sr/default.nix index f76f12708f837..da14d8a95799b 100644 --- a/pkgs/development/python-modules/py-radix-sr/default.nix +++ b/pkgs/development/python-modules/py-radix-sr/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Python radix tree for IPv4 and IPv6 prefix matching"; homepage = "https://github.com/SEKOIA-IO/py-radix"; license = with licenses; [ isc bsdOriginal ]; - maintainers = with maintainers; [ netali ]; + maintainers = teams.wdz.members; }; } diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index f0f5484aeb56f..d635a6a4a88cb 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -6,6 +6,7 @@ , dbus-python , fetchPypi , file +, hatchling , i3 , i3ipc , libnotify @@ -24,12 +25,17 @@ buildPythonPackage rec { pname = "py3status"; version = "3.53"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-vZrzHERjAg9J004A2dAbq8hKmAUslCTaRdwEAe9JRqU="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ pytz requests diff --git a/pkgs/development/python-modules/pydantic-scim/default.nix b/pkgs/development/python-modules/pydantic-scim/default.nix index 06a08cb445afc..9441bcc0eb845 100644 --- a/pkgs/development/python-modules/pydantic-scim/default.nix +++ b/pkgs/development/python-modules/pydantic-scim/default.nix @@ -2,22 +2,24 @@ , buildPythonPackage , fetchFromGitHub , pydantic +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "pydantic-scim"; - version = "0.0.7"; - format = "setuptools"; + version = "0.0.8"; + pyproject = true; src = fetchFromGitHub { owner = "chalk-ai"; repo = "pydantic-scim"; rev = "refs/tags/v${version}"; - hash = "sha256-F+uj7kSz6iSb0Vg00VfJ5GcxghooNDKa75S/ZgU7WgI="; + hash = "sha256-Hbc94v/+slXRGDKKbMui8WPwn28/1XcKvHkbLebWtj0="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 794ded6318e4b..c9a3f9a409c2c 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.14.1"; + version = "0.14.2"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-xDYCe8dq4CPfTnBRfjuvkM3aWojuRrgYte8Mw4hKugQ="; + hash = "sha256-CYGEyTLDcQZzfhixUnt0GlPhkyfsBLXLxWQlml6ydlA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix index e804b2c859988..64dafa97db7ce 100644 --- a/pkgs/development/python-modules/pydbus/default.nix +++ b/pkgs/development/python-modules/pydbus/default.nix @@ -1,21 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, pygobject3, pythonAtLeast }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pygobject3 +}: buildPythonPackage rec { pname = "pydbus"; version = "0.6.0"; + pyproejct = true; - # Python 3.11 changed the API of the `inspect` module and pydbus was never - # updated to adapt; last commit was in 2018. - disabled = pythonAtLeast "3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "0b0gipvz7vcfa9ddmwq2jrx16d4apb0hdnl5q4i3h8jlzwp1c1s2"; + src = fetchFromGitHub { + owner = "LEW21"; + repo = "pydbus"; + rev = "refs/tags/v${version}"; + hash = "sha256-F1KKXG+7dWlEbToqtF3G7wU0Sco7zH5NqzlL58jyDGw="; }; - propagatedBuildInputs = [ pygobject3 ]; + postPatch = '' + substituteInPlace pydbus/_inspect3.py \ + --replace "getargspec" "getfullargspec" + ''; + + propagatedBuildInputs = [ + pygobject3 + ]; + + pythonImportsCheck = [ + "pydbus" + "pydbus.generic" + ]; - pythonImportsCheck = [ "pydbus" ]; + doCheck = false; # requires a working dbus setup meta = { homepage = "https://github.com/LEW21/pydbus"; diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index bc2125b8c6ecb..d479564b763b5 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.21"; + version = "0.1.22"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "w1ll1am23"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-G+J61L9i5JIgPC4oZQavafjD81kue02r+GRdIazrzOw="; + hash = "sha256-R6PA/i35vo253J4yowe2fPRZEqStAqmm98k81KDHLQk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 2dea4630c5750..2da0f2698685a 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyflakes"; version = "3.1.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; format = "setuptools"; diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index caf3e014eed64..ae10f84995a1b 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -3,19 +3,17 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, setuptools-scm , lsprotocol -, toml , typeguard -, mock +, poetry-core , pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "pygls"; - version = "1.0.2"; - format = "setuptools"; + version = "1.1.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,13 +21,11 @@ buildPythonPackage rec { owner = "openlawlibrary"; repo = "pygls"; rev = "refs/tags/v${version}"; - hash = "sha256-z673NRlnudFyDjKoM+xCbMRTFwh+tjUf4BaNtjwvKx8="; + hash = "sha256-FOuBS/UJpkYbuIu193vkSpN/77gf+UWiS5f/t8BpAk4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ - setuptools-scm - toml + poetry-core ]; propagatedBuildInputs = [ @@ -38,7 +34,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mock pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyjnius/default.nix b/pkgs/development/python-modules/pyjnius/default.nix index 292c5f1c116a8..e4cebb02c66d4 100644 --- a/pkgs/development/python-modules/pyjnius/default.nix +++ b/pkgs/development/python-modules/pyjnius/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyjnius"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZjRuJk8eIghrh8XINonqvP7xRQrGR2/YVr6kmLLhNz4="; + hash = "sha256-C32+PY9Yu7e+wwyFjz+nibzBwexJMZWOn3uH9F6hQDM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pylint-venv/default.nix b/pkgs/development/python-modules/pylint-venv/default.nix index 1ba6e062989a5..b12ae73b8c34b 100644 --- a/pkgs/development/python-modules/pylint-venv/default.nix +++ b/pkgs/development/python-modules/pylint-venv/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pylint-venv"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jgosmann"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mYG9iZHbA67oJc2sshtV3w8AQaqPsXGqMuLJFI4jAI0="; + hash = "sha256-dsVEHJawsTNKVCVmeOa61wOU5GPeyzAU/eUDFrK9PPg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 3120a5a844e96..5ca2b1ce93957 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.9.0"; + version = "5.9.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-iaX1+SHGAJ9V2Jv76as5BcL5DcxURwX3aGa+R9YVtXY="; + hash = "sha256-yY8W3B1yqj0oOkR6+nMbFgCFmTStXkePWnEYPHI8Zto="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymelcloud/default.nix b/pkgs/development/python-modules/pymelcloud/default.nix index 079c7e31f140d..ad4e529c528ab 100644 --- a/pkgs/development/python-modules/pymelcloud/default.nix +++ b/pkgs/development/python-modules/pymelcloud/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { aiohttp ]; + doCheck = pythonOlder "3.11"; # asynctest is unsupported on python3.11 + nativeCheckInputs = [ asynctest pytest-asyncio diff --git a/pkgs/development/python-modules/pymongo-inmemory/default.nix b/pkgs/development/python-modules/pymongo-inmemory/default.nix index 98cbf453e554d..f0930c8c54c02 100644 --- a/pkgs/development/python-modules/pymongo-inmemory/default.nix +++ b/pkgs/development/python-modules/pymongo-inmemory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pymongo-inmemory"; - version = "0.3.1"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "kaizendorks"; repo = "pymongo_inmemory"; rev = "refs/tags/v${version}"; - hash = "sha256-1v36cI6JjDZA/uJE85NSMNnoyKI1VCgDrymfnCkpVqU="; + hash = "sha256-h6/yKvAHqvw0L3Z1+PUQi36Ja6yvFiaX7Cn5Ypcg1Zs="; }; postPatch = '' @@ -48,6 +48,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # new test with insufficient monkey patching, try to remove on next bump + "tests/unit/test_mongod.py" + ]; + preCheck = '' export HOME="$(mktemp -d)" ''; diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix index ecc92bc3bd388..19980b7c0ca21 100644 --- a/pkgs/development/python-modules/pyocd/default.nix +++ b/pkgs/development/python-modules/pyocd/default.nix @@ -5,14 +5,19 @@ , capstone , cmsis-pack-manager , colorama +, importlib-metadata +, importlib-resources , intelhex , intervaltree +, lark , natsort , prettytable , pyelftools , pylink-square , pyusb , pyyaml +, setuptools +, setuptools-scm , typing-extensions , stdenv , hidapi @@ -21,11 +26,12 @@ buildPythonPackage rec { pname = "pyocd"; - version = "0.35.1"; + version = "0.36.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-AugIT007JtTXx0cLtHD9TtxsK/K6eB492U2k+EVxyXU="; + hash = "sha256-k3eCrMna/wVNUPt8b3iM2UqE+A8LhfJarKuZ3Jgihkg="; }; patches = [ @@ -37,12 +43,25 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "libusb-package>=1.0,<2.0" "" + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ capstone cmsis-pack-manager colorama + importlib-metadata + importlib-resources intelhex intervaltree + lark natsort prettytable pyelftools @@ -54,19 +73,19 @@ buildPythonPackage rec { hidapi ]; - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "pyocd" ]; + pythonImportsCheck = [ + "pyocd" + ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "libusb-package>=1.0,<2.0" "" \ - --replace "pylink-square>=0.11.1,<1.0" "pylink-square>=0.11.1,<2.0" - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/pyocd/pyOCD/releases/tag/v${version}"; description = "Python library for programming and debugging Arm Cortex-M microcontrollers"; - homepage = "https://pyocd.io/"; + downloadPage = "https://github.com/pyocd/pyOCD"; + homepage = "https://pyocd.io"; license = licenses.asl20; maintainers = with maintainers; [ frogamic sbruder ]; }; diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index fb82fc05300f4..8dc1ee0f8780a 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -7,12 +7,15 @@ , isPy3k , substituteAll , pytestCheckHook +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "pyocr"; - version = "0.8.3"; + version = "0.8.5"; disabled = !isPy3k; + format = "pyproject"; # Don't fetch from PYPI because it doesn't contain tests. src = fetchFromGitLab { @@ -21,7 +24,7 @@ buildPythonPackage rec { owner = "OpenPaperwork"; repo = "pyocr"; rev = version; - hash = "sha256-gIn50H9liQcTb7SzoWnBwm5LTvkr+R+5OPvITls1B/w="; + hash = "sha256-gE0+qbHCwpDdxXFY+4rjVU2FbUSfSVrvrVMcWUk+9FU="; }; patches = [ @@ -31,18 +34,17 @@ buildPythonPackage rec { }) ]; - # see the logic in setup.py - ENABLE_SETUPTOOLS_SCM = "0"; - preConfigure = '' - echo 'version = "${version}"' > src/pyocr/_version.py - ''; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; propagatedBuildInputs = [ pillow ]; + nativeBuildInputs = [ setuptools setuptools-scm ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { inherit (src.meta) homepage; + changelog = "https://gitlab.gnome.org/World/OpenPaperwork/pyocr/-/blob/${version}/ChangeLog"; description = "A Python wrapper for Tesseract and Cuneiform"; license = licenses.gpl3Plus; maintainers = with maintainers; [ symphorien ]; diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/pkgs/development/python-modules/pyocr/paths.patch index d49060739737f..c3c802c20649f 100644 --- a/pkgs/development/python-modules/pyocr/paths.patch +++ b/pkgs/development/python-modules/pyocr/paths.patch @@ -1,4 +1,4 @@ -commit c4bac00441363fcaeb074682d8226ca523614ea2 +commit cfc05af26b571e9ca09e9c709c0fb8934e9e46dd Author: Guillaume Girol <symphorien+git@xlumurb.eu> Date: Sat Aug 20 17:48:01 2022 +0200 @@ -25,7 +25,7 @@ index 2e5b717..35647e2 100644 LANGUAGES_LINE_PREFIX = "Supported languages: " LANGUAGES_SPLIT_RE = re.compile("[^a-z]") diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py -index 2002614..9ebea5c 100644 +index 1edec8c..434a336 100644 --- a/src/pyocr/libtesseract/tesseract_raw.py +++ b/src/pyocr/libtesseract/tesseract_raw.py @@ -2,7 +2,6 @@ import ctypes @@ -51,7 +51,7 @@ index 2002614..9ebea5c 100644 DPI_DEFAULT = 70 - --if getattr(sys, 'frozen', False): # pragma: no cover +-if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'): - # Pyinstaller integration - libnames += [os.path.join(sys._MEIPASS, "libtesseract-4.dll")] - libnames += [os.path.join(sys._MEIPASS, "libtesseract-3.dll")] @@ -125,10 +125,10 @@ index 0fe0d20..c1fdd27 100644 TESSDATA_EXTENSION = ".traineddata" -diff --git a/tests/tests_cuneiform.py b/tests/tests_cuneiform.py -index 45b7f6a..95f55c6 100644 ---- a/tests/tests_cuneiform.py -+++ b/tests/tests_cuneiform.py +diff --git a/tests/test_cuneiform.py b/tests/test_cuneiform.py +index b76e93c..266f6b2 100644 +--- a/tests/test_cuneiform.py ++++ b/tests/test_cuneiform.py @@ -21,7 +21,7 @@ class TestCuneiform(BaseTest): # XXX is it useful? which.return_value = True @@ -147,7 +147,7 @@ index 45b7f6a..95f55c6 100644 stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -109,7 +109,7 @@ class TestCuneiformTxt(BaseTest): +@@ -110,7 +110,7 @@ class TestCuneiformTxt(BaseTest): output = cuneiform.image_to_string(self.image) self.assertEqual(output, self._get_file_content("text").strip()) popen.assert_called_once_with( @@ -156,7 +156,7 @@ index 45b7f6a..95f55c6 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -125,7 +125,7 @@ class TestCuneiformTxt(BaseTest): +@@ -126,7 +126,7 @@ class TestCuneiformTxt(BaseTest): builder=self.builder) self.assertEqual(output, self._get_file_content("text").strip()) popen.assert_called_once_with( @@ -165,7 +165,7 @@ index 45b7f6a..95f55c6 100644 "-"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT -@@ -142,7 +142,7 @@ class TestCuneiformTxt(BaseTest): +@@ -143,7 +143,7 @@ class TestCuneiformTxt(BaseTest): builder=self.builder) self.assertEqual(output, self._get_file_content("text").strip()) popen.assert_called_once_with( @@ -174,7 +174,7 @@ index 45b7f6a..95f55c6 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -173,7 +173,7 @@ class TestCuneiformTxt(BaseTest): +@@ -174,7 +174,7 @@ class TestCuneiformTxt(BaseTest): output = cuneiform.image_to_string(image, builder=self.builder) self.assertEqual(output, self._get_file_content("text").strip()) popen.assert_called_once_with( @@ -183,7 +183,7 @@ index 45b7f6a..95f55c6 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -227,7 +227,7 @@ class TestCuneiformWordBox(BaseTest): +@@ -230,7 +230,7 @@ class TestCuneiformWordBox(BaseTest): output = cuneiform.image_to_string(self.image, builder=self.builder) popen.assert_called_once_with( @@ -192,7 +192,7 @@ index 45b7f6a..95f55c6 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -280,7 +280,7 @@ class TestCuneiformLineBox(BaseTest): +@@ -284,7 +284,7 @@ class TestCuneiformLineBox(BaseTest): output = cuneiform.image_to_string(self.image, builder=self.builder) popen.assert_called_once_with( @@ -201,11 +201,11 @@ index 45b7f6a..95f55c6 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py -index a5d46d8..8b9e315 100644 ---- a/tests/tests_libtesseract.py -+++ b/tests/tests_libtesseract.py -@@ -165,7 +165,8 @@ class TestLibTesseractRaw(BaseTest): +diff --git a/tests/test_libtesseract.py b/tests/test_libtesseract.py +index cc31a50..890c02c 100644 +--- a/tests/test_libtesseract.py ++++ b/tests/test_libtesseract.py +@@ -167,7 +167,8 @@ class TestLibTesseractRaw(BaseTest): args = libtess.TessBaseAPIInit3.call_args[0] self.assertEqual(len(args), 3) self.assertEqual(args[0].value, self.handle) @@ -215,7 +215,7 @@ index a5d46d8..8b9e315 100644 self.assertEqual(args[2].value, lang.encode() if lang else None) self.assertEqual( -@@ -201,7 +202,8 @@ class TestLibTesseractRaw(BaseTest): +@@ -203,7 +204,8 @@ class TestLibTesseractRaw(BaseTest): args = libtess.TessBaseAPIInit3.call_args[0] self.assertEqual(len(args), 3) self.assertEqual(args[0].value, self.handle) @@ -225,11 +225,11 @@ index a5d46d8..8b9e315 100644 self.assertEqual(args[2].value, lang.encode() if lang else None) self.assertEqual( -diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py -index 18d01ef..593cf94 100644 ---- a/tests/tests_tesseract.py -+++ b/tests/tests_tesseract.py -@@ -36,7 +36,7 @@ class TestTesseract(BaseTest): +diff --git a/tests/test_tesseract.py b/tests/test_tesseract.py +index 823818f..2ee5fb4 100644 +--- a/tests/test_tesseract.py ++++ b/tests/test_tesseract.py +@@ -37,7 +37,7 @@ class TestTesseract(BaseTest): def test_available(self, which): which.return_value = True self.assertTrue(tesseract.is_available()) @@ -238,7 +238,7 @@ index 18d01ef..593cf94 100644 @patch("subprocess.Popen") def test_version_error(self, popen): -@@ -162,7 +162,7 @@ class TestTesseract(BaseTest): +@@ -163,7 +163,7 @@ class TestTesseract(BaseTest): for lang in ("eng", "fra", "jpn", "osd"): self.assertIn(lang, langs) popen.assert_called_once_with( @@ -247,7 +247,7 @@ index 18d01ef..593cf94 100644 startupinfo=None, creationflags=0, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -177,7 +177,7 @@ class TestTesseract(BaseTest): +@@ -178,7 +178,7 @@ class TestTesseract(BaseTest): self.assertEqual(te.exception.status, 1) self.assertEqual("unable to get languages", te.exception.message) popen.assert_called_once_with( @@ -256,7 +256,7 @@ index 18d01ef..593cf94 100644 startupinfo=None, creationflags=0, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -254,7 +254,7 @@ class TestTesseract(BaseTest): +@@ -255,7 +255,7 @@ class TestTesseract(BaseTest): self.assertEqual(status, 0) self.assertEqual(error, message) popen.assert_called_once_with( @@ -265,7 +265,7 @@ index 18d01ef..593cf94 100644 cwd=tmpdir, startupinfo=None, creationflags=0, -@@ -277,7 +277,7 @@ class TestTesseract(BaseTest): +@@ -278,7 +278,7 @@ class TestTesseract(BaseTest): self.assertEqual(status, 0) self.assertEqual(error, message) popen.assert_called_with( @@ -274,7 +274,7 @@ index 18d01ef..593cf94 100644 cwd=tmpdir, startupinfo=None, creationflags=0, -@@ -308,7 +308,7 @@ class TestTesseract(BaseTest): +@@ -309,7 +309,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -283,7 +283,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -344,7 +344,7 @@ class TestTesseract(BaseTest): +@@ -345,7 +345,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -292,7 +292,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -377,7 +377,7 @@ class TestTesseract(BaseTest): +@@ -378,7 +378,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -301,7 +301,7 @@ index 18d01ef..593cf94 100644 "--psm", "0", "-l", "osd"], stdin=subprocess.PIPE, shell=False, -@@ -405,7 +405,7 @@ class TestTesseract(BaseTest): +@@ -406,7 +406,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -310,7 +310,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -439,7 +439,7 @@ class TestTesseract(BaseTest): +@@ -440,7 +440,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -319,7 +319,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -473,7 +473,7 @@ class TestTesseract(BaseTest): +@@ -474,7 +474,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -328,7 +328,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -506,7 +506,7 @@ class TestTesseract(BaseTest): +@@ -507,7 +507,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -337,7 +337,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -533,7 +533,7 @@ class TestTesseract(BaseTest): +@@ -534,7 +534,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -346,7 +346,7 @@ index 18d01ef..593cf94 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -567,7 +567,7 @@ class TestTesseract(BaseTest): +@@ -568,7 +568,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( diff --git a/pkgs/development/python-modules/pyqt/pyqt6-sip.nix b/pkgs/development/python-modules/pyqt/pyqt6-sip.nix index 106a439fbb57a..f9b9bc308c804 100644 --- a/pkgs/development/python-modules/pyqt/pyqt6-sip.nix +++ b/pkgs/development/python-modules/pyqt/pyqt6-sip.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pyqt6-sip"; - version = "13.5.2"; + version = "13.6.0"; src = fetchPypi { pname = "PyQt6_sip"; inherit version; - hash = "sha256-6/YmS2/toBujfTtgpLuHSTvbh75w97KlOEp6zUkC2I0="; + hash = "sha256-JIbhWIBxlD1PZle6CQltyf/9IyKtLDAEHnjqPwN7V3g="; }; # There is no test code and the check phase fails with: diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 5089e19c22647..784978b7ca479 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -10,8 +10,7 @@ , h5py , numpy , scipy -, nose -, nose-exclude +, pytestCheckHook }: buildPythonPackage rec { @@ -47,8 +46,7 @@ buildPythonPackage rec { scipy ]; - nativeCheckInputs = [ nose nose-exclude ]; - + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyscf" ]; preCheck = '' # Set config used by tests to ensure reproducibility @@ -57,53 +55,43 @@ buildPythonPackage rec { ulimit -s 20000 export PYSCF_CONFIG_FILE=$(pwd)/pyscf/pyscf_config.py ''; - # As defined for the PySCF CI at https://github.com/pyscf/pyscf/blob/master/.github/workflows/run_tests.sh - # minus some additionally numerically instable tests, that are sensitive to BLAS, FFTW, etc. - checkPhase = '' - runHook preCheck - nosetests pyscf/ -v \ - --exclude-dir=examples --exclude-dir=pyscf/pbc/grad \ - --exclude-dir=pyscf/x2c \ - --exclude-dir=pyscf/adc \ - --exclude-dir=pyscf/pbc/tdscf \ - -e test_bz \ - -e h2o_vdz \ - -e test_mc2step_4o4e \ - -e test_ks_noimport \ - -e test_jk_hermi0 \ - -e test_j_kpts \ - -e test_k_kpts \ - -e test_lda \ - -e high_cost \ - -e skip \ - -e call_in_background \ - -e libxc_cam_beta_bug \ - -e test_finite_diff_rks_eph \ - -e test_finite_diff_uks_eph \ - -e test_finite_diff_roks_grad \ - -e test_finite_diff_df_roks_grad \ - -e test_frac_particles \ - -e test_nosymm_sa4_newton \ - -e test_pipek \ - -e test_n3_cis_ewald \ - -e test_veff \ - -I test_kuccsd_supercell_vs_kpts\.py \ - -I test_kccsd_ghf\.py \ - -I test_h_.*\.py \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow_supercell.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow_supercell.DiamondKSTestSupercell3 \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/gw/test/test_kgw_slow.DiamondKSTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_krhf_slow_supercell.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_hf.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_ks.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_supercell_hf.DiamondTestSupercell3 \ - --exclude-test=pyscf/pbc/tdscf/test/test_kproxy_supercell_ks.DiamondTestSupercell3 \ - -I .*_slow.*py -I .*_kproxy_.*py -I test_proxy.py tdscf/*_slow.py gw/*_slow.py + # Numerically slightly off tests + disabledTests = [ + "test_tdhf_singlet" + "test_ab_hf" + "test_ea" + "test_bz" + "h2o_vdz" + "test_mc2step_4o4e" + "test_ks_noimport" + "test_jk_hermi0" + "test_j_kpts" + "test_k_kpts" + "test_lda" + "high_cost" + "skip" + "call_in_background" + "libxc_cam_beta_bug" + "test_finite_diff_rks_eph" + "test_finite_diff_uks_eph" + "test_finite_diff_roks_grad" + "test_finite_diff_df_roks_grad" + "test_frac_particles" + "test_nosymm_sa4_newton" + "test_pipek" + "test_n3_cis_ewald" + "test_veff" + "test_collinear_kgks_gga" + ]; - runHook postCheck - ''; + pytestFlagsArray = [ + "--ignore=pyscf/pbc/tdscf" + "--ignore=pyscf/pbc/gw" + "--ignore-glob=*_slow.*py" + "--ignore-glob=*_kproxy_.*py" + "--ignore-glob=test_proxy.py" + ]; meta = with lib; { description = "Python-based simulations of chemistry framework"; diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index ffc7486cf20aa..4e48f1c49dd10 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitLab +, fetchPypi , pkg-config , rustPlatform , cargo @@ -11,24 +11,23 @@ , pcsclite , stdenv , darwin +, libiconv }: buildPythonPackage rec { pname = "pysequoia"; - version = "0.1.14"; + version = "0.1.20"; format = "pyproject"; - src = fetchFromGitLab { - owner = "sequoia-pgp"; - repo = "pysequoia"; - rev = "v${version}"; - hash = "sha256-63kUUxZTG33cB/IiD4AiDpLOI6Uew/fETgqhaGc7zp0="; + src = fetchPypi { + inherit pname version; + hash = "sha256-KavsLp17e4ckX11B0pefiQ1Hma/O9x0VY/uVPiJm4Fs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-S/j3bGgU46nvVQFs35ih05teVEIJrFN4Ryq4B7rLFDE="; + hash = "sha256-7Lw6gR6o2HJ/zyG4b0wz4nmU2AIIAhyK9zaQ6w+/RgE="; }; nativeBuildInputs = [ @@ -48,14 +47,18 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security + libiconv ]; pythonImportsCheck = [ "pysequoia" ]; meta = with lib; { description = "This library provides OpenPGP facilities in Python through the Sequoia PGP library"; + downloadPage = "https://codeberg.org/wiktor/pysequoia"; homepage = "https://sequoia-pgp.gitlab.io/pysequoia"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; + # Broken since the 0.1.20 update according to ofborg. The errors are not clear... + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 151efb65895e6..7670b443318b4 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -17,11 +17,11 @@ disabledIf (pythonAtLeast "3.11") ( stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.15.10"; + version = "5.15.11"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - sha256 = "sha256-KvaR02E6Qfg6YEObRlaPwsaW2/rkL3zXsHFS0RXq0zo="; + sha256 = "sha256-2lZ807eFTSegtK/j6J3osvmLem1XOTvlbx/BP3cPryk="; }; patches = [ diff --git a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index 4461c02c8cab1..e6b55788735a5 100644 --- a/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.0.7"; + version = "1.0.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-qvWrMucaSx7LltWYru30qVPDTVHtuqf8tKGFL+Fl8fU="; + hash = "sha256-OZaUKEEvgEIukEcAHB9ci/XWCU+h1CvQTU3gwWBOBkY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index f27757b4784ed..b0893b5d204e1 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.2.14"; + version = "3.2.18"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V/D+eE6y1kCMZmp9rIcvS/wdcSyW3mYWEJqpCb74NtY="; + hash = "sha256-z3HD7sjDg8dMNpd93PiN+nSzKTVCw+OJnfKX07e1+sg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 1d77af888020f..77dd73e30155b 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.12"; + version = "0.3.13"; format = "pyproject"; src = fetchFromGitHub { owner = "madmaze"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-19eLgcvmEFGiyu6v/EzLG8w+jFQL/5rbfDaiQqAGq5g="; + hash = "sha256-gQMeck6ojlIwyiOCBBhzHHrjQfBMelVksVGd+fyxWZk="; }; patches = [ diff --git a/pkgs/development/python-modules/pytest-examples/default.nix b/pkgs/development/python-modules/pytest-examples/default.nix index 212938df20b68..3ac626a3f997a 100644 --- a/pkgs/development/python-modules/pytest-examples/default.nix +++ b/pkgs/development/python-modules/pytest-examples/default.nix @@ -56,6 +56,12 @@ buildPythonPackage rec { "pytest_examples" ]; + disabledTests = [ + # Test fails with latest ruff v0.1.2 + # See https://github.com/pydantic/pytest-examples/issues/26 + "test_ruff_error" + ]; + meta = with lib; { description = "Pytest plugin for testing examples in docstrings and markdown files"; homepage = "https://github.com/pydantic/pytest-examples"; diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index f972070f53f2e..428e0c5c3e01b 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytest-flask"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rv3mUvd3d78C3JEgWuxM4gzfKsu71mqRirkfXBRpPT0="; + hash = "sha256-WL4cl7Ibo8TUfgp2ketBAHdIUGw2v1EAT3jfEGkfqV4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index 5bb9224ac421c..c989948afd8c1 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-pylint"; - version = "0.19.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2I6DwQI8ZBVIqew1Z3B87udhZjKphq8TNCbUp00GaTI="; + hash = "sha256-iHZLjh1c+hiAkkjgzML8BQNfCMNfCwIi3c/qHDxOVT4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index ccb013d14e548..1c65a6de3220a 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder # build @@ -29,7 +28,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "3.7.0"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -38,18 +37,9 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-t++7jQreibGpJRjJawicxjFIye5X6R1dpFqiM6yvRf0="; + hash = "sha256-7MBQo4jzBU/n7gVdGzVHlQl8Vj3OjfK4gk1vhLQQUE0="; }; - patches = [ - # https://github.com/home-assistant-libs/python-matter-server/pull/379 - (fetchpatch { - name = "relax-setuptools-dependency.patch"; - url = "https://github.com/home-assistant-libs/python-matter-server/commit/1bbc945634db92ea081051645b03c3d9c358fb15.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; - nativeBuildInputs = [ setuptools wheel diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix new file mode 100644 index 0000000000000..c2484a8857dde --- /dev/null +++ b/pkgs/development/python-modules/python-on-whales/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +, pydantic +, requests +, tqdm +, typer +}: + +buildPythonPackage rec { + pname = "python-on-whales"; + version = "0.65.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "gabrieldemarmiesse"; + repo = "python-on-whales"; + rev = "refs/tags/v${version}"; + hash = "sha256-aFE4qeNMSxhHs7IAjYQYl15s4NkHH8balTV3N0obNPs="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + pydantic + requests + tqdm + typer + ]; + + doCheck = false; # majority of tests require Docker and/or network access + pythonImportsCheck = [ "python_on_whales" ]; + + meta = with lib; { + description = "Docker client for Python, designed to be fun and intuitive"; + homepage = "https://github.com/gabrieldemarmiesse/python-on-whales"; + changelog = "https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 1d785987cff0b..8a13ee5e89918 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "python-rtmidi"; - version = "1.5.6"; + version = "1.5.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "python_rtmidi"; inherit version; - hash = "sha256-sqCjmbtKXhpWR3eYr9QdAioYtelU9tD/krRbuZvuNxA="; + hash = "sha256-3vsaSyrob/OYwjLFPu2lVOJKSfZ96ELnnOuos8p3N00="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 9e0a7a2018dbf..15804b2c5b354 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.0.9"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-2HjdqC7JU28nVAJdaEkwmJOTfWBCqHcM1a1sHIfF3ME="; + hash = "sha256-gpY5pfvgciiQF5kDUui5UbxLlZ6X3mSNBNZWfpYD5Sc="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pytorch-msssim/default.nix b/pkgs/development/python-modules/pytorch-msssim/default.nix new file mode 100644 index 0000000000000..371ae7514aeb0 --- /dev/null +++ b/pkgs/development/python-modules/pytorch-msssim/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, torch +}: + +buildPythonPackage rec { + pname = "pytorch-msssim"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "VainF"; + repo = "pytorch-msssim"; + rev = "refs/tags/v${version}"; + hash = "sha256-bghglwQhgByC7BqbDvImSvt6edKF55NLYEPjqmmSFH8="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + torch + ]; + + pythonImportsCheck = [ "pytorch_msssim" ]; + + # This test doesn't have (automatic) tests + doCheck = false; + + meta = with lib; { + description = "Fast and differentiable MS-SSIM and SSIM for pytorch"; + homepage = "https://github.com/VainF/pytorch-msssim"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/pyversasense/default.nix b/pkgs/development/python-modules/pyversasense/default.nix index 40c2fac515774..908d9d37f7bad 100644 --- a/pkgs/development/python-modules/pyversasense/default.nix +++ b/pkgs/development/python-modules/pyversasense/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { aiohttp ]; + doCheck = pythonOlder "3.11"; # asynctest unsupported on python3.11 + nativeCheckInputs = [ asynctest pytest-asyncio diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index d238b86ed4cab..db2d65450f8e1 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.73"; + version = "9.2.74"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-44ykNXMwKHfb5ZcYBstFThGR+YkFDbmItkPEyOKKDqc="; + hash = "sha256-49Vcm6JkIpOm+U1Q/BrTi8jiEWZdaNs77TaCMjOLpyw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 04df94d137efe..246f1ae55d2ca 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools-scm , bottle , importlib-resources , proxy_tools @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "pywebview"; version = "4.3.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -29,6 +30,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + setuptools-scm qt5.wrapQtAppsHook ]; @@ -48,6 +50,8 @@ buildPythonPackage rec { xvfb-run ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + checkPhase = '' # Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 78fdcc99d267c..72d1a9f43a89f 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "qcelemental"; - version = "0.26.0"; + version = "0.27.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-oU6FEM2/2mRe8UYcGv0C77WZMRcz27pfg/zR1haKbd0="; + hash = "sha256-5VLNGD4glAIGgtt+q8YvwyAQvJU9mfyTpngwVr6gOYg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 8ff2d984a4b77..d48a84025e4c8 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.5"; + version = "0.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-TN4ti860bMegxsCMhSxVQwiTLCB9nl+CJ+xDzJQcRuE="; + hash = "sha256-d76Hsf+leJKYOh7k/RVuo6adfjMW6yAYt+vh7KNh7sA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index 450fa9c8bee21..8a65e0249e703 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.3.3"; + version = "0.3.5"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = version; - hash = "sha256-uTOKdxqbSLRJl0gnz3TvpVwhrfqflAp0wfn6d13+YrM="; + hash = "sha256-dST3eJnOcG2s9tiD/Fb9BvLS6nIpE8RXly92PK/gCC8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 1594d9296f3df..bc4ea00f055c3 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2023.9.2"; + version = "2023.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZMzOrTKoFkIt2a4daTxdY1TZn2SuJsVjiPHY4ceFgyE="; + hash = "sha256-xA8jjMyf7/8/bQnUtXYqvWyRO6QuGjKJdrVNA4kBuDU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix index 5a858e22326be..f1f6716c917f5 100644 --- a/pkgs/development/python-modules/scooby/default.nix +++ b/pkgs/development/python-modules/scooby/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "scooby"; - version = "0.7.4"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "banesullivan"; repo = "scooby"; rev = "refs/tags/v${version}"; - hash = "sha256-BgQwsgAYtRgxxjo7NHbgNME1maoZQpocGGBW7Vddr+o="; + hash = "sha256-x6GPRo0OuXJtN41urviY0joZKzq0SQjUdRBpIylgcXY="; }; nativeBuildInputs = [ @@ -54,6 +54,8 @@ buildPythonPackage rec { "test_tracking" "test_import_os_error" "test_import_time" + # TypeError: expected str, bytes or os.PathLike object, not list + "test_cli" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index c0ec21bf6afde..88ecd6f2be8a6 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -14,6 +14,7 @@ , lxml , packaging , parsel +, pexpect , protego , pydispatcher , pyopenssl @@ -42,6 +43,18 @@ buildPythonPackage rec { hash = "sha256-PL3tzgw/DgSC1hvi10WGg758188UsO5q37rduA9bNqU="; }; + patches = [ + # Fix compatiblity with Twisted>=23.8. Remove with the next release. + (fetchpatch { + url = "https://github.com/scrapy/scrapy/commit/aa95ada42cdf570f840f55c463375f8a81b303f8.patch"; + hash = "sha256-LuhA5BqtjSUgkotplvUCtvGNYOTrl0MJRCXiSBMDFzY="; + excludes = [ + "tests/CrawlerProcess/sleeping.py" + "tests/test_crawler.py" + ]; + }) + ]; + nativeBuildInputs = [ installShellFiles ]; @@ -69,6 +82,7 @@ buildPythonPackage rec { botocore glibcLocales jmespath + pexpect pytestCheckHook sybil testfixtures diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index e7eca13d73005..73564d11e8f87 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.9.3"; + version = "0.9.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0qB+FWqlh5qdy/jKLPYCXl3DewurLSOlYgcdiDtzeYE="; + hash = "sha256-OdAhA+vzIrUnE8Xdv52x7ij0LJKyxawaSY4QORP1TUg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 6a34745848d15..123b1a2c508da 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.3.0"; + version = "1.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vxzDGLa+LoKnLpaqG7kGLfSLxqQdW+9AXw2YzBAz0UY="; + hash = "sha256-xfUePKLmR1Arhs0c1ZNjca6klJdGL0o2DdGLsejE6zw="; }; nativeBuildInputs = [ @@ -36,6 +36,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "spacy" "transformers" ]; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 944fef7909c1c..ccbfef1568e89 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -29,6 +29,7 @@ , typer , typing-extensions , wasabi +, weasel , writeScript , nix , git @@ -37,14 +38,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.6.1"; - format = "setuptools"; + version = "3.7.2"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YyOphwauLVVhaUsDqLC1dRiHoAKQOkiU5orrKcxnIWY="; + hash = "sha256-zt9JJ78NP+x3OmzkjV0skb2wL+08fV7Ae9uHPxEm8aA="; }; pythonRelaxDeps = [ @@ -77,9 +78,12 @@ buildPythonPackage rec { tqdm typer wasabi + weasel ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions - ]; postPatch = '' + ]; + + postPatch = '' substituteInPlace setup.cfg \ --replace "thinc>=8.1.8,<8.2.0" "thinc>=8.1.8" ''; diff --git a/pkgs/development/python-modules/spacy/lookups-data.nix b/pkgs/development/python-modules/spacy/lookups-data.nix index 7d440706acbed..70469761eddb7 100644 --- a/pkgs/development/python-modules/spacy/lookups-data.nix +++ b/pkgs/development/python-modules/spacy/lookups-data.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, pythonOlder +, fetchFromGitHub , spacy , pytestCheckHook }: @@ -11,10 +11,13 @@ buildPythonPackage rec { version = "1.0.5"; format = "setuptools"; - src = fetchPypi { - pname = "spacy_lookups_data"; - inherit version; - hash = "sha256-b5NcgfFFvcyE/GEV9kh2QoXH/z6P8kYpUEaBTpba1jw="; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "spacy-lookups-data"; + rev = "refs/tags/v${version}"; + hash = "sha256-6sKZ+GgCjLWYnV96nub4xEUFh1qpPQpbnoxyOVrvcD0="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 8c6987d95d910..0514c9e41971a 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,458 +1,458 @@ [ { "pname": "ca_core_news_lg", - "version": "3.5.0", - "sha256": "01wssrmfjnx2lycqbpjpvzpfymwhiy1336s1123y747q7klzic08", + "version": "3.7.0", + "sha256": "1hlrbrgiahj6jkap3hrhki6zk10wg7dpajxcp540darprl7w60vy", "license": "gpl3" }, { "pname": "ca_core_news_md", - "version": "3.5.0", - "sha256": "0z8p2wqp1jsv9ipiqkw7c144nla2xgfwzijkwbb6qf4k2gdizzmq", + "version": "3.7.0", + "sha256": "0ygygvw8bs510dyz4k9sfmxxlqssmv566aac9k3xiip3k5lfgysi", "license": "gpl3" }, { "pname": "ca_core_news_sm", - "version": "3.5.0", - "sha256": "0kwifrwf8iaxpry7v453hf8vawlwqpqm9df364k4ai6bhcpqad3k", + "version": "3.7.0", + "sha256": "1cj53w9vzdb2xqjpprkhgrglm70g0vaw0308jxnd7nvgn6vfx09s", "license": "gpl3" }, { "pname": "ca_core_news_trf", - "version": "3.5.0", - "sha256": "12vlgy6n2xmap1z8fsf44dbnrw69fbdipss88v9ivwffn6yy3mj8", + "version": "3.7.0", + "sha256": "1il0ak0wh4dlxxdddwz8a2vr6817cn5fwrflxwgcd25njx7w886g", "license": "gpl3" }, { "pname": "da_core_news_lg", - "version": "3.5.0", - "sha256": "1289r8qmzfzwyvsz3dvl6r6wrbr6s1jfw1nmb0bpybjzcp48nfnh", + "version": "3.7.0", + "sha256": "04bm53v7dpdlnlk39wppfir792jp2qq9kkw0zs9i0ki68sxh8giz", "license": "cc-by-sa-40" }, { "pname": "da_core_news_md", - "version": "3.5.0", - "sha256": "1i3vamzxnv6xfa1ky2zf6cb9c0blvm5rkfmif15kvgfkjbmhi7id", + "version": "3.7.0", + "sha256": "1c35avbhkx16icnqsp571nvilcra143kqjvnszd7j0xnnzn5iqyx", "license": "cc-by-sa-40" }, { "pname": "da_core_news_sm", - "version": "3.5.0", - "sha256": "0bmbk6vnad3xqhg0jg8dhfhh75vyahsm16mn8ddzchhl7wm8axcc", + "version": "3.7.0", + "sha256": "1hlx9zgixv91x4xa489gnwm3qdghffk4fimg7mjncyjw1g9xskif", "license": "cc-by-sa-40" }, { "pname": "da_core_news_trf", - "version": "3.5.0", - "sha256": "0b8mxr1ajyw8ccm0khmcp4n3jcxl4syfrmiy9kzf3cp4hcrnqnxy", + "version": "3.7.0", + "sha256": "02hbg58ql1dcd7zdlgb959106inaqnvxphc2dmxf7myjr4si3w37", "license": "cc-by-sa-40" }, { "pname": "de_core_news_lg", - "version": "3.5.0", - "sha256": "0l3sg853xfkab7mj41n370x37iksp79nrjp7s60hhajpfbl546a0", + "version": "3.7.0", + "sha256": "1aag695nygpbxrvvknlcic79hyfzdwcc2d9vjgzq2bc43zdf05a0", "license": "mit" }, { "pname": "de_core_news_md", - "version": "3.5.0", - "sha256": "01z9bg59k4aw324dzwa3hlf8fg8yys70k6c3ih93if55svfc5xym", + "version": "3.7.0", + "sha256": "1qnq7yy38nw1pg8ysxjqyxd82yc3ncl148p90hil2njxg771g1hk", "license": "mit" }, { "pname": "de_core_news_sm", - "version": "3.5.0", - "sha256": "1qlqiqadv8r44a2y6iwpf28khmixsnwm8pss6miwdn0k5xh4kqbp", + "version": "3.7.0", + "sha256": "0r0wgf044r0nl267m5dc3zp4cq5ml4b9i6gpkas1hhn708d5sjb1", "license": "mit" }, { "pname": "de_dep_news_trf", - "version": "3.5.0", - "sha256": "0d5vkdz653yhqwykn39xm78vmxn9bcl5a9wh6hsvzhg9brffh2cn", + "version": "3.7.0", + "sha256": "05xca8gjpmn7dlj8jb93rv7r0s4wa3nq5h7rkmq6d7h7gy6zpz8f", "license": "mit" }, { "pname": "el_core_news_lg", - "version": "3.5.0", - "sha256": "1y0na4fz3jfsjh43prc76rmkc508vk42mi9mgahz7n7nwfgyxspj", + "version": "3.7.0", + "sha256": "0n7xk8kbqqis1fivsgvyfmhd6qj853wylrwjl9q352cvbv8zg6dk", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_md", - "version": "3.5.0", - "sha256": "10li1rklw2yjs5rhzm2cr2pa0x9wx504hamkyb2d9fkcq1vnj3ds", + "version": "3.7.0", + "sha256": "042vmymi40zgwxg87sfsvq7b9crigh6g9ai7cyz49spcqmvq2qd3", "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_sm", - "version": "3.5.0", - "sha256": "1j728bmmavhhn22k6ppz29ck8ag5y4299jir4y0bjjhn1ghmxq4d", + "version": "3.7.0", + "sha256": "0apky61l3gh2dvfpqaj6vqql5g6sh4bp9i91y7zfgacqvf7jp67g", "license": "cc-by-nc-sa-30" }, { "pname": "en_core_web_lg", - "version": "3.5.0", - "sha256": "0ib93cn1nv5wv39dpxxs68nzmwr3j6qdc5l71mp6hi74cy0jqwr9", + "version": "3.7.0", + "sha256": "192mhp5niixq0crqwwmp70g63wbahgr41dpmmjsdqf9189s7qswr", "license": "mit" }, { "pname": "en_core_web_md", - "version": "3.5.0", - "sha256": "02w0kjsbzmnp17p7b7cs4lqzg37mbk0ygva7c4qfb312x4wyr9vg", + "version": "3.7.0", + "sha256": "1wy2kpsninpxwjbqavh963i12041a0av4wmrn8plvb73czp995dg", "license": "mit" }, { "pname": "en_core_web_sm", - "version": "3.5.0", - "sha256": "09j61i5nrdy2amml3kij2xndqawha3dgdm7lg9f67422vpn8zlv3", + "version": "3.7.0", + "sha256": "01hps9i3v73prqfjrch0da0s38vhbvx0d73g3x1bkrmavan26bj7", "license": "mit" }, { "pname": "en_core_web_trf", - "version": "3.5.0", - "sha256": "1rqb9p8khy1zy041gsc04b5v9l4v0pc6nqzn5lm5p85161k55c7c", + "version": "3.7.0", + "sha256": "1pnm63bk5k6g6kc5s8v5pwdahqgbh3rlm5mxq3gxk8my3cfkklpc", "license": "mit" }, { "pname": "es_core_news_lg", - "version": "3.5.0", - "sha256": "0zw6z8aygh9pzdws88iclgnp277v0nlklykmdkkhqs75acpckzkx", + "version": "3.7.0", + "sha256": "1qfadw61yjz1hkp5wldg5ncj50db0b3wvpcfklybij56r4ibz6f2", "license": "gpl3" }, { "pname": "es_core_news_md", - "version": "3.5.0", - "sha256": "1b5xsidys6jhq9rnv0q38q3hck11jx4z3yvmka83cbdwvzkncaq3", + "version": "3.7.0", + "sha256": "1z9m6f2c3cbjrljdlywdd4c4qj4lky1rb3n20yav5zb9k7jbj3s4", "license": "gpl3" }, { "pname": "es_core_news_sm", - "version": "3.5.0", - "sha256": "169xg2xwn3rkhal9ygwrnkb9xzdgz4rz3419xr252zji34cr8d6a", + "version": "3.7.0", + "sha256": "07fm2bmiwkkia4v491dzkgb3dbp1qfh4j7iba2h4wv8yci6la3n4", "license": "gpl3" }, { "pname": "es_dep_news_trf", - "version": "3.5.0", - "sha256": "1py98kc6dxx5a6v6pc7hpldd6jm5s2a8vwp7l7d2jxadh947ma12", + "version": "3.7.0", + "sha256": "1n5sk5jlj6gx4w2ka1ia93bmi4nm2cyfg7fbca2kvmsg6zw8hq27", "license": "gpl3" }, { "pname": "fi_core_news_lg", - "version": "3.5.0", - "sha256": "0j3r01a0yqgj8apfjv1wkblhqg86yp2nzxv51nf99pi2nmh81jzx", + "version": "3.7.0", + "sha256": "08lk2dgwm99nj2a355s682ar4xwg1av4z3r6qpwq72rkm2h8jkmm", "license": "cc-by-sa-40" }, { "pname": "fi_core_news_md", - "version": "3.5.0", - "sha256": "09qfzwyw6wfdmw1bgd1kfg1gdbmzal5z1r240djivxygzn6f1ixs", + "version": "3.7.0", + "sha256": "07hqjw6w8332zf3ki5pbrv7m1kc4y6j3f0czharvv0grr2sfvh84", "license": "cc-by-sa-40" }, { "pname": "fi_core_news_sm", - "version": "3.5.0", - "sha256": "1ly71cacy0gr62acvc3vl8dxh2czd6zkm7ijprisdblw17ik9yln", + "version": "3.7.0", + "sha256": "03bhh3z3r70km19p3x202g66hikfyh309hgb96sycb8lhfr737lk", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_lg", - "version": "3.5.0", - "sha256": "1zjf348c60xf35zaldgykrlskvrryxv9vdaz49xlwq9caw0yzyh4", + "version": "3.7.0", + "sha256": "02dv00w67alc1avwq93hara49va7mnsmmm2kww961p5a3k3ldz20", "license": "lgpllr" }, { "pname": "fr_core_news_md", - "version": "3.5.0", - "sha256": "1ph768pv2brv94fzydw8d2daxypvy61zwbmi4hbalgaar62lglhl", + "version": "3.7.0", + "sha256": "184gxwgf980x3vsn45zycd3cr1mkl3r1vbf3hb5hrhs8xk3y1v34", "license": "lgpllr" }, { "pname": "fr_core_news_sm", - "version": "3.5.0", - "sha256": "1vhamgrv7adk85i9b3s5bh6j0aw21rma5xcb3ggy9ay51jfmkzzm", + "version": "3.7.0", + "sha256": "1ifbazd9hs1fhy22hjqhwkq0bnnsr3km3ff60v8arkyq5vlprhdb", "license": "lgpllr" }, { "pname": "fr_dep_news_trf", - "version": "3.5.0", - "sha256": "0ciyilnc5gx0f1qakim57pizj1dknm8l8gd72avmrmzg3z52mgl2", + "version": "3.7.0", + "sha256": "0shhlmyyd79bbvxf6dfr5r99lfhjcywvvrji67k2hxz4604q8bxv", "license": "lgpllr" }, { "pname": "hr_core_news_lg", - "version": "3.5.0", - "sha256": "1fvkzfi539fmp6jy3hjcrwvdxw5k6zc3h351s887xidlw3gs1kr3", + "version": "3.7.0", + "sha256": "1r8cdyawf6fdvx1xn1l470mx31lbx5cjpivlx1pvv9ckp71zp28z", "license": "cc-by-sa-40" }, { "pname": "hr_core_news_md", - "version": "3.5.0", - "sha256": "1mi6k9qjxbigrl2fa60blyyz8b54jda5hc1s96vn9rykg4rni8cr", + "version": "3.7.0", + "sha256": "1dzi6dxwjpbddc0rjqajj4k1c61sacyycwnjvy03h3aclxacqn53", "license": "cc-by-sa-40" }, { "pname": "hr_core_news_sm", - "version": "3.5.0", - "sha256": "1s22mx7y5h135ry5l49az30l7mw7fdrz53s4a9gaxfsp9rzs474g", + "version": "3.7.0", + "sha256": "0dmhv1fa46hi78jgv562v4x3mfl7svchs6kiz35s63ph9ik5r6f2", "license": "cc-by-sa-40" }, { "pname": "it_core_news_lg", - "version": "3.5.0", - "sha256": "1z64s632wbjlqmnmppcnpf2pfrjbml30gbil7mk0qln2i2hrh0qq", + "version": "3.7.0", + "sha256": "0gwn6pf0rzbplahs2wnzp6379mmj066dqhijhq4ln4552fz4d1yx", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_md", - "version": "3.5.0", - "sha256": "055gj5ai4rda5yc8lkhmfcwpfm7yfzyl6v05xhziz8sh1x4z58kz", + "version": "3.7.0", + "sha256": "003w99glj5jgb6gfqygb4c5jljhc85ck6yqn49h9m8fa9vmaylhx", "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_sm", - "version": "3.5.0", - "sha256": "1fw262m7bl3g31gz0jb6fxrd385p67q82wfrsff6z9daxi3pi6ip", + "version": "3.7.0", + "sha256": "0kng2w5xj1irz6c5d6vl4px9my1z41h8zfvf9b01rh9yvjmhfyzc", "license": "cc-by-nc-sa-30" }, { "pname": "ko_core_news_lg", - "version": "3.5.0", - "sha256": "1q314wb114ynkf455cm8jd9jsx3yb6y0rrgf820ww31jlk5jzaa9", + "version": "3.7.0", + "sha256": "0hxwkb1w58vb4g1162ry12a63hnj20q20n66xnlvc0r96ibj4fia", "license": "cc-by-sa-40" }, { "pname": "ko_core_news_md", - "version": "3.5.0", - "sha256": "0dy7kk4bvjl944vv2m4hcvppar7clwq28y2rk40i3022jbqh2nxq", + "version": "3.7.0", + "sha256": "1ai7cyk58c7rj0dy82l01w5r4fkp2cpnhcsarzas1ml0icnk1srm", "license": "cc-by-sa-40" }, { "pname": "ko_core_news_sm", - "version": "3.5.0", - "sha256": "1i5q8dpyfa2sy80hr81r6s9dqpawp36ni8slz035b0wd9sq3i73v", + "version": "3.7.0", + "sha256": "16m1lsikf8ghsazpdprd9fc4n3m8an9qzjbyjwyvwkr0f2p0nmph", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_lg", - "version": "3.5.0", - "sha256": "002xalsrf85vg4c3gmj1zaka1zfy7smxv2xpqkl00idiixc5822y", + "version": "3.7.0", + "sha256": "174p8i2lnwq324qcs85s3c0j7iyav12yk0i896l23khg9gyzkmlg", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_md", - "version": "3.5.0", - "sha256": "0rd3jmy7d42q5vwgx5kdf24kzd333i5l6v7pjmc5qnq4vwhqr96j", + "version": "3.7.0", + "sha256": "1117sij5w4s297q5j6h210hafh2amm6pd9m9m7m3608rfwsvm9g8", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "3.5.0", - "sha256": "039ldh4wvlnkq7cfxahk0m9hvb90hh2x0dqsqygglbdflxibmia0", + "version": "3.7.0", + "sha256": "1j04apdc63c2b2namic4blhm9mk8inmr8ynid09mncljwskg0fjb", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_lg", - "version": "3.5.0", - "sha256": "11daxcyapaqskwmfxl57s3hbjaajk79khnafg4k7zshlqpdyvc3p", + "version": "3.7.0", + "sha256": "0fshypj08hvcbbqjfxkzyfs72p5rm5fw1pfclgln2y0whfap0lqx", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_md", - "version": "3.5.0", - "sha256": "0iky995dql569vg1manz4gv65jgr01nlx0559fljmysiqhq8ax76", + "version": "3.7.0", + "sha256": "1il8pzfk2nd09hd8kmk5znf66ir4bsrp1ax7jaxghi76ggrbpzyx", "license": "cc-by-sa-40" }, { "pname": "mk_core_news_sm", - "version": "3.5.0", - "sha256": "1ghjpk6p5p19l4gichg361191i7xibp5zw0g1hqn87y0x12d20y3", + "version": "3.7.0", + "sha256": "1805hkkm3hjbzw8pg6q08p61bpjk5h13ldzpik0gb9wqw9f69dbp", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_lg", - "version": "3.5.0", - "sha256": "06pcfcy28r57n9dysjqx6py8r0awwfan4g5s97byl1486h77jkaz", + "version": "3.7.0", + "sha256": "1zqwp8a8d26mi94dkib5ahhkr9hawxx4vag4fhibfa6m0prpzh9h", "license": "mit" }, { "pname": "nb_core_news_md", - "version": "3.5.0", - "sha256": "05vsaqw4x8swi4yamwlwg4rw7nj3bsyxdq8g5qjhcj0mjdabz6kj", + "version": "3.7.0", + "sha256": "1ilxscc6hnmiby7ip7kgx3aih9msqmg21iqakkwny3z1lnnly466", "license": "mit" }, { "pname": "nb_core_news_sm", - "version": "3.5.0", - "sha256": "030j0v1csn2q38sy7nfxkx60i8ga7mlkma2f99mlh739j1s4nxaz", + "version": "3.7.0", + "sha256": "1wrchw1rhlzrji5j46lpwzydiaxcywaglz0nvm4vk1np45r7l3dm", "license": "mit" }, { "pname": "nl_core_news_lg", - "version": "3.5.0", - "sha256": "0qcfka8ahcdv1y9lz4zsd1q6xlfxajf5qbymg9cabxxyqjzjqwys", + "version": "3.7.0", + "sha256": "1777sdmjcc7lnj0j26zf00ab7pr09v1220k47fq724cw9l0knin1", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_md", - "version": "3.5.0", - "sha256": "1cl3vynhlgkby7cnda1sgxqi8vrcj5amplmm96xhq5nmb6z6b8jx", + "version": "3.7.0", + "sha256": "19g6hzljz0zi1fppl7c3w8gdak42af3f7z45cg12qyw7vnjl9988", "license": "cc-by-sa-40" }, { "pname": "nl_core_news_sm", - "version": "3.5.0", - "sha256": "16dkiklayp7irc5hwf7qv4pjww6kjg5pd0say25niclrgxfn3482", + "version": "3.7.0", + "sha256": "0gcbb0vs5snif4j5a7z9ha2sj9jby0hnxbp0w5h73yxyg37fk8d4", "license": "cc-by-sa-40" }, { "pname": "pl_core_news_lg", - "version": "3.5.0", - "sha256": "194mjgbph4xgf7xywwajb0p4l19ww2z2ln7jykhnn2gy3j5dm6pd", + "version": "3.7.0", + "sha256": "0glpd8lv7gwq3bryx32q84ny6pdvwrjm7lhxg9h2cdjrair8vx94", "license": "gpl3" }, { "pname": "pl_core_news_md", - "version": "3.5.0", - "sha256": "0435glcxzw1axlq8dkqv0wn8nxgav0dpx3pzvx475avxfp4qm1rv", + "version": "3.7.0", + "sha256": "04qwfh3dam7advyysdcdak7vna5gvirns001zq09kxhj766bc2k9", "license": "gpl3" }, { "pname": "pl_core_news_sm", - "version": "3.5.0", - "sha256": "1ifl01ncfdph32ij1kl8f74ksjw0xiyszabi6q6pskjmcwhfixp7", + "version": "3.7.0", + "sha256": "00wygnwjpvfgiccb643720691pxhcb4pnk3zjj35hv9gbbx6qb8c", "license": "gpl3" }, { "pname": "pt_core_news_lg", - "version": "3.5.0", - "sha256": "182bl598x65akb368fy2nf4qnq89a8n1hcj2g92n3jwhn6d1xfpw", + "version": "3.7.0", + "sha256": "1im0hgr6wd4sfsfb0ddnl2ad9pi1vs0vvr7rq3g14vda3x2f1rxy", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_md", - "version": "3.5.0", - "sha256": "19h8nzx5qfmfcv97sqrzwlv0n45i5yqcngf855djc360mfp2hv69", + "version": "3.7.0", + "sha256": "0zpgxg3ass084qv4bvk9wz15ya92w6a7d2p9p24g49a530b8gd7y", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "3.5.0", - "sha256": "19raq2b6q6a3ipxfzg4mdhq2wff9di5ip2mzf48blrj2xp2rjxyg", + "version": "3.7.0", + "sha256": "0z64w8599xwjvxdmrdlr08yyk4a5174m4a39m3zivgib0b5jyvdq", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_lg", - "version": "3.5.0", - "sha256": "10dc7c94wm3mia3japcsplxsv708q30yrqjml68zrrm5awwk30a7", + "version": "3.7.0", + "sha256": "1y45xhdjlhf8026vlsdrxvmiwj8p9hzlpdg628kdcdzmcrr23l5j", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_md", - "version": "3.5.0", - "sha256": "1j8321nn8i13gy6n6rlcw7vsf2wnaf2ybiscwif3wrkzvb07113b", + "version": "3.7.0", + "sha256": "0jw71lav2fim48ff34mf137dsnn3arac555b9rf4flamiy8xg7y6", "license": "cc-by-sa-40" }, { "pname": "ro_core_news_sm", - "version": "3.5.0", - "sha256": "117dyvkdgfrymh8qvdcfrcc6s8pcbnyzg83sib4vjv0nxxfp2xl8", + "version": "3.7.0", + "sha256": "0r35hxm6dgk2fnwl79ss25g6lfkgrd1h24zf96ys2p3cppp2i167", "license": "cc-by-sa-40" }, { "pname": "ru_core_news_lg", - "version": "3.5.0", - "sha256": "1zdlsvlhcfxg2nvcrqvjyx9qyzjl39xb482qqhn572bv89v35h76", + "version": "3.7.0", + "sha256": "02qnl0cfvx0m0icdbpn9zfsv39sp9k6sfdarzazhz7xnxzxib93q", "license": "mit" }, { "pname": "ru_core_news_md", - "version": "3.5.0", - "sha256": "0nqlr2kpbznksh5djc669kcqc61i0ljiazn4z81dblfhxxhv692x", + "version": "3.7.0", + "sha256": "187lkkm04x1ylg3jzyhf9avzpj2jkb48n86i36hqi6iqdv6yhfd5", "license": "mit" }, { "pname": "ru_core_news_sm", - "version": "3.5.0", - "sha256": "0yb0gx8kl5w0f9pkii788vxv9alc0xb08gdfnim0g2givqa5p4fn", + "version": "3.7.0", + "sha256": "11mh1rd0q024xfagdqkly1n4nndksrlq650n51jl1x1pmzlsdgzl", "license": "mit" }, { "pname": "sv_core_news_lg", - "version": "3.5.0", - "sha256": "100rf8wv4nf679fvvrnvd67wlx5w5d755ssvk9g76gzalzxywrmz", + "version": "3.7.0", + "sha256": "05qaff8r3vs30zaxja1lgpibd12njp9ciq49zs26i6d4dqa18hdp", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_md", - "version": "3.5.0", - "sha256": "0ll1i767xb63gqmarxqk7nwg1xn5wjjhrix17hjq03q7rms267mw", + "version": "3.7.0", + "sha256": "0c64lqm10zmy863gs5h3ghx7662c8g7iyapn2rjhmz6909d82yyl", "license": "cc-by-sa-40" }, { "pname": "sv_core_news_sm", - "version": "3.5.0", - "sha256": "1c0w85xn8lnx394qmmnv3px68w0pha7fxx0qlqa74r2mfi3sv6s7", + "version": "3.7.0", + "sha256": "1ik8b2nvxdalglwqg0zl4wbqnd2dyhdcy5hvxh40gi77rg2qd6kb", "license": "cc-by-sa-40" }, { "pname": "uk_core_news_lg", - "version": "3.5.0", - "sha256": "0hl9xjnxslckc6wvfgkj30r3py8q95yj7mrxdb6m5gvknlq72kp2", + "version": "3.7.0", + "sha256": "1qbw16y3ha690fqq71w7r46n8mz7d8za2iw1lljpqpf49my408q1", "license": "mit" }, { "pname": "uk_core_news_md", - "version": "3.5.0", - "sha256": "05mg719ra5khm61yr7xhfcsh3apl29s3h2wkq0v87gkyqn13812p", + "version": "3.7.0", + "sha256": "0znfyl8cdvxbxfhypwkjv84hcs6n457wh4j2cl1sfp9pgsd7bmzb", "license": "mit" }, { "pname": "uk_core_news_sm", - "version": "3.5.0", - "sha256": "1dkbmjbyhf6vsr7c4m4njgi969sfhbdnp73skl3k206dign5qgnz", + "version": "3.7.0", + "sha256": "08scx97j87rrhyrg5smj9ydwmdhl81859qaqj2klgqqpykg0xwlc", "license": "mit" }, { "pname": "uk_core_news_trf", - "version": "3.5.0", - "sha256": "02bhvcivalifrxd3vl118799wvg6hgykj31wwfdsgnq68lwc28fb", + "version": "3.7.0", + "sha256": "14s4xwr0qs8x3d2fca2m1nj6ksl82gggj2by7c817gii1bdvn47p", "license": "mit" }, { "pname": "xx_ent_wiki_sm", - "version": "3.5.0", - "sha256": "042aszgyzbp5n5bn6lgk1m38zxfl1irbryid5fslgh19b19l8v3x", + "version": "3.7.0", + "sha256": "1k06aa8xsx2qcmd4lz02sfxmgif5nngni8dc4y0w0d4x88icdscn", "license": "mit" }, { "pname": "xx_sent_ud_sm", - "version": "3.5.0", - "sha256": "08hqldksllz387d6h3ch95g6rb6ls329hqh0cxyglg9njw9sc97z", + "version": "3.7.0", + "sha256": "13fc4dmmmkanxaxabyx0sa2sh53p92jp3mj263pf31yh98kryxpw", "license": "cc-by-sa-30" }, { "pname": "zh_core_web_lg", - "version": "3.5.0", - "sha256": "17z7g5my5lyp34prcdqzv6w3cgyb7h5gvq61iwbkzppv0n2kldz2", + "version": "3.7.0", + "sha256": "1kqdczq5id0sqnyg3sq5g8n7fcknz53srvd72qmz4wrymy5h81qa", "license": "mit" }, { "pname": "zh_core_web_md", - "version": "3.5.0", - "sha256": "03qxsxdvxn8l11drzicp53jma6j54gxgi8bw53xvbqr9cajxbqva", + "version": "3.7.0", + "sha256": "03m5gnx47mcyx7sh1g3dgqnarvprdkvkyxibsli6yrnvx3vz434j", "license": "mit" }, { "pname": "zh_core_web_sm", - "version": "3.5.0", - "sha256": "0n3ajnbiyr56vy0kplm53rb421cxlc12q5f9p5i7icyv14dy4kml", + "version": "3.7.0", + "sha256": "1x9y4z2883m21rsvv6sw71l1nva3j8an8csdsabs4y84kb5y2by2", "license": "mit" }, { "pname": "zh_core_web_trf", - "version": "3.5.0", - "sha256": "0gc4nn7zsng80j2qn8f7y85akls87dng72jkxp9pldav7k8435nb", + "version": "3.7.0", + "sha256": "1y4c9z4vjywmpg61yxsyp80cmz5s3aa95car01wq3i42qj09bvm6", "license": "mit" } ] diff --git a/pkgs/development/python-modules/sphinx-thebe/default.nix b/pkgs/development/python-modules/sphinx-thebe/default.nix index d2e05c755a252..d6d150d6e92bf 100644 --- a/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -1,29 +1,42 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi +, hatch-vcs +, hatchling +, pythonOlder , sphinx }: buildPythonPackage rec { pname = "sphinx-thebe"; - version = "0.2.1"; - format = "pyproject"; + version = "0.3.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - sha256 = "f4c8c1542054f991b73fcb28c4cf21697e42aba2f83f22348c1c851b82766583"; + inherit version; + pname = "sphinx_thebe"; + hash = "sha256-xg2rG1m5LWouq41xGeh8BzBHDaYvPIS/bKdWkEh9BQU="; }; - propagatedBuildInputs = [ sphinx ]; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + sphinx + ]; - pythonImportsCheck = [ "sphinx_thebe" ]; + pythonImportsCheck = [ + "sphinx_thebe" + ]; meta = with lib; { description = "Integrate interactive code blocks into your documentation with Thebe and Binder"; homepage = "https://github.com/executablebooks/sphinx-thebe"; + changelog = "https://github.com/executablebooks/sphinx-thebe/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/development/python-modules/sqids/default.nix b/pkgs/development/python-modules/sqids/default.nix index a53be04df7112..dc6befc179919 100644 --- a/pkgs/development/python-modules/sqids/default.nix +++ b/pkgs/development/python-modules/sqids/default.nix @@ -8,22 +8,20 @@ buildPythonPackage rec { pname = "sqids"; - version = "0.3.0"; - format = "pyproject"; + version = "0.4.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qAY41kOp0m+mua/4bvVwuDW5p0EpwY675Ux3W1JsqbE="; + hash = "sha256-U9nVpRc9PIM1ZO+bcL3RGIfAdlUMf+uFw/SpPTAjdnA="; }; nativeBuildInputs = [ setuptools-scm ]; - doCheck = true; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 4054cfcacf982..6a4ea78b82e0b 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlobject"; - version = "3.10.2"; + version = "3.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "SQLObject"; inherit version; - hash = "sha256-dW9IsIdOSnCG3thWhYwIsz0Oa5runnXD84S5ITPH3ww="; + hash = "sha256-pbXO+gXgKD2ycuG6RirEnQnGmBJpUkorptBrS4b8FS4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index f1b47d75b8c50..17378c8611a08 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "sshfs"; - version = "2023.7.0"; + version = "2023.10.0"; src = fetchFromGitHub { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XKBpB3ackquVKsdF8b/45Kaz5Y2ussOl0o0HkD+k9tM="; + hash = "sha256-6MueDHR+jZFDZg4zufEVhBtSwcgDd7KnW9gJp2hDu0A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/syncer/default.nix b/pkgs/development/python-modules/syncer/default.nix index cd3bbf699de2c..48345b94e4213 100644 --- a/pkgs/development/python-modules/syncer/default.nix +++ b/pkgs/development/python-modules/syncer/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "syncer"; - version = "1.3.0"; + version = "2.0.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "miyakogi"; repo = pname; rev = "v${version}"; - sha256 = "13y8jllix1ipkcg9lxa4nxk8kj24vivxfizf4d02cdrha9dw500v"; + sha256 = "sha256-3EYWy6LuZ/3i+9d0QaclCqWMMw5O3WzhTY3LUL5iMso="; }; # Tests require an not maintained package (xfail) diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 677afda4f1ff2..8e017cc55b0f2 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -54,7 +54,8 @@ let LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { - sha256 = "sha256-XChXujA2XpnkybrraN3FIJA/QkxLCfX97id2jMFzFJk="; + # FIXME: tensorflow is currently marked as broken, update the hash once it's fixed + sha256 = "sha256-0ChXujA2XpnkybrraN3FIJA/QkxLCfX97id2jMFzFJk="; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tensorflow/absl_py_argparse_flags.patch b/pkgs/development/python-modules/tensorflow/absl_py_argparse_flags.patch new file mode 100644 index 0000000000000..1b130e22662e1 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/absl_py_argparse_flags.patch @@ -0,0 +1,11 @@ +diff -Naurd x/third_party/systemlibs/absl_py.absl.flags.BUILD y/third_party/systemlibs/absl_py.absl.flags.BUILD +--- x/third_party/systemlibs/absl_py.absl.flags.BUILD 2023-09-20 06:02:15.079683729 +0000 ++++ y/third_party/systemlibs/absl_py.absl.flags.BUILD 2023-09-20 06:04:58.491897303 +0000 +@@ -5,3 +5,7 @@ + py_library( + name = "flags", + ) ++ ++py_library( ++ name = "argparse_flags", ++) diff --git a/pkgs/development/python-modules/tensorflow/absl_to_std.patch b/pkgs/development/python-modules/tensorflow/absl_to_std.patch new file mode 100644 index 0000000000000..b834ec983c94e --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/absl_to_std.patch @@ -0,0 +1,389 @@ +diff -Naurd x/tensorflow/c/experimental/stream_executor/stream_executor.cc y/tensorflow/c/experimental/stream_executor/stream_executor.cc +--- x/tensorflow/c/experimental/stream_executor/stream_executor.cc 2023-10-19 14:25:48.648646416 +0000 ++++ y/tensorflow/c/experimental/stream_executor/stream_executor.cc 2023-10-19 14:29:11.700743574 +0000 +@@ -23,6 +23,7 @@ + + #include <string> + #include <utility> ++#include <optional> + + #include "absl/functional/any_invocable.h" + #include "tensorflow/c/c_api_macros.h" +@@ -275,17 +276,17 @@ + stream_executor_->unified_memory_deallocate(&device_, mem); + } + +- absl::optional<AllocatorStats> GetAllocatorStats() override { ++ std::optional<AllocatorStats> GetAllocatorStats() override { + SP_AllocatorStats c_stats{SP_ALLOCATORSTATS_STRUCT_SIZE}; + TF_Bool has_stats = + stream_executor_->get_allocator_stats(&device_, &c_stats); + if (!has_stats) { +- return absl::nullopt; ++ return std::nullopt; + } + tsl::Status status = ValidateSPAllocatorStats(c_stats); + if (!status.ok()) { + LOG(ERROR) << status.message(); +- return absl::nullopt; ++ return std::nullopt; + } + ::stream_executor::AllocatorStats stats; + stats.num_allocs = c_stats.num_allocs; +diff -Naurd x/tensorflow/c/experimental/stream_executor/stream_executor_test.cc y/tensorflow/c/experimental/stream_executor/stream_executor_test.cc +--- x/tensorflow/c/experimental/stream_executor/stream_executor_test.cc 2023-10-19 14:25:48.648646416 +0000 ++++ y/tensorflow/c/experimental/stream_executor/stream_executor_test.cc 2023-10-19 14:29:11.700743574 +0000 +@@ -15,6 +15,7 @@ + #include "tensorflow/c/experimental/stream_executor/stream_executor.h" + + #include <utility> ++#include <optional> + + #include "tensorflow/c/experimental/stream_executor/stream_executor_internal.h" + #include "tensorflow/c/experimental/stream_executor/stream_executor_test_util.h" +@@ -239,7 +240,7 @@ + }; + + StreamExecutor* executor = GetExecutor(0); +- absl::optional<AllocatorStats> optional_stats = executor->GetAllocatorStats(); ++ std::optional<AllocatorStats> optional_stats = executor->GetAllocatorStats(); + ASSERT_TRUE(optional_stats.has_value()); + AllocatorStats stats = optional_stats.value(); + ASSERT_EQ(stats.bytes_in_use, 123); +diff -Naurd x/tensorflow/compiler/xla/stream_executor/allocator_stats.h y/tensorflow/compiler/xla/stream_executor/allocator_stats.h +--- x/tensorflow/compiler/xla/stream_executor/allocator_stats.h 2023-10-19 14:25:55.064649379 +0000 ++++ y/tensorflow/compiler/xla/stream_executor/allocator_stats.h 2023-10-19 14:29:11.700743574 +0000 +@@ -17,6 +17,7 @@ + #define TENSORFLOW_COMPILER_XLA_STREAM_EXECUTOR_ALLOCATOR_STATS_H_ + + #include <string> ++#include <optional> + + #include "absl/types/optional.h" + #include "tensorflow/compiler/xla/stream_executor/platform/port.h" +diff -Naurd x/tensorflow/core/common_runtime/mkl_cpu_allocator.h y/tensorflow/core/common_runtime/mkl_cpu_allocator.h +--- x/tensorflow/core/common_runtime/mkl_cpu_allocator.h 2023-10-19 14:25:58.996651199 +0000 ++++ y/tensorflow/core/common_runtime/mkl_cpu_allocator.h 2023-10-19 14:29:11.700743574 +0000 +@@ -22,6 +22,7 @@ + #ifdef INTEL_MKL + + #include <cstdlib> ++#include <optional> + + #include "tensorflow/core/common_runtime/bfc_allocator.h" + #include "tensorflow/core/common_runtime/pool_allocator.h" +@@ -80,7 +81,7 @@ + port::AlignedFree(ptr); + } + +- absl::optional<AllocatorStats> GetStats() override { ++ std::optional<AllocatorStats> GetStats() override { + mutex_lock l(mutex_); + return stats_; + } +@@ -242,7 +243,7 @@ + large_size_allocator_->DeallocateRaw(ptr); + } + } +- absl::optional<AllocatorStats> GetStats() override { ++ std::optional<AllocatorStats> GetStats() override { + auto s_stats = small_size_allocator_->GetStats(); + auto l_stats = large_size_allocator_->GetStats(); + +diff -Naurd x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc +--- x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc 2023-10-19 14:25:59.236651310 +0000 ++++ y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.cc 2023-10-19 14:29:11.700743574 +0000 +@@ -32,7 +32,7 @@ + return sub_allocator_->Free(ptr, 0); + } + +-absl::optional<AllocatorStats> PluggableDeviceSimpleAllocator::GetStats() { ++std::optional<AllocatorStats> PluggableDeviceSimpleAllocator::GetStats() { + AllocatorStats stats_; + stats_.num_allocs = 0; + stats_.peak_bytes_in_use = 0; +diff -Naurd x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h +--- x/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h 2023-10-19 14:25:59.236651310 +0000 ++++ y/tensorflow/core/common_runtime/pluggable_device/pluggable_device_simple_allocator.h 2023-10-19 14:29:11.700743574 +0000 +@@ -19,6 +19,7 @@ + #include <string> + #include <unordered_map> + #include <vector> ++#include <optional> + + #include "tensorflow/core/common_runtime/device/device_mem_allocator.h" + #include "tensorflow/core/platform/thread_annotations.h" +@@ -37,7 +38,7 @@ + + bool TracksAllocationSizes() const override { return false; } + string Name() override { return "Simple allocator"; } +- absl::optional<AllocatorStats> GetStats() override; ++ std::optional<AllocatorStats> GetStats() override; + + AllocatorMemoryType GetMemoryType() const override { + return sub_allocator_->GetMemoryType(); +diff -Naurd x/tensorflow/core/common_runtime/process_state.h y/tensorflow/core/common_runtime/process_state.h +--- x/tensorflow/core/common_runtime/process_state.h 2023-10-19 14:25:59.076651236 +0000 ++++ y/tensorflow/core/common_runtime/process_state.h 2023-10-19 14:29:11.704743576 +0000 +@@ -20,6 +20,7 @@ + #include <map> + #include <unordered_map> + #include <vector> ++#include <optional> + + #include "tensorflow/core/framework/allocator.h" + #include "tensorflow/core/framework/allocator_registry.h" +@@ -144,7 +145,7 @@ + size_t AllocatedSize(const void* p) const override { + return a_->AllocatedSize(p); + } +- absl::optional<AllocatorStats> GetStats() override { return a_->GetStats(); } ++ std::optional<AllocatorStats> GetStats() override { return a_->GetStats(); } + bool ClearStats() override { return a_->ClearStats(); } + + AllocatorMemoryType GetMemoryType() const override { +diff -Naurd x/tensorflow/core/common_runtime/step_stats_collector.cc y/tensorflow/core/common_runtime/step_stats_collector.cc +--- x/tensorflow/core/common_runtime/step_stats_collector.cc 2023-10-19 14:25:59.112651253 +0000 ++++ y/tensorflow/core/common_runtime/step_stats_collector.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -15,6 +15,7 @@ + #include "tensorflow/core/common_runtime/step_stats_collector.h" + + #include <memory> ++#include <optional> + + #include "tensorflow/core/common_runtime/costmodel_manager.h" + #include "tensorflow/core/framework/allocation_description.pb.h" +@@ -175,7 +176,7 @@ + memory->set_peak_bytes(std::get<1>(sizes)); + memory->set_live_bytes(std::get<2>(sizes)); + +- absl::optional<AllocatorStats> stats = allocator->GetStats(); ++ std::optional<AllocatorStats> stats = allocator->GetStats(); + if (stats) { + memory->set_allocator_bytes_in_use(stats->bytes_in_use); + } +diff -Naurd x/tensorflow/core/framework/allocator_test.cc y/tensorflow/core/framework/allocator_test.cc +--- x/tensorflow/core/framework/allocator_test.cc 2023-10-19 14:25:59.524651443 +0000 ++++ y/tensorflow/core/framework/allocator_test.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -17,6 +17,7 @@ + + #include <algorithm> + #include <vector> ++#include <optional> + + #include "tensorflow/core/framework/typed_allocator.h" + #include "tensorflow/core/platform/logging.h" +@@ -33,7 +34,7 @@ + + static void CheckStats(Allocator* a, int64_t num_allocs, int64_t bytes_in_use, + int64_t peak_bytes_in_use, int64_t largest_alloc_size) { +- absl::optional<AllocatorStats> stats = a->GetStats(); ++ std::optional<AllocatorStats> stats = a->GetStats(); + EXPECT_TRUE(stats); + if (!stats) { + return; +@@ -255,7 +256,7 @@ + EXPECT_EQ(e0.Name(), "MemoryAllocation") + << "XSpace: " << xspace.DebugString(); + { +- absl::optional<std::string> bytes_allocated, peak_bytes_in_use, ++ std::optional<std::string> bytes_allocated, peak_bytes_in_use, + requested_bytes, allocation_bytes; + e0.ForEachStat([&](const ::tensorflow::profiler::XStatVisitor& stat) { + LOG(ERROR) << "STAT " << stat.Name() << ": " << stat.ToString(); +@@ -282,7 +283,7 @@ + EXPECT_EQ(e1.Name(), "MemoryDeallocation") + << "XSpace: " << xspace.DebugString(); + { +- absl::optional<std::string> bytes_allocated, peak_bytes_in_use, ++ std::optional<std::string> bytes_allocated, peak_bytes_in_use, + allocation_bytes; + e1.ForEachStat([&](const ::tensorflow::profiler::XStatVisitor& stat) { + if (stat.Name() == "bytes_allocated") { +diff -Naurd x/tensorflow/core/framework/tracking_allocator_test.cc y/tensorflow/core/framework/tracking_allocator_test.cc +--- x/tensorflow/core/framework/tracking_allocator_test.cc 2023-10-19 14:25:59.700651525 +0000 ++++ y/tensorflow/core/framework/tracking_allocator_test.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -16,6 +16,7 @@ + #include "tensorflow/core/framework/tracking_allocator.h" + + #include <unordered_map> ++#include <optional> + + #include "tensorflow/core/framework/allocator.h" + #include "tensorflow/core/platform/logging.h" +@@ -44,7 +45,7 @@ + EXPECT_NE(size_map_.end(), iter); + return iter->second; + } +- absl::optional<AllocatorStats> GetStats() override { return absl::nullopt; } ++ std::optional<AllocatorStats> GetStats() override { return std::nullopt; } + + private: + std::unordered_map<const void*, size_t> size_map_; +@@ -58,7 +59,7 @@ + } + void DeallocateRaw(void* ptr) override {} + bool TracksAllocationSizes() const override { return true; } +- absl::optional<AllocatorStats> GetStats() override { return absl::nullopt; } ++ std::optional<AllocatorStats> GetStats() override { return std::nullopt; } + }; + + TEST(TrackingAllocatorTest, SimpleNoTracking) { +diff -Naurd x/tensorflow/core/grappler/clusters/single_machine.cc y/tensorflow/core/grappler/clusters/single_machine.cc +--- x/tensorflow/core/grappler/clusters/single_machine.cc 2023-10-19 14:25:59.964651648 +0000 ++++ y/tensorflow/core/grappler/clusters/single_machine.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -17,6 +17,7 @@ + + #include <atomic> + #include <memory> ++#include <optional> + + #include "tensorflow/cc/training/queue_runner.h" + #include "tensorflow/core/common_runtime/device.h" +@@ -230,7 +231,7 @@ + return Status(absl::StatusCode::kInvalidArgument, + "Tracking allocation is not enabled."); + } +- absl::optional<AllocatorStats> stats = allocator->GetStats(); ++ std::optional<AllocatorStats> stats = allocator->GetStats(); + (*device_peak_memory)[device->name()] = + (stats ? stats->peak_bytes_in_use : 0); + } +diff -Naurd x/tensorflow/core/kernels/stack.cc y/tensorflow/core/kernels/stack.cc +--- x/tensorflow/core/kernels/stack.cc 2023-10-19 14:26:01.668652437 +0000 ++++ y/tensorflow/core/kernels/stack.cc 2023-10-19 14:29:11.704743576 +0000 +@@ -18,6 +18,7 @@ + #include <limits.h> + #include <atomic> + #include <vector> ++#include <optional> + + #include "tensorflow/core/common_runtime/device.h" + #include "tensorflow/core/framework/device_base.h" +@@ -245,7 +246,7 @@ + DeviceContext* device_ctxt = ctx->op_device_context(); + auto device = static_cast<tensorflow::Device*>(ctx->device()); + Allocator* allocator = device->GetAllocator(alloc_attrs); +- absl::optional<AllocatorStats> stats = allocator->GetStats(); ++ std::optional<AllocatorStats> stats = allocator->GetStats(); + if (stats && *stats->bytes_limit && + stats->bytes_in_use > (*stats->bytes_limit * kOccupancy)) { + // Asynchronously copy the tensor from GPU to CPU memory. +diff -Naurd x/tensorflow/python/tfe_wrapper.cc y/tensorflow/python/tfe_wrapper.cc +--- x/tensorflow/python/tfe_wrapper.cc 2023-10-19 14:26:10.716656639 +0000 ++++ y/tensorflow/python/tfe_wrapper.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -14,6 +14,7 @@ + ==============================================================================*/ + + #include <memory> ++#include <optional> + + #include "Python.h" + #include "absl/strings/match.h" +@@ -691,7 +692,7 @@ + tensorflow::AllocatorAttributes attrs; + tensorflow::Allocator* allocator = matched_device->GetAllocator(attrs); + +- if (absl::optional<tensorflow::AllocatorStats> stats = ++ if (std::optional<tensorflow::AllocatorStats> stats = + allocator->GetStats()) { + return std::map<std::string, int64_t>{{"current", stats->bytes_in_use}, + {"peak", stats->peak_bytes_in_use}}; +diff -Naurd x/tensorflow/tsl/framework/allocator.h y/tensorflow/tsl/framework/allocator.h +--- x/tensorflow/tsl/framework/allocator.h 2023-10-19 14:26:15.884659044 +0000 ++++ y/tensorflow/tsl/framework/allocator.h 2023-10-19 14:29:11.708743578 +0000 +@@ -216,7 +216,7 @@ + } + + // Fills in 'stats' with statistics collected by this allocator. +- virtual absl::optional<AllocatorStats> GetStats() { return absl::nullopt; } ++ virtual std::optional<AllocatorStats> GetStats() { return std::nullopt; } + + // If implemented, clears the internal stats except for the `in_use` fields + // and sets the `peak_bytes_in_use` to be equal to the `bytes_in_use`. Returns +diff -Naurd x/tensorflow/tsl/framework/bfc_allocator.cc y/tensorflow/tsl/framework/bfc_allocator.cc +--- x/tensorflow/tsl/framework/bfc_allocator.cc 2023-10-19 14:26:15.900659052 +0000 ++++ y/tensorflow/tsl/framework/bfc_allocator.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -1205,7 +1205,7 @@ + return md; + } + +-absl::optional<AllocatorStats> BFCAllocator::GetStats() { ++std::optional<AllocatorStats> BFCAllocator::GetStats() { + mutex_lock l(lock_); + return stats_; + } +diff -Naurd x/tensorflow/tsl/framework/bfc_allocator.h y/tensorflow/tsl/framework/bfc_allocator.h +--- x/tensorflow/tsl/framework/bfc_allocator.h 2023-10-19 14:26:15.900659052 +0000 ++++ y/tensorflow/tsl/framework/bfc_allocator.h 2023-10-19 14:29:11.708743578 +0000 +@@ -22,6 +22,7 @@ + #include <string> + #include <unordered_map> + #include <vector> ++#include <optional> + + #include "absl/container/flat_hash_set.h" + #include "tensorflow/tsl/framework/allocator.h" +@@ -93,7 +94,7 @@ + + int64_t AllocationId(const void* ptr) const override; + +- absl::optional<AllocatorStats> GetStats() override; ++ std::optional<AllocatorStats> GetStats() override; + + bool ClearStats() override; + +diff -Naurd x/tensorflow/tsl/framework/cpu_allocator_impl.cc y/tensorflow/tsl/framework/cpu_allocator_impl.cc +--- x/tensorflow/tsl/framework/cpu_allocator_impl.cc 2023-10-19 14:26:15.928659065 +0000 ++++ y/tensorflow/tsl/framework/cpu_allocator_impl.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -15,6 +15,7 @@ + + #include <algorithm> + #include <atomic> ++#include <optional> + + #include "tensorflow/tsl/framework/allocator.h" + #include "tensorflow/tsl/framework/allocator_registry.h" +@@ -145,8 +146,8 @@ + /*level=*/tsl::profiler::TraceMeLevel::kInfo); + } + +- absl::optional<AllocatorStats> GetStats() override { +- if (!cpu_allocator_collect_stats) return absl::nullopt; ++ std::optional<AllocatorStats> GetStats() override { ++ if (!cpu_allocator_collect_stats) return std::nullopt; + mutex_lock l(mu_); + return stats_; + } +diff -Naurd x/tensorflow/tsl/framework/tracking_allocator.cc y/tensorflow/tsl/framework/tracking_allocator.cc +--- x/tensorflow/tsl/framework/tracking_allocator.cc 2023-10-19 14:26:15.968659084 +0000 ++++ y/tensorflow/tsl/framework/tracking_allocator.cc 2023-10-19 14:29:11.708743578 +0000 +@@ -152,7 +152,7 @@ + } + } + +-absl::optional<AllocatorStats> TrackingAllocator::GetStats() { ++std::optional<AllocatorStats> TrackingAllocator::GetStats() { + return allocator_->GetStats(); + } + +diff -Naurd x/tensorflow/tsl/framework/tracking_allocator.h y/tensorflow/tsl/framework/tracking_allocator.h +--- x/tensorflow/tsl/framework/tracking_allocator.h 2023-10-19 14:26:15.968659084 +0000 ++++ y/tensorflow/tsl/framework/tracking_allocator.h 2023-10-19 14:29:11.712743580 +0000 +@@ -17,6 +17,7 @@ + #define TENSORFLOW_TSL_FRAMEWORK_TRACKING_ALLOCATOR_H_ + + #include <unordered_map> ++#include <optional> + + #include "tensorflow/tsl/framework/allocator.h" + #include "tensorflow/tsl/lib/gtl/inlined_vector.h" +@@ -66,7 +67,7 @@ + size_t RequestedSize(const void* ptr) const override; + size_t AllocatedSize(const void* ptr) const override; + int64_t AllocationId(const void* ptr) const override; +- absl::optional<AllocatorStats> GetStats() override; ++ std::optional<AllocatorStats> GetStats() override; + bool ClearStats() override; + + AllocatorMemoryType GetMemoryType() const override { diff --git a/pkgs/development/python-modules/tensorflow/com_google_absl_add_log.patch b/pkgs/development/python-modules/tensorflow/com_google_absl_add_log.patch new file mode 100644 index 0000000000000..ebb2fb129c06c --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/com_google_absl_add_log.patch @@ -0,0 +1,166 @@ +diff -Naurd x/third_party/absl/system.absl.base.BUILD y/third_party/absl/system.absl.base.BUILD +--- x/third_party/absl/system.absl.base.BUILD 2023-09-17 09:12:05.499753364 +0000 ++++ y/third_party/absl/system.absl.base.BUILD 2023-09-17 09:16:01.200082822 +0000 +@@ -22,7 +22,12 @@ + + cc_library( + name = "raw_logging_internal", +- linkopts = ["-labsl_raw_logging_internal"], ++ linkopts = [ ++ "-labsl_raw_logging_internal", ++ "-labsl_log_internal_conditions", ++ "-labsl_log_internal_message", ++ "-labsl_log_internal_nullguard", ++ ], + visibility = [ + "//absl:__subpackages__", + ], +diff -Naurd x/third_party/absl/system.absl.log.BUILD y/third_party/absl/system.absl.log.BUILD +--- x/third_party/absl/system.absl.log.BUILD 1970-01-01 00:00:00.000000000 +0000 ++++ y/third_party/absl/system.absl.log.BUILD 2023-09-17 09:12:11.795762177 +0000 +@@ -0,0 +1,134 @@ ++load("@rules_cc//cc:defs.bzl", "cc_library") ++ ++package(default_visibility = ["//visibility:public"]) ++ ++cc_library( ++ name = "absl_check", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "absl_log", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "check", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "die_if_null", ++ deps = [ ++ ":log", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/strings", ++ ], ++) ++ ++cc_library( ++ name = "flags", ++ deps = [ ++ ":globals", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:log_severity", ++ "//absl/flags:flag", ++ "//absl/flags:marshalling", ++ "//absl/strings", ++ ], ++) ++ ++cc_library( ++ name = "globals", ++ deps = [ ++ "//absl/base:atomic_hook", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:log_severity", ++ "//absl/hash", ++ "//absl/strings", ++ ], ++) ++ ++cc_library( ++ name = "initialize", ++ deps = [ ++ ":globals", ++ "//absl/base:config", ++ "//absl/time", ++ ], ++) ++ ++cc_library( ++ name = "log", ++ deps = [ ++ ], ++) ++ ++cc_library( ++ name = "log_entry", ++ deps = [ ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:log_severity", ++ "//absl/strings", ++ "//absl/time", ++ "//absl/types:span", ++ ], ++) ++ ++cc_library( ++ name = "log_sink", ++ deps = [ ++ ":log_entry", ++ "//absl/base:config", ++ ], ++) ++ ++cc_library( ++ name = "log_sink_registry", ++ deps = [ ++ ":log_sink", ++ "//absl/base:config", ++ ], ++) ++ ++cc_library( ++ name = "log_streamer", ++ deps = [ ++ ":absl_log", ++ "//absl/base:config", ++ "//absl/base:log_severity", ++ "//absl/strings", ++ "//absl/strings:internal", ++ "//absl/types:optional", ++ "//absl/utility", ++ ], ++) ++ ++cc_library( ++ name = "scoped_mock_log", ++ deps = [ ++ ":log_entry", ++ ":log_sink", ++ ":log_sink_registry", ++ "//absl/base:config", ++ "//absl/base:log_severity", ++ "//absl/base:raw_logging_internal", ++ "//absl/strings", ++ "@com_google_googletest//:gtest", ++ ], ++) ++ ++cc_library( ++ name = "structured", ++ deps = [ ++ "//absl/base:config", ++ "//absl/strings", ++ ], ++) +diff -Naurd x/third_party/absl/workspace.bzl y/third_party/absl/workspace.bzl +--- x/third_party/absl/workspace.bzl 2023-09-17 09:12:05.499753364 +0000 ++++ y/third_party/absl/workspace.bzl 2023-09-17 09:12:11.795762177 +0000 +@@ -20,6 +20,7 @@ + "flags", + "functional", + "hash", ++ "log", + "memory", + "meta", + "numeric", diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 348f5197a9d6e..ff95c847eae5e 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -1,18 +1,18 @@ -{ stdenv, bazel_5, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin -, addOpenGLRunpath, fetchpatch +{ stdenv, bazel_5, buildBazelPackage, lib, fetchFromGitHub, symlinkJoin +, addOpenGLRunpath, fetchpatch, fetchzip, linkFarm # Python deps , buildPythonPackage, pythonOlder, python # Python libraries -, numpy, tensorboard, absl-py -, packaging, setuptools, wheel, keras, keras-preprocessing, google-pasta +, numpy, tensorboard, abseil-cpp, absl-py +, packaging, setuptools, wheel, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator-bin , dill, flatbuffers-python, portpicker, tblib, typing-extensions # Common deps -, git, pybind11, which, binutils, glibcLocales, cython, perl, coreutils +, git, pybind11, which, binutils, glibcLocales, cython, perl # Common libraries , jemalloc, mpi, gast, grpc, sqlite, boringssl, jsoncpp, nsync -, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core +, curl, snappy, flatbuffers-core, icu, double-conversion, libpng, libjpeg_turbo, giflib, protobuf-core # Upstream by default includes cuda support since tensorflow 1.15. We could do # that in nix as well. It would make some things easier and less confusing, but # it would also make the default tensorflow package unfree. See @@ -53,7 +53,18 @@ let if cudaSupport then cudaPackages.backendStdenv else if originalStdenv.isDarwin then llvmPackages_11.stdenv else originalStdenv; - inherit (cudaPackages) cudatoolkit cudnn nccl; + inherit (cudaPackages) cudatoolkit nccl; + # use compatible cuDNN (https://www.tensorflow.org/install/source#gpu) + # cudaPackages.cudnn led to this: + # https://github.com/tensorflow/tensorflow/issues/60398 + cudnn = cudaPackages.cudnn_8_6; + gentoo-patches = fetchzip { + url = "https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.12.0.tar.bz2"; + hash = "sha256-SCRX/5/zML7LmKEPJkcM5Tebez9vv/gmE4xhT/jyqWs="; + }; + protobuf-extra = linkFarm "protobuf-extra" [ + { name = "include"; path = protobuf-core.src; } + ]; in assert cudaSupport -> cudatoolkit != null @@ -99,7 +110,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.11.1"; + version = "2.13.0"; variant = lib.optionalString cudaSupport "-gpu"; pname = "tensorflow${variant}"; @@ -208,14 +219,14 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "refs/tags/v${version}"; - hash = "sha256-q59cUW6613byHk4LGl+sefO5czLSWxOrSyLbJ1pkNEY="; + hash = "sha256-Rq5pAVmxlWBVnph20fkAwbfy+iuBNlfFy14poDPd5h0="; }; # On update, it can be useful to steal the changes from gentoo # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow nativeBuildInputs = [ - which pythonEnv cython perl protobuf-core + which pythonEnv cython perl protobuf-core protobuf-extra ] ++ lib.optional cudaSupport addOpenGLRunpath; buildInputs = [ @@ -225,6 +236,7 @@ let git # libs taken from system through the TF_SYS_LIBS mechanism + abseil-cpp boringssl curl double-conversion @@ -236,7 +248,6 @@ let jsoncpp libjpeg_turbo libpng - lmdb-core (pybind11.overridePythonAttrs (_: { inherit stdenv; })) snappy sqlite @@ -265,6 +276,7 @@ let "astor_archive" "astunparse_archive" "boringssl" + "com_google_absl" # Not packaged in nixpkgs # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" @@ -284,7 +296,6 @@ let "icu" "jsoncpp_git" "libjpeg_turbo" - "lmdb" "nasm" "opt_einsum_archive" "org_sqlite" @@ -328,6 +339,25 @@ let GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/cc"; + patches = [ + "${gentoo-patches}/0002-systemlib-Latest-absl-LTS-has-split-cord-libs.patch" + "${gentoo-patches}/0005-systemlib-Updates-for-Abseil-20220623-LTS.patch" + "${gentoo-patches}/0007-systemlibs-Add-well_known_types_py_pb2-target.patch" + # https://github.com/conda-forge/tensorflow-feedstock/pull/329/commits/0a63c5a962451b4da99a9948323d8b3ed462f461 + (fetchpatch { + name = "fix-layout-proto-duplicate-loading.patch"; + url = "https://raw.githubusercontent.com/conda-forge/tensorflow-feedstock/0a63c5a962451b4da99a9948323d8b3ed462f461/recipe/patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch"; + hash = "sha256-/7buV6DinKnrgfqbe7KKSh9rCebeQdXv2Uj+Xg/083w="; + }) + ./com_google_absl_add_log.patch + ./absl_py_argparse_flags.patch + ./protobuf_python.patch + ./pybind11_protobuf_python_runtime_dep.patch + ./pybind11_protobuf_newer_version.patch + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ + ./absl_to_std.patch + ]; + postPatch = '' # bazel 3.3 should work just as well as bazel 3.1 rm -f .bazelversion @@ -395,18 +425,30 @@ let fetchAttrs = { sha256 = { x86_64-linux = if cudaSupport - then "sha256-lURiR0Ra4kynDXyfuONG+A7CpxnAsfKzIdFTExKzp1o=" - else "sha256-lDvRgj+UlaneRGZOO9UVCb6uyxcbRJfUhABf/sgKPi0="; - aarch64-linux = "sha256-z2d45fqHz5HW+qkv3fR9hMg3sEwUzJfxF54vng85bHk="; - x86_64-darwin = "sha256-AAvuz8o6ZRkaSYMgaep74lDDQcxOupDCX4vRaK/jnCU="; - aarch64-darwin = "sha256-kexRSvfQqb92ZRuUqAO070RnUUBidAqghiA7Y8do9vc="; + then "sha256-5VFMNHeLrUxW5RTr6EhT3pay9nWJ5JkZTGirDds5QkU=" + else "sha256-KzgWV69Btr84FdwQ5JI2nQEsqiPg1/+TWdbw5bmxXOE="; + aarch64-linux = "sha256-9btXrNHqd720oXTPDhSmFidv5iaZRLjCVX8opmrMjXk="; + x86_64-darwin = "sha256-gqb03kB0z2pZQ6m1fyRp1/Nbt8AVVHWpOJSeZNCLc4w="; + aarch64-darwin = "sha256-WdgAaFZU+ePwWkVBhLzjlNT7ELfGHOTaMdafcAMD5yo="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; buildAttrs = { outputs = [ "out" "python" ]; + # need to rebuild schemas since we use a different flatbuffers version preBuild = '' + (cd tensorflow/lite/schema;${flatbuffers-core}/bin/flatc --gen-object-api -c schema.fbs) + (cd tensorflow/lite/schema;${flatbuffers-core}/bin/flatc --gen-object-api -c conversion_metadata.fbs) + (cd tensorflow/lite/acceleration/configuration;${flatbuffers-core}/bin/flatc -o configuration.fbs --proto configuration.proto) + sed -i s,tflite.proto,tflite,g tensorflow/lite/acceleration/configuration/configuration.fbs/configuration.fbs + (cd tensorflow/lite/acceleration/configuration;${flatbuffers-core}/bin/flatc --gen-compare --gen-object-api -c configuration.fbs/configuration.fbs) + cp -r tensorflow/lite/acceleration/configuration/configuration.fbs tensorflow/lite/experimental/acceleration/configuration + (cd tensorflow/lite/experimental/acceleration/configuration;${flatbuffers-core}/bin/flatc -c configuration.fbs/configuration.fbs) + (cd tensorflow/lite/delegates/gpu/cl;${flatbuffers-core}/bin/flatc -c compiled_program_cache.fbs) + (cd tensorflow/lite/delegates/gpu/cl;${flatbuffers-core}/bin/flatc -I $NIX_BUILD_TOP/source -c serialization.fbs) + (cd tensorflow/lite/delegates/gpu/common;${flatbuffers-core}/bin/flatc -I $NIX_BUILD_TOP/source -c gpu_model.fbs) + (cd tensorflow/lite/delegates/gpu/common/task;${flatbuffers-core}/bin/flatc -c serialization_base.fbs) patchShebangs . ''; @@ -448,10 +490,7 @@ let license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; linux ++ darwin; - # More vulnerabilities in 2.11.1 really; https://github.com/tensorflow/tensorflow/releases - knownVulnerabilities = [ "CVE-2023-33976" ]; - broken = true || # most likely needs dealing with protobuf/abseil updates - !(xlaSupport -> cudaSupport) || python.pythonVersion == "3.11"; + broken = stdenv.isDarwin || !(xlaSupport -> cudaSupport); } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s @@ -460,7 +499,7 @@ let in buildPythonPackage { inherit version pname; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; src = bazel-build.python; @@ -493,6 +532,7 @@ in buildPythonPackage { # tensorflow/tools/pip_package/setup.py propagatedBuildInputs = [ absl-py + abseil-cpp astunparse flatbuffers-python gast @@ -529,7 +569,6 @@ in buildPythonPackage { # TEST_PACKAGES in tensorflow/tools/pip_package/setup.py nativeCheckInputs = [ dill - keras portpicker tblib ]; @@ -540,18 +579,15 @@ in buildPythonPackage { hello = tf.constant("Hello, world!") tf.print(hello) - # Fit a simple model to random data - import numpy as np - np.random.seed(0) tf.random.set_seed(0) - model = tf.keras.models.Sequential([ - tf.keras.layers.Dense(1, activation="linear") - ]) - model.compile(optimizer="sgd", loss="mse") - - x = np.random.uniform(size=(1,1)) - y = np.random.uniform(size=(1,)) - model.fit(x, y, epochs=1) + width = 512 + choice = 48 + t_in = tf.Variable(tf.random.uniform(shape=[width])) + with tf.GradientTape() as tape: + t_out = tf.slice(tf.nn.softmax(t_in), [choice], [1]) + diff = tape.gradient(t_out, t_in) + assert(0 < tf.reduce_min(tf.slice(diff, [choice], [1]))) + assert(0 > tf.reduce_max(tf.slice(diff, [1], [choice - 1]))) EOF ''; # Regression test for #77626 removed because not more `tensorflow.contrib`. diff --git a/pkgs/development/python-modules/tensorflow/protobuf_python.patch b/pkgs/development/python-modules/tensorflow/protobuf_python.patch new file mode 100644 index 0000000000000..11de26605b4bd --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/protobuf_python.patch @@ -0,0 +1,19 @@ +diff -Naurd x/tensorflow/workspace2.bzl y/tensorflow/workspace2.bzl +--- x/tensorflow/workspace2.bzl 2023-09-16 20:44:02.266422132 +0000 ++++ y/tensorflow/workspace2.bzl 2023-09-16 20:50:40.370998305 +0000 +@@ -469,6 +469,7 @@ + system_link_files = { + "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl", + "//third_party/systemlibs:protobuf_deps.bzl": "protobuf_deps.bzl", ++ "//third_party/systemlibs:protobuf.python.BUILD": "python/BUILD", + }, + urls = tf_mirror_urls("https://github.com/protocolbuffers/protobuf/archive/v3.21.9.zip"), + ) +diff -Naurd x/third_party/systemlibs/protobuf.python.BUILD y/third_party/systemlibs/protobuf.python.BUILD +--- x/third_party/systemlibs/protobuf.python.BUILD 1970-01-01 00:00:00.000000000 +0000 ++++ y/third_party/systemlibs/protobuf.python.BUILD 2023-09-16 20:49:12.514890584 +0000 +@@ -0,0 +1,4 @@ ++cc_library( ++ name = "proto_api", ++ visibility = ["//visibility:public"] ++) diff --git a/pkgs/development/python-modules/tensorflow/pybind11_protobuf_newer_version.patch b/pkgs/development/python-modules/tensorflow/pybind11_protobuf_newer_version.patch new file mode 100644 index 0000000000000..460ada1fb5621 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/pybind11_protobuf_newer_version.patch @@ -0,0 +1,16 @@ +diff -Naurd x/tensorflow/workspace2.bzl y/tensorflow/workspace2.bzl +--- x/tensorflow/workspace2.bzl 2023-09-21 12:55:06.104407343 +0000 ++++ y/tensorflow/workspace2.bzl 2023-09-21 12:55:39.732453203 +0000 +@@ -872,9 +872,9 @@ + + tf_http_archive( + name = "pybind11_protobuf", +- urls = tf_mirror_urls("https://github.com/pybind/pybind11_protobuf/archive/80f3440cd8fee124e077e2e47a8a17b78b451363.zip"), +- sha256 = "c7ab64b1ccf9a678694a89035a8c865a693e4e872803778f91f0965c2f281d78", +- strip_prefix = "pybind11_protobuf-80f3440cd8fee124e077e2e47a8a17b78b451363", ++ urls = tf_mirror_urls("https://github.com/pybind/pybind11_protobuf/archive/c8cc30e2495309e3499b7d76033446236d21c837.zip"), ++ sha256 = "0663f73b34c0b4af55003edbb066e62aceff99bfcf12e47ea9a15d6013d81413", ++ strip_prefix = "pybind11_protobuf-c8cc30e2495309e3499b7d76033446236d21c837", + patch_file = [ + "//third_party/pybind11_protobuf:remove_license.patch", + "//third_party/pybind11_protobuf:python_runtime_dep.patch", diff --git a/pkgs/development/python-modules/tensorflow/pybind11_protobuf_python_runtime_dep.patch b/pkgs/development/python-modules/tensorflow/pybind11_protobuf_python_runtime_dep.patch new file mode 100644 index 0000000000000..daebaac868927 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/pybind11_protobuf_python_runtime_dep.patch @@ -0,0 +1,30 @@ +diff -Naurd x/tensorflow/workspace2.bzl y/tensorflow/workspace2.bzl +--- x/tensorflow/workspace2.bzl 2023-09-17 22:22:22.029075202 +0000 ++++ y/tensorflow/workspace2.bzl 2023-09-17 22:25:27.501289587 +0000 +@@ -876,7 +876,10 @@ + urls = tf_mirror_urls("https://github.com/pybind/pybind11_protobuf/archive/80f3440cd8fee124e077e2e47a8a17b78b451363.zip"), + sha256 = "c7ab64b1ccf9a678694a89035a8c865a693e4e872803778f91f0965c2f281d78", + strip_prefix = "pybind11_protobuf-80f3440cd8fee124e077e2e47a8a17b78b451363", +- patch_file = ["//third_party/pybind11_protobuf:remove_license.patch"], ++ patch_file = [ ++ "//third_party/pybind11_protobuf:remove_license.patch", ++ "//third_party/pybind11_protobuf:python_runtime_dep.patch", ++ ], + ) + + tf_http_archive( +diff -Naurd x/third_party/pybind11_protobuf/python_runtime_dep.patch y/third_party/pybind11_protobuf/python_runtime_dep.patch +--- x/third_party/pybind11_protobuf/python_runtime_dep.patch 1970-01-01 00:00:00.000000000 +0000 ++++ y/third_party/pybind11_protobuf/python_runtime_dep.patch 2023-09-17 22:23:07.849128180 +0000 +@@ -0,0 +1,11 @@ ++diff -Naurd x/pybind11_protobuf/BUILD y/pybind11_protobuf/BUILD ++--- x/pybind11_protobuf/BUILD 2023-09-17 22:17:19.932725814 +0000 +++++ y/pybind11_protobuf/BUILD 2023-09-17 22:20:44.056961932 +0000 ++@@ -86,6 +86,7 @@ ++ "//visibility:private", ++ ], ++ deps = [ +++ "@org_tensorflow//third_party/python_runtime:headers", ++ "@com_google_absl//absl/container:flat_hash_map", ++ "@com_google_absl//absl/container:flat_hash_set", ++ "@com_google_absl//absl/meta:type_traits", diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 80c40f7d55144..4167cfd7d969b 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -3,6 +3,7 @@ , cachetools , cytoolz , fetchPypi +, floret , jellyfish , joblib , matplotlib @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "textacy"; version = "0.13.0"; disabled = pythonOlder "3.7"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -33,6 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cachetools cytoolz + floret jellyfish joblib matplotlib diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index c2e46990c1149..f0dd9ab9a6507 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -59,6 +59,12 @@ buildPythonPackage rec { "textnets" ]; + disabledTests = [ + # Test fails: A warning is triggered because of a deprecation notice by pandas. + # TODO: Try to re-enable it when pandas is updated to 2.1.1 + "test_corpus_czech" + ]; + meta = with lib; { description = "Text analysis with networks"; homepage = "https://textnets.readthedocs.io"; diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix index 33dd694a7f5fb..207b605070ae7 100644 --- a/pkgs/development/python-modules/tlds/default.nix +++ b/pkgs/development/python-modules/tlds/default.nix @@ -1,20 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools }: buildPythonPackage rec { pname = "tlds"; - version = "2023101900"; - format = "setuptools"; + version = "2023102600"; + pyproject = true; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; rev = "refs/tags/${version}"; - hash = "sha256-ac4gM2+7RvmUl8ZI+XhjOkvR3lsTgoowowFo5K+ZFJ8="; + hash = "sha256-ncbgR/syMChIL0/FGLOHxHJMUzH0G+rZX9aCXun7yc4="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "tlds" ]; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 765a8d9468bc9..59396d421ed93 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -145,10 +145,8 @@ in buildPythonPackage rec { ./pthreadpool-disable-gcd.diff ] ++ lib.optionals stdenv.isLinux [ # Propagate CUPTI to Kineto by overriding the search path with environment variables. - (fetchpatch { - url = "https://github.com/pytorch/pytorch/pull/108847/commits/7ae4d7c0e2dec358b4fe81538efe9da5eb580ec9.patch"; - hash = "sha256-skFaDg98xcJqJfzxWk+qhUxPLHDStqvd0mec3PgksIg="; - }) + # https://github.com/pytorch/pytorch/pull/108847 + ./pytorch-pr-108847.patch ]; postPatch = lib.optionalString rocmSupport '' diff --git a/pkgs/development/python-modules/torch/pytorch-pr-108847.patch b/pkgs/development/python-modules/torch/pytorch-pr-108847.patch new file mode 100644 index 0000000000000..9511191ca926a --- /dev/null +++ b/pkgs/development/python-modules/torch/pytorch-pr-108847.patch @@ -0,0 +1,31 @@ +From bf4050edab9f294a8e0060c47f906cd7a80f25a2 Mon Sep 17 00:00:00 2001 +From: Samuel Ainsworth <skainsworth@gmail.com> +Date: Sat, 9 Sep 2023 02:04:09 +0000 +Subject: [PATCH] Dependencies.cmake: support building against CUPTI outside of + CUDA_SOURCE_DIR + +Limitation discovered in https://github.com/NixOS/nixpkgs/pull/249259. +--- + cmake/Dependencies.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake +index 0602d534dc4c14..5f6a5f79f3e3dc 100644 +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -1879,6 +1879,7 @@ if(USE_KINETO) + ${CUDA_SOURCE_DIR}/extras/CUPTI/lib64 + ${CUDA_SOURCE_DIR}/lib + ${CUDA_SOURCE_DIR}/lib64 ++ $ENV{CUPTI_LIBRARY_DIR} + NO_DEFAULT_PATH) + + find_path(CUPTI_INCLUDE_DIR cupti.h PATHS +@@ -1886,6 +1887,7 @@ if(USE_KINETO) + ${CUDA_INCLUDE_DIRS} + ${CUDA_SOURCE_DIR} + ${CUDA_SOURCE_DIR}/include ++ $ENV{CUPTI_INCLUDE_DIR} + NO_DEFAULT_PATH) + + if(CUPTI_LIBRARY_PATH AND CUPTI_INCLUDE_DIR) diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix index e22993e8d23f4..6cc7bcf3e27c9 100644 --- a/pkgs/development/python-modules/torchinfo/default.nix +++ b/pkgs/development/python-modules/torchinfo/default.nix @@ -1,26 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook +, fetchpatch , pythonOlder , torch , torchvision +, pytestCheckHook +, transformers }: buildPythonPackage rec { pname = "torchinfo"; - version = "1.64"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "TylerYep"; - repo = pname; + repo = "torchinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-gcl8RxCD017FP4LtB60WVtOh7jg2Otv/vNd9hKneEAU="; + hash = "sha256-pPjg498aT8y4b4tqIzNxxKyobZX01u+66ScS/mee51Q="; }; + patches = [ + (fetchpatch { # Add support for Python 3.11 and pytorch 2.1 + url = "https://github.com/TylerYep/torchinfo/commit/c74784c71c84e62bcf56664653b7f28d72a2ee0d.patch"; + hash = "sha256-xSSqs0tuFpdMXUsoVv4sZLCeVnkK6pDDhX/Eobvn5mw="; + includes = [ + "torchinfo/model_statistics.py" + ]; + }) + ]; + propagatedBuildInputs = [ torch torchvision @@ -28,17 +40,23 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + transformers ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ # Skip as it downloads pretrained weights (require network access) "test_eval_order_doesnt_matter" + "test_flan_t5_small" # AssertionError in output "test_google" ]; disabledTestPaths = [ - # Wants "compressai", which we don't package (2023-03-23) + # Test requires network access "tests/torchinfo_xl_test.py" ]; diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index eeb04ba234776..47b5eef29cede 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "traits"; - version = "6.4.2"; + version = "6.4.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-W+fMX7epnLp+kBR4Y3PjrS9177RF7s7QlGVLuvOw+oI="; + hash = "sha256-qbv9ngwIt94H6G72TmnLlqKcIQWkO/gyzYsWL6HiL0Q="; }; # Circular dependency diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 24345b5f63d5b..32427487934a0 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "7.0.1"; + version = "7.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Trim21"; repo = "transmission-rpc"; rev = "refs/tags/v${version}"; - hash = "sha256-wBTx4gy6c6TMtc2m+xibEzCgYJJiMMZ16+pq3H06hgs="; + hash = "sha256-HthWeFInolNEs7RNA773DJjhGvl1rfDhvhO8WwRwuuY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index e0b14f2fc453a..790a9e4f1a07d 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.8.4"; + version = "6.8.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jZTc9Cc5XC1KScpniVtbBPdfwo3LodVNOo/zQSDBWY4="; + hash = "sha256-o/U8bmCAotgDYY81eX+vXOxJC3f4aQvOF6ohMOHLuLY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index f3d881debdb39..158948d7dd552 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.3"; + version = "0.19.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-miHKrEKHwRPdUmZXB3hcRbsdMkK3oriutXxJ6edJozA="; + hash = "sha256-GdSGfysTK7NPLdruHz/rp8xCqGivXgVcxqWAtC+heTM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 00ebb5123e3ce..7906923626779 100644 --- a/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.6"; + version = "4.12.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-BFqyhdPlQBhuFhM2EvQ/Z+MfkQ5tdXiQa0OgrY+BE0c="; + hash = "sha256-WZgAKNKb9V0Ns1nvowW3W6zwy5Lj8/az/UCPJTHfJ0w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 0b06bf91548d9..6a7fd953c4239 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2023.10.1"; + version = "2023.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-v2B+tDqvQTm+K+cvTRM8LnfaFp5CTsI8/B5clBDNE08="; + hash = "sha256-qRKVjiRrRg1YwwYCSp6KGvaS7QnYLIW5rum3X7vEANM="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix new file mode 100644 index 0000000000000..6b1ffcb31f52d --- /dev/null +++ b/pkgs/development/python-modules/weasel/default.nix @@ -0,0 +1,83 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, wheel +, black +, cloudpathlib +, confection +, isort +, mypy +, packaging +, pre-commit +, pydantic +, pytest +, requests +, ruff +, smart-open +, srsly +, typer +, types-requests +, types-setuptools +, wasabi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "weasel"; + version = "0.3.3"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "explosion"; + repo = "weasel"; + rev = "refs/tags/v${version}"; + hash = "sha256-I8Omrez1wfAbCmr9hivqKN2fNgnFQRGm8OP7lb7YClk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + black + cloudpathlib + confection + isort + mypy + packaging + pre-commit + pydantic + pytest + requests + ruff + smart-open + srsly + typer + types-requests + types-setuptools + wasabi + ]; + + pythonImportsCheck = [ "weasel" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # This test requires internet access + "test_project_assets" + ]; + + meta = with lib; { + description = "Weasel: A small and easy workflow system"; + homepage = "https://github.com/explosion/weasel/"; + license = licenses.mit; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/withings-sync/default.nix b/pkgs/development/python-modules/withings-sync/default.nix new file mode 100644 index 0000000000000..60cce387fa626 --- /dev/null +++ b/pkgs/development/python-modules/withings-sync/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, garth +, lxml +, pythonOlder +, requests +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "withings-sync"; + version = "4.2.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "jaroslawhartman"; + repo = "withings-sync"; + rev = "refs/tags/v${version}"; + hash = "sha256-6igjUmgIA077/1SQMt10tRpnLVKxGFNJN1GeLhQLROg="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + garth + lxml + requests + ]; + + pythonImportsCheck = [ + "withings_sync" + ]; + + meta = with lib; { + description = "Synchronisation of Withings weight"; + homepage = "https://github.com/jaroslawhartman/withings-sync"; + changelog = "https://github.com/jaroslawhartman/withings-sync/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index 64ad5a1ebf821..b6d596f7a88f0 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.3.0"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-RH5RQHLpfrI9fRg6OfPZ7/BPHQuHCrkJlwW/EJitdPo="; + hash = "sha256-YHHiA0AKyqOYQHeNJqInxjjn4L64z9Y2mf6otMZVscA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yark/default.nix b/pkgs/development/python-modules/yark/default.nix index 9012efc8a81d2..f7b9f696d6cff 100644 --- a/pkgs/development/python-modules/yark/default.nix +++ b/pkgs/development/python-modules/yark/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "yark"; - version = "1.2.8"; + version = "1.2.9"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-FXgJ/y8qN7FkR7nhpNgPvUH/EQgw8cgRFqUA9KiJKKM="; + hash = "sha256-g9JwFnB4tFuvRvQGEURbIB2gaXQgCQJkL1sNmYMFvck="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 7f3591468c0b5..2531a6648e36f 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.3.0"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-dJckAQ0sWdP7I10khcyKGKsIcDTXQxZtP7B8JHlIZEo="; + hash = "sha256-6dsMOFyZ8cX2zKXX682b5znJvXYTeKt99Wafz7RkfQw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix index 54c750d94bbfc..505e152f087b2 100644 --- a/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { zigpy ]; + doCheck = pythonOlder "3.11"; # asynctest is unsupported on python3.11 + nativeCheckInputs = [ asynctest pytest-asyncio diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 105dbbbe04249..52f2422bab85a 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.52.1"; + version = "0.53.1"; format = "setuptools"; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+zGLWti99mYTyPkSxiYgE5RqVvEr2PGt8vFwesjcquo="; + hash = "sha256-WfKZraF/mh1YTgK2YXnP5JHqjj5oWI9PeZAvt75btr8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/rocm-modules/5/default.nix b/pkgs/development/rocm-modules/5/default.nix index 3229d7b077a07..d5f1c2678c4e1 100644 --- a/pkgs/development/rocm-modules/5/default.nix +++ b/pkgs/development/rocm-modules/5/default.nix @@ -105,8 +105,8 @@ in rec { # Needs GCC rocprofiler = callPackage ./rocprofiler { + inherit rocmUpdateScript clr rocm-core rocm-thunk rocm-device-libs roctracer rocdbgapi rocm-smi hsa-amd-aqlprofile-bin; inherit (llvm) clang; - inherit rocmUpdateScript clr rocm-thunk roctracer rocm-smi hsa-amd-aqlprofile-bin; }; # Needs GCC diff --git a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix index d13092fd3eef0..8bd479c5c245f 100644 --- a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix +++ b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/default.nix @@ -1,23 +1,17 @@ { lib , stdenv , fetchurl +, callPackage , dpkg }: -let - prefix = "hsa-amd-aqlprofile"; - version = "5.7.0"; - major = lib.versions.major version; - minor = lib.versions.minor version; - patch = lib.versions.patch version; - magic = lib.strings.concatStrings (lib.strings.intersperse "0" (lib.versions.splitVersion version)); -in stdenv.mkDerivation (finalAttrs: { - inherit version; - pname = "${prefix}-bin"; +stdenv.mkDerivation (finalAttrs: { + pname = "hsa-amd-aqlprofile-bin"; + version = "5.7.1"; src = fetchurl { - url = "https://repo.radeon.com/rocm/apt/${major}.${minor}/pool/main/h/${prefix}/${prefix}_1.0.0.${magic}.${magic}-63~22.04_amd64.deb"; - hash = "sha256-FQ25eXkhnvOmcf0sGW3GYu9kZj69bVvZrh0jVx/G/kI="; + url = "https://repo.radeon.com/rocm/apt/5.7.1/pool/main/h/hsa-amd-aqlprofile/hsa-amd-aqlprofile_1.0.0.50701.50701-98~22.04_amd64.deb"; + hash = "sha256-LWAtZ0paJW8lhE+QAMwq2l8wM+96bxk5rNWyQXTc9Vo="; }; nativeBuildInputs = [ dpkg ]; @@ -29,11 +23,15 @@ in stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out - cp -a opt/rocm-${version}/* $out + cp -a opt/rocm-${finalAttrs.version}/* $out + chmod +x $out/lib/libhsa-amd-aqlprofile64.so.1.* + chmod +x $out/lib/hsa-amd-aqlprofile/librocprofv2_att.so runHook postInstall ''; + passthru.updateScript = (callPackage ./update.nix { }) { inherit (finalAttrs) version; }; + meta = with lib; { description = "AQLPROFILE library for AMD HSA runtime API extension support"; homepage = "https://rocm.docs.amd.com/en/latest/"; diff --git a/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix new file mode 100644 index 0000000000000..95260a79321d4 --- /dev/null +++ b/pkgs/development/rocm-modules/5/hsa-amd-aqlprofile-bin/update.nix @@ -0,0 +1,51 @@ +{ lib +, writeScript +}: + +{ version }: + +let + prefix = "hsa-amd-aqlprofile"; + extVersion = lib.strings.concatStrings (lib.strings.intersperse "0" (lib.versions.splitVersion version)); + major = lib.versions.major version; + minor = lib.versions.minor version; + patch = lib.versions.patch version; + + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + apt="https://repo.radeon.com/rocm/apt" + pool="pool/main/h/${prefix}/" + url="$apt/latest/$pool" + res="$(curl -sL "$url")" + deb="${prefix}$(echo "$res" | grep -o -P "(?<=href=\"${prefix}).*(?=\">)" | tail -1)" + patch="${patch}" + + # Try up to 10 patch versions + for i in {1..10}; do + ((patch++)) + extVersion="$(echo "$deb" | grep -o -P "(?<=\.....).*(?=\..*-)")" + + if (( ''${#extVersion} == 5 )) && (( $extVersion <= ${extVersion} )); then + url="https://repo.radeon.com/rocm/apt/${major}.${minor}.$patch/pool/main/h/${prefix}/" + res="$(curl -sL "$url")" + deb="${prefix}$(echo "$res" | grep -o -P "(?<=href=\"${prefix}).*(?=\">)" | tail -1)" + else + break + fi + done + + extVersion="$(echo $deb | grep -o -P "(?<=\.....).*(?=\..*-)")" + version="$(echo $extVersion | sed "s/0/./1" | sed "s/0/./1")" + + if (( ''${#extVersion} == 5 )); then + repoVersion="$version" + + if (( ''${version:4:1} == 0 )); then + repoVersion=''${version:0:3} + fi + + update-source-version rocmPackages_5.${prefix}-bin "$version" "" "$apt/$repoVersion/$pool$deb" --ignore-same-hash + fi + ''; +in [ updateScript ] diff --git a/pkgs/development/rocm-modules/5/rocprofiler/0000-dont-install-tests-hsaco.patch b/pkgs/development/rocm-modules/5/rocprofiler/0000-dont-install-tests-hsaco.patch new file mode 100644 index 0000000000000..aaa31c4974d52 --- /dev/null +++ b/pkgs/development/rocm-modules/5/rocprofiler/0000-dont-install-tests-hsaco.patch @@ -0,0 +1,15 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 8473a42..07ea873 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -112,10 +112,6 @@ function(generate_hsaco TARGET_ID INPUT_FILE OUTPUT_FILE) + DEPENDS ${INPUT_FILE} clang + COMMENT "Building ${OUTPUT_FILE}..." + VERBATIM) +- install( +- FILES ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} +- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/tests-v1 +- COMPONENT tests) + set(HSACO_TARGET_LIST + ${HSACO_TARGET_LIST} ${PROJECT_BINARY_DIR}/${OUTPUT_FILE} + PARENT_SCOPE) diff --git a/pkgs/development/rocm-modules/5/rocprofiler/0001-fix-shell-scripts.patch b/pkgs/development/rocm-modules/5/rocprofiler/0001-fix-shell-scripts.patch new file mode 100644 index 0000000000000..aba7709c4edba --- /dev/null +++ b/pkgs/development/rocm-modules/5/rocprofiler/0001-fix-shell-scripts.patch @@ -0,0 +1,111 @@ +diff --git a/bin/rocprofv2 b/bin/rocprofv2 +index 92f7489..8839d4d 100755 +--- a/bin/rocprofv2 ++++ b/bin/rocprofv2 +@@ -2,7 +2,8 @@ + set -eo pipefail + CURRENT_DIR="$(dirname -- "$0")" + ROCPROFV2_DIR=$(dirname -- $(realpath ${BASH_SOURCE[0]})) +-ROCM_DIR=$(dirname -- "$ROCPROFV2_DIR") ++ROCPROFILER_DIR=$(dirname -- "$ROCPROFV2_DIR") ++ROCM_DIR=@rocmtoolkit_merged@ + PLUGIN_LIST=("ctf" "perfetto" "file" "att") + RUN_FROM_BUILD=0 + if [[ $ROCPROFV2_DIR == *"/build"* ]]; then +@@ -10,7 +11,7 @@ if [[ $ROCPROFV2_DIR == *"/build"* ]]; then + ROCM_DIR=$ROCPROFV2_DIR + fi + +-export ROCPROFILER_METRICS_PATH=$ROCM_DIR/libexec/rocprofiler/counters/derived_counters.xml ++export ROCPROFILER_METRICS_PATH=$ROCPROFILER_DIR/libexec/rocprofiler/counters/derived_counters.xml + export LD_LIBRARY_PATH=$ROCM_DIR/lib:$LD_LIBRARY_PATH + + usage() { +@@ -70,8 +71,8 @@ while [ 1 ]; do + exit 1 + fi + elif [[ "$1" = "--list-counters" ]]; then +- export LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so +- eval $ROCM_DIR/libexec/rocprofiler/ctrl ++ export LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so ++ eval $ROCPROFILER_DIR/libexec/rocprofiler/ctrl + exit 1 + elif [[ "$1" = "-i" || "$1" = "--input" ]]; then + if [ $2 ] && [ -n $2 ] && [ -r $2 ]; then +@@ -171,7 +172,7 @@ while [ 1 ]; do + if [ $RUN_FROM_BUILD == 1 ]; then + ATT_PATH=$ROCM_DIR/plugin/att/att/att.py + else +- ATT_PATH=$ROCM_DIR/libexec/rocprofiler/att/att.py ++ ATT_PATH=$ROCPROFILER_DIR/libexec/rocprofiler/att/att.py + export ROCPROFV2_ATT_LIB_PATH=$ROCM_DIR/lib/hsa-amd-aqlprofile/librocprofv2_att.so + fi + ATT_ARGV=$3 +@@ -236,13 +237,13 @@ if [ -n "$PMC_LINES" ] && [ ! -n "$ATT_ARGV" ]; then + export OUTPUT_PATH=$FINAL_PATH + fi + let COUNTER=COUNTER+1 +- LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so $* ++ LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so $* + if [ -n "$OUTPUT_PATH" ]; then + echo -e "\nThe output path for the following counters: $OUTPUT_PATH" + fi + done + else +- LD_PRELOAD=$LD_PRELOAD:$ROCM_DIR/lib/rocprofiler/librocprofiler_tool.so $* ++ LD_PRELOAD=$LD_PRELOAD:$ROCPROFILER_DIR/lib/rocprofiler/librocprofiler_tool.so $* + fi + + get_pmc_results_txt_path() { +diff --git a/bin/rpl_run.sh b/bin/rpl_run.sh +index c1a3daa..bc868a5 100755 +--- a/bin/rpl_run.sh ++++ b/bin/rpl_run.sh +@@ -24,16 +24,17 @@ + + time_stamp=`date +%y%m%d_%H%M%S` + BIN_DIR=$(dirname $(realpath ${BASH_SOURCE[0]})) +-ROOT_DIR=$(dirname $BIN_DIR) ++ROCPROFILER_DIR=$(dirname $BIN_DIR) ++ROOT_DIR=@rocmtoolkit_merged@ + RUN_DIR=`pwd` + TMP_DIR="/tmp" + DATA_DIR="rpl_data_${time_stamp}_$$" + +-RPL_PATH=$ROOT_DIR/lib ++RPL_PATH=$ROCPROFILER_DIR/lib + TLIB_PATH=$RPL_PATH/rocprofiler + TTLIB_PATH=$ROOT_DIR/lib/roctracer + ROCM_LIB_PATH=$ROOT_DIR/lib +-PROF_BIN_DIR=$ROOT_DIR/libexec/rocprofiler ++PROF_BIN_DIR=$ROCPROFILER_DIR/libexec/rocprofiler + + if [ -z "$ROCP_PYTHON_VERSION" ] ; then + ROCP_PYTHON_VERSION=python3 +@@ -73,7 +74,7 @@ export ROCP_METRICS=$TLIB_PATH/metrics.xml + # Disable AQL-profile read API + export AQLPROFILE_READ_API=0 + # ROC Profiler package path +-export ROCP_PACKAGE_DIR=$ROOT_DIR ++export ROCP_PACKAGE_DIR=$ROCPROFILER_DIR + # enabled SPM KFD mode + export ROCP_SPM_KFD_MODE=1 + +@@ -350,7 +351,7 @@ convert_time_val() { + + ################################################################################################ + # main +-echo "RPL: on '$time_stamp' from '$ROOT_DIR' in '$RUN_DIR'" ++echo "RPL: on '$time_stamp' from '$ROCPROFILER_DIR' in '$RUN_DIR'" + # Parsing arguments + if [ -z "$1" ] ; then + usage +@@ -557,7 +558,7 @@ elif [ "$input_type" = "txt" -o "$input_type" = "none" ] ; then + else + echo "<metric></metric>" > $RES_DIR/input.xml + fi +- input_list=`/bin/ls $RES_DIR/input*.xml` ++ input_list=`ls $RES_DIR/input*.xml` + export ROCPROFILER_SESS=$RES_DIR + else + fatal "Bad input file type '$INPUT_FILE'" diff --git a/pkgs/development/rocm-modules/5/rocprofiler/default.nix b/pkgs/development/rocm-modules/5/rocprofiler/default.nix index c77014b50cfde..c66c56a64eb84 100644 --- a/pkgs/development/rocm-modules/5/rocprofiler/default.nix +++ b/pkgs/development/rocm-modules/5/rocprofiler/default.nix @@ -2,11 +2,16 @@ , stdenv , fetchFromGitHub , rocmUpdateScript +, symlinkJoin +, substituteAll , cmake , clang , clr +, rocm-core , rocm-thunk +, rocm-device-libs , roctracer +, rocdbgapi , rocm-smi , hsa-amd-aqlprofile-bin , numactl @@ -14,24 +19,32 @@ , libxml2 , elfutils , mpi +, systemd , gtest , python3Packages -, gpuTargets ? [ - "gfx900" - "gfx906" - "gfx908" - "gfx90a" - "gfx940" - "gfx941" - "gfx942" - "gfx1030" - "gfx1100" - "gfx1101" - "gfx1102" -] +, gpuTargets ? clr.gpuTargets }: -stdenv.mkDerivation (finalAttrs: { +let + rocmtoolkit-merged = symlinkJoin { + name = "rocmtoolkit-merged"; + + paths = [ + rocm-core + rocm-thunk + rocm-device-libs + roctracer + rocdbgapi + rocm-smi + hsa-amd-aqlprofile-bin + clr + ]; + + postBuild = '' + rm -rf $out/nix-support + ''; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "rocprofiler"; version = "5.7.1"; @@ -42,6 +55,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-1s/7C9y+73ADLF/17Vepw0pZNVtYnKoP24GdwKc9X2Y="; }; + patches = [ + # These just simply won't build + ./0000-dont-install-tests-hsaco.patch + + # Fix bad paths + (substituteAll { + src = ./0001-fix-shell-scripts.patch; + rocmtoolkit_merged = rocmtoolkit-merged; + }) + ]; + nativeBuildInputs = [ cmake clang @@ -53,20 +77,19 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - rocm-thunk - rocm-smi - hsa-amd-aqlprofile-bin numactl libpciaccess libxml2 elfutils mpi + systemd gtest ]; + propagatedBuildInputs = [ rocmtoolkit-merged ]; + cmakeFlags = [ "-DCMAKE_MODULE_PATH=${clr}/lib/cmake/hip" - "-DPROF_API_HEADER_PATH=${roctracer.src}/inc/ext" "-DHIP_ROOT_DIR=${clr}" "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" # Manually define CMAKE_INSTALL_<DIR> @@ -79,16 +102,21 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs . - # Cannot find ROCm device library, pointless - substituteInPlace CMakeLists.txt \ - --replace "add_subdirectory(tests-v2)" "" \ - --replace "add_subdirectory(samples)" "" + substituteInPlace tests-v2/featuretests/profiler/CMakeLists.txt \ + --replace "--build-id=sha1" "--build-id=sha1 --rocm-path=${clr} --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode" + + substituteInPlace test/CMakeLists.txt \ + --replace "\''${ROCM_ROOT_DIR}/amdgcn/bitcode" "${rocm-device-libs}/amdgcn/bitcode" ''; - postBuild = '' - # HSACO aren't being built for some reason - substituteInPlace test/cmake_install.cmake \ - --replace "file(INSTALL DESTINATION \"\''${CMAKE_INSTALL_PREFIX}/share/rocprofiler/tests-v1\" TYPE FILE FILES \"" "message(\"" + postInstall = '' + # Why do these not already have the executable bit set? + chmod +x $out/lib/rocprofiler/librocprof-tool.so + chmod +x $out/share/rocprofiler/tests-v1/test/ocl/SimpleConvolution + + # Why do these have the executable bit set? + chmod -x $out/libexec/rocprofiler/counters/basic_counters.xml + chmod -x $out/libexec/rocprofiler/counters/derived_counters.xml ''; passthru.updateScript = rocmUpdateScript { diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/development/tools/abuild/default.nix index c3c3fbcafcd7d..dce24f0ad80d4 100644 --- a/pkgs/development/tools/abuild/default.nix +++ b/pkgs/development/tools/abuild/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "abuild"; - version = "3.11.21"; + version = "3.12.0"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = pname; rev = version; - sha256 = "sha256-M88JPQKBkixAsWfGUirFsjFwB7m8/x63dpnoEHZpQTE="; + sha256 = "sha256-p4TohsZZTi4HxtJsyuoE5HDfkGa0pv53saGj3X9bmrI="; }; buildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index b647eb851e120..ba5e608bd3549 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.218.0"; + version = "0.219.5"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-QmC1K2msiIN7bBwlrsQ8in3YGUoVqf2w21HbiLULWhM="; + sha256 = "sha256-cg0tqwvYQ43Nvu6fQHGEX002sjmDBcz2AGke+K5Gk7g="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 94e1d704b275b..d5bcd116dc203 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -4,23 +4,17 @@ }: stdenv.mkDerivation rec { - version = "5.6.0"; + version = "5.7.0"; pname = "rr"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "H39HPkAQGubXVQV3jCpH4Pz+7Q9n03PrS70utk7Tt2k="; + hash = "sha256-n1Jbhr77bI0AXncY/RquNVSwwnnAXt31RmKtAa1/oHg="; }; - patches = [ - (fetchpatch { - name = "fix-flexible-array-member.patch"; - url = "https://github.com/rr-debugger/rr/commit/2979c60ef8bbf7c940afd90172ddc5d8863f766e.diff"; - sha256 = "cmdCJetQr3ELPOyWl37h1fGfG/xvaiJpywxIAnqb5YY="; - }) - ]; + patches = [ ]; postPatch = '' substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' @@ -54,7 +48,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; # FIXME - #doCheck = true; + doCheck = false; preCheck = "export HOME=$TMPDIR"; diff --git a/pkgs/development/tools/bloom/default.nix b/pkgs/development/tools/bloom/default.nix new file mode 100644 index 0000000000000..dc0a35d065421 --- /dev/null +++ b/pkgs/development/tools/bloom/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, yaml-cpp +, qtbase +, qtsvg +, wrapQtAppsHook +, qttools +, libusb1 +, php +, hidapi +, procps +}: + +stdenv.mkDerivation rec { + pname = "bloom"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "bloombloombloom"; + repo = "Bloom"; + rev = "v${version}"; + hash = "sha256-ZZfclZwxsCgApUII79bJVyT5V/dF9jm7l8ynRWCh0UU="; + }; + + nativeBuildInputs = [ + cmake + php + wrapQtAppsHook + ]; + + buildInputs = [ + hidapi + libusb1 + procps + qtbase + qtsvg + qttools + yaml-cpp + ]; + + postPatch = '' + sed -i 's|/usr|${placeholder "out"}|' cmake/Installing.cmake + ''; + + meta = { + description = "Debug interface for AVR-based embedded systems development on GNU/Linux"; + homepage = "https://bloom.oscillate.io/"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ eclairevoyant ]; + mainProgram = "bloom"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 545236b561c8e..8fb37a9f666f2 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -25,12 +25,12 @@ }: let - version = "6.3.2"; + version = "6.4.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-jNf+rFgZO+K8ukUbpmiKRoJNN8pjWf9Y4NROuY8EKUg="; + hash = "sha256-vYj/YCyLuynugroqaxKtCS1R7GaMZXf5Yo8Y5I/05R4="; }; # Update with @@ -330,6 +330,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + # prevent bazel version check failing in the updater + rm .bazelversion cp -r . "$out" runHook postInstall diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json index e407902f79499..c294c1f22419c 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json @@ -7,6 +7,13 @@ "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" ] }, + "1.3.3.zip": { + "name": "1.3.3.zip", + "sha256": "bb529ba133c0256df49139bd403c17835edbf60d2ecd6463549c6a5fe279364d", + "urls": [ + "https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.3.3.zip" + ] + }, "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": { "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", @@ -55,14 +62,6 @@ "https://github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz" ] }, - "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { - "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" - ] - }, "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz": { "name": "7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz", "sha256": "8e7d59a5b12b233be5652e3d29f42fba01c7cbab09f6b3a8d0a57ed6d1e9a0da", @@ -207,6 +206,25 @@ "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz" ] }, + "blake3": { + "build_file": "//third_party:blake3/blake3.BUILD", + "generator_function": "dist_http_archive", + "generator_name": "blake3", + "name": "blake3", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "bb529ba133c0256df49139bd403c17835edbf60d2ecd6463549c6a5fe279364d", + "strip_prefix": "BLAKE3-1.3.3", + "urls": [ + "https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.3.3.zip" + ] + }, "boringssl": { "generator_function": "grpc_deps", "generator_name": "boringssl", @@ -538,44 +556,44 @@ "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" ] }, - "java_tools-v12.6.zip": { - "name": "java_tools-v12.6.zip", - "sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5", + "java_tools-v12.7.zip": { + "name": "java_tools-v12.7.zip", + "sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip" ] }, - "java_tools_darwin_arm64-v12.6.zip": { - "name": "java_tools_darwin_arm64-v12.6.zip", - "sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a", + "java_tools_darwin_arm64-v12.7.zip": { + "name": "java_tools_darwin_arm64-v12.7.zip", + "sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip" ] }, - "java_tools_darwin_x86_64-v12.6.zip": { - "name": "java_tools_darwin_x86_64-v12.6.zip", - "sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7", + "java_tools_darwin_x86_64-v12.7.zip": { + "name": "java_tools_darwin_x86_64-v12.7.zip", + "sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip" ] }, - "java_tools_linux-v12.6.zip": { - "name": "java_tools_linux-v12.6.zip", - "sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066", + "java_tools_linux-v12.7.zip": { + "name": "java_tools_linux-v12.7.zip", + "sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip" ] }, - "java_tools_windows-v12.6.zip": { - "name": "java_tools_windows-v12.6.zip", - "sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d", + "java_tools_windows-v12.7.zip": { + "name": "java_tools_windows-v12.7.zip", + "sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip" ] }, "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": { @@ -1076,18 +1094,18 @@ "generator_function": "dist_http_archive", "generator_name": "platforms", "name": "platforms", - "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", + "sha256": "3a561c99e7bdbe9173aa653fd579fe849f1d8d67395780ab4770b1f381431d51", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz" ] }, - "platforms-0.0.5.tar.gz": { - "name": "platforms-0.0.5.tar.gz", - "sha256": "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407", + "platforms-0.0.7.tar.gz": { + "name": "platforms-0.0.7.tar.gz", + "sha256": "3a561c99e7bdbe9173aa653fd579fe849f1d8d67395780ab4770b1f381431d51", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz" ] }, "python-3.7.0": { @@ -1159,10 +1177,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a", + "sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip" ] }, "remote_java_tools_darwin_x86_64": { @@ -1187,10 +1205,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7", + "sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip" ] }, "remote_java_tools_for_testing": { @@ -1205,10 +1223,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5", + "sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip" ] }, "remote_java_tools_linux": { @@ -1233,10 +1251,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066", + "sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip" ] }, "remote_java_tools_test": { @@ -1251,10 +1269,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5", + "sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip" ] }, "remote_java_tools_test_darwin_arm64": { @@ -1269,10 +1287,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a", + "sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip" ] }, "remote_java_tools_test_darwin_x86_64": { @@ -1287,10 +1305,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7", + "sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip" ] }, "remote_java_tools_test_linux": { @@ -1305,10 +1323,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066", + "sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip" ] }, "remote_java_tools_test_windows": { @@ -1323,10 +1341,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d", + "sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip" ] }, "remote_java_tools_windows": { @@ -1351,10 +1369,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d", + "sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip" ] }, "remotejdk11_linux": { @@ -1991,11 +2009,17 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", - "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", + "sha256": "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0", + "strip_prefix": "", + "urls": [ + "https://github.com/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz" + ] + }, + "rules_java-5.5.1.tar.gz": { + "name": "rules_java-5.5.1.tar.gz", + "sha256": "73b88f34dc251bce7bc6c472eb386a6c2b312ed5b473c81fe46855c248f792e0", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", - "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + "https://github.com/bazelbuild/rules_java/releases/download/5.5.1/rules_java-5.5.1.tar.gz" ] }, "rules_jvm_external": { diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index f248e9c1123b0..8d1af88a84156 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.0.4", + "version": "1.0.5", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1gqnsm8pcwrk1v1v4xaj0j0w5xsmh3xv61h6sv72297illxxkbgq" + "sha256": "1p2ibii71digdz7qqqyahvdmmxyx19crwgn4bmas0hahl6mz553x" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "124xqn18xyn35pg18p0rz40d8vjgijp6sc6wg4i81ih2mrxqxsbc" + "sha256": "1y9ghb829jz9yg4l7bgwnbl3cm7z7c20cyfc71v9iz8bq5ns9akr" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "0r581a1zzlk7qbcsfbv79asj5y56zzx9249h099k29rbdjc3ya26" + "sha256": "12qjrm979pfbr0j7s59dyn7xkk585av7l0qxf77rz71009kvql0a" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "018cmr71qhdqvmprrfb8clsj718gfkdvyw48dqkf2jsafq0kglk2" + "sha256": "17x4nv5f8g1kx8l4n8ncxf60zwhwpqg8fh5cl8qy9s5h9h81n0rz" } } } diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index 734a766c431b0..a14fd890526f7 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "changie"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-ulbpitTCIuRg50GAin54RNVMUl8ZuwYW1SnenvemckA="; + hash = "sha256-jMpOSAmjJKDG8uvjjwZ03cu+5JmFzYMuNieotjvgnME="; }; - vendorHash = "sha256-giOL4/ZofaylhX+s7y75RR7d3WDxNCmr25JHBZZkH9s="; + vendorHash = "sha256-UAMhQK2Sw7W6RfkSPD2P0dGc0bimAL8jD/gEc/hRaD0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index 3082ec2bd7986..01b31266d0a39 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -4,7 +4,7 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.23.3"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = version; - hash = "sha256-gPFG1AgInakF8leMM0c1zZt2OdZdIKcUmItwICV8p1I="; + hash = "sha256-Hss4MgE09v2KvL8OIapFgocO+5EWE2WEr5xBAjhwNeE="; }; propagatedBuildInputs = [ @@ -34,6 +34,10 @@ buildPythonApplication rec { "check_jsonschema.cli" ]; + disabledTests = [ + "test_schemaloader_yaml_data" + ]; + meta = with lib; { description = "A jsonschema CLI and pre-commit hook"; homepage = "https://github.com/python-jsonschema/check-jsonschema"; diff --git a/pkgs/development/tools/confluent-cli/default.nix b/pkgs/development/tools/confluent-cli/default.nix index e1447a857d0af..102ec3d996fd5 100644 --- a/pkgs/development/tools/confluent-cli/default.nix +++ b/pkgs/development/tools/confluent-cli/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.confluent.io/confluent-cli/current/overview.html"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ rguevara84 ]; + maintainers = with maintainers; [ rguevara84 autophagy ]; # TODO: There's support for i686 systems but I do not have any such system # to build it locally on, it's also unfree so I cannot rely on ofborg to diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index b89f4e4d28839..d14486f8aeda2 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -31,6 +31,8 @@ , parameterized , git , openssh +, setuptools +, pythonRelaxDepsHook , glibcLocales , nixosTests , callPackage @@ -88,6 +90,7 @@ let autobahn pyjwt pyyaml + setuptools ] # tls ++ twisted.optional-dependencies.tls; @@ -108,8 +111,11 @@ let git openssh glibcLocales + pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "Twisted" ]; + patches = [ # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 528b937984014..57a78dbb3101a 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -24,13 +24,13 @@ assert builtins.all (x: builtins.elem x [ "node16" "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; - version = "2.310.2"; + version = "2.311.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-cOHA4VjccIJmCgCxRrBFzBFnh4SGQ3LpcTvtGuogHQU="; + hash = "sha256-71SwPuX1XZygT/TdAHECudxFxsQuXrl/tcAYVAxfxfI="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision @@ -81,6 +81,14 @@ buildDotnetModule rec { url = "https://github.com/actions/runner/commit/5ff0ce1.patch"; hash = "sha256-2Vg3cKZK3cE/OcPDZkdN2Ro2WgvduYTTwvNGxwCfXas="; }) + ] ++ lib.optionals (nodeRuntimes == [ "node20" ]) [ + # If the package is built without Node 16, make Node 20 the default internal version + # https://github.com/actions/runner/pull/2844 + (fetchpatch { + name = "internal-node-20.patch"; + url = "https://github.com/actions/runner/commit/acdc6ed.patch"; + hash = "sha256-3/6yhhJPr9OMWBFc5/NU/DRtn76aTYvjsjQo2u9ZqnU="; + }) ]; postPatch = '' diff --git a/pkgs/development/tools/cpm-cmake/default.nix b/pkgs/development/tools/cpm-cmake/default.nix index 2e85a90c3f1d2..ada4dde0176a2 100644 --- a/pkgs/development/tools/cpm-cmake/default.nix +++ b/pkgs/development/tools/cpm-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.38.5"; + version = "0.38.6"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-PpfOpfEb8wxqaFFh8h0H4nn8bbBr7s0dWcRiREGddQ4="; + hash = "sha256-6y3kZyhY1WKHLw3ekZMQeoSGUgxhBu8dPl58ZnCDa+E="; }; dontConfigure = true; diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 16def898b0516..0ff3e90dc0db5 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -1,4 +1,11 @@ -{ buildGoModule, fetchFromGitHub, lib, installShellFiles, testers, cue }: +{ buildGoModule +, fetchFromGitHub +, fetchpatch +, lib +, installShellFiles +, testers +, cue +}: buildGoModule rec { pname = "cue"; @@ -11,13 +18,21 @@ buildGoModule rec { hash = "sha256-1svWb83xbVZIlI9pviCYfQ6Kkp0QRjZwrauL7PPJLts="; }; + vendorHash = "sha256-ku4tPTXdnKau0kqnAAEHDdSF4oAC/6SDkTq8cECOiEk="; + + patches = [ + # Fix tests with go1.21. See https://github.com/cue-lang/cue/issues/2548. + (fetchpatch { + url = "https://github.com/cue-lang/cue/commit/3bf3dbd655284d3628399a83a703f4849b5f9374.patch"; + hash = "sha256-9Zi2mrqB1JTFvadiqWTgzzi1pffZ3gOmTtrDDQWye1Q="; + }) + ]; + postPatch = '' # Disable script tests rm -f cmd/cue/cmd/script_test.go ''; - vendorHash = "sha256-ku4tPTXdnKau0kqnAAEHDdSF4oAC/6SDkTq8cECOiEk="; - excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/darklua/default.nix b/pkgs/development/tools/darklua/default.nix index d10ef137a378f..3703cc757c691 100644 --- a/pkgs/development/tools/darklua/default.nix +++ b/pkgs/development/tools/darklua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "darklua"; - version = "0.10.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "seaofvoices"; repo = "darklua"; rev = "v${version}"; - hash = "sha256-OgQOsc6upMJveUUJSGqvopsyoKs7ALd6pVYxCi5fmS8="; + hash = "sha256-lBnEMQqAUkr377aYNRvpbIyZMmB6NIY/bmB1Oe8QPIM="; }; - cargoHash = "sha256-qq42K4cPrWu/92P4dpegZ/0Wv2ndCb5d5+DgEKzdhbw="; + cargoHash = "sha256-YmtOVS58I8YdNpWBXBuwSFUVKQsVSuGlql70SPFkamM="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index bad6a1644b9d8..fe89b0c791e3d 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-5dYWCcCQymwzWGY67lds5QQzHHkKt3OGkvqXDLwt/q8="; + hash = "sha256-gT+1ptQUZNobUG2etknCuyV2xxct5F6+P2J6/6yQkTk="; }; - vendorHash = "sha256-1sfIwawsWefh+nj4auqRjU4dWuDbgpvhAc8cF8DhICg="; + vendorHash = "sha256-2HY5eqiVRKvP1YrlNtbEj7QvDfoMV6DF+WgQOwo9VuQ="; doCheck = false; diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index 69fe4ee889c88..bca69a4534631 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.22.0"; + version = "1.23.0"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "sqlc-dev"; repo = "sqlc"; rev = "v${version}"; - hash = "sha256-aSu+d3ti/PpR5oQwciq1Cz+vxDPunGsVaUg/o/rfmsY="; + hash = "sha256-MM4O/njW4R1darZMtoevuLMt14/BrCAaFvSX06CTso8="; }; proxyVendor = true; - vendorHash = "sha256-sjGswoIUM+UL6qJORdB3UmPh7T6JmTBI5kksgGcRtY0="; + vendorHash = "sha256-tJ+Bih+vwkYfEvIsJ6R2Z0eDS9m1eTOS68uyad0F6f0="; subPackages = [ "cmd/sqlc" ]; diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 3511c3a4e3ffd..89ae63369ff4f 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "2.3.4"; + version = "2.3.5"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kUdTQmNUvjWZ6IUnBndUF47DLFU+hT5rnmyY3LeLA0M="; + hash = "sha256-l9py+qMI8t5L+FcUmJYXwemjUy/pcugbvhdW3oUOZMo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index d51520a42c37a..c373b18108a2a 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-XZf8xJcWUY+OqT4Sjwes9o09//ToG7oMIhhyLSHDctM="; + hash = "sha256-xjmxikIcR3v5lpxq7w2p0bukPunUTYH/HTQhy9fAOz8="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-IwAZA0/i9I/Ylz7M5SZ/nJ6nMkiT6aEM9dAGPnCzyAk="; + vendorHash = "sha256-fDh+6aBrHUqioNbgufFiD5c4i8SGAYrUuFXgTVmhrRE="; nativeBuildInputs = [ installShellFiles ]; @@ -38,6 +38,6 @@ buildGoModule rec { description = "Instant, easy, predictable shells and containers."; homepage = "https://www.jetpack.io/devbox"; license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ urandom lagoja ]; }; } diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 31e6a3e71d54d..074d4f54745eb 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.99.0"; + version = "1.100.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-xwkbekTnwisgr1gkUewMkz0E5iQg6bWgVz8tne7ME9Y="; + sha256 = "sha256-1NQ09Cn62VUi670y1jq8W05a9dg1CdQypIIh1QmR0p0="; }; meta = with lib; { diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index 3a5802a187b4f..a549563aabbe2 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.5.8"; + version = "1.6.0"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-CnSccws3loqfbtjGKe3tkXNVOmNtQX/0+szODMErgxE="; + sha256 = "sha256-MyQVTAfKHog6BiqqT8eaIPlUMctHz+Oe4eZqfpgiHNs="; }; - vendorHash = "sha256-PgQvckmqewzE2QXlP9xtzP5s2S6DDl2o8KWrNXFhEO4="; + vendorHash = "sha256-VAPJqa1930Vmjjj9rSjVTk6e4HD3JbOk6VC8v37kijQ="; subPackages = [ "cmd/dyff" diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index c9d2cc352e15f..d5d901e1d8deb 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.19"; + version = "0.7.21"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-Qs2Ik559KOhkwTSaEoYLqy4m9y/mRp7XThArKOkH3uI="; + hash = "sha256-ts+XSPRkDQElyM8nr6Vtf8Ov6C5OoiIhMNnFv6YA2bw="; }; - vendorHash = "sha256-h3/FmhcXwRvDoOwJ643ze3GrV13tIhnnIMynQgf5emg="; + vendorHash = "sha256-/ZHoi5aHJ79kjUgbFKBVHDZyVyCdFfY/fJDrHdUmuUE="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/eclint/default.nix b/pkgs/development/tools/eclint/default.nix index 4c957011d8670..933a19fc12c16 100644 --- a/pkgs/development/tools/eclint/default.nix +++ b/pkgs/development/tools/eclint/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eclint"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitLab { owner = "greut"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/WSxhdPekCNgeWf+ObIOblCUj3PyJvykGyCXrFmCXLA="; + sha256 = "sha256-x0dBiRHaDxKrTCR2RfP2/bpBo6xewu8FX7Bv4ugaUAY="; }; - vendorHash = "sha256-hdMBd0QI2uWktBV+rH73rCnnkIlw2zDT9OabUuWIGks="; + vendorHash = "sha256-aNQuALDe37lsmTGpClIBOQJlL0NFSAZCgcmTjx0kP+U="; ldflags = [ "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index 97efd1939eeb8..c5089bc2d7f35 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "espup"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; rev = "v${version}"; - hash = "sha256-2LSlnGte65eemlDw67mPhmf+RuLwnbavNyMYMLgrx/E="; + hash = "sha256-D5ck96nR8agiYf1t6ViOaEWws9AQ0EBZ48YKp68jfRA="; }; - cargoHash = "sha256-4Gm8nQIsZzaPYtqf7eAyX0iX0rUFBnEiavJR1qcc8/g="; + cargoHash = "sha256-mKpAGS6Rxoq2v/VW0AncVx/9BjvG7wM8ePTR+661e5U="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 09069eb883f7c..383ca09294491 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.16"; + version = "0.16.17"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-QYwUXZdix5GeOYF3F9XR4lIE9cKZGGgEOtROzirLw3o="; + sha256 = "sha256-AiYqMXLc8YaPILx5TnL8E3xrYCDqBUfI+zzFQIknNJE="; }; vendorHash = null; diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix index 21ab0a93ab201..a8d8c7348b0f9 100644 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ b/pkgs/development/tools/fsautocomplete/default.nix @@ -5,13 +5,13 @@ let in buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.66.1"; + version = "0.67.0"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - sha256 = "sha256-9kuGteoWbYoqgFA11qH+MEjhLMk/23bXXiGG8Lsr1MA="; + sha256 = "sha256-txHkQDLyIejsEZGpfIGqeiJ8EUePZq1btxfd+EZD4aM="; }; nugetDeps = ./deps.nix; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index ecf2396eb9d00..dab6f0aa4fbfe 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -70,7 +70,7 @@ (fetchNuGet { pname = "IcedTasks"; version = "0.5.4"; sha256 = "0584bbld25f6hzglzsah1n215658d4lwnzwxcazrwzyy25rmansl"; }) (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; sha256 = "066zla2rp1sal6by3h3sg6ibpkk52kbhn30bzk58l6ym7q1kqa6b"; }) - (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.17"; sha256 = "14h8rkc9q6shh9fqa640bzfs1k1y5nfriwviwjynpjf79xbbcpvs"; }) + (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.19"; sha256 = "1n910ipbscr7b3cr873cr5zh40ysn0n9z47dlqlndbq0g3kl6vi5"; }) (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.62.0"; sha256 = "1da6hhca9vd6hxbz9jmwxwx2pc7d5ayd41sp6mzzmbk4n3jk32q2"; }) (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.62.0"; sha256 = "1mkw4b1sawv1p0c4a1fidkw02bh9iik7fi80ffgqi0msc3ql8lmg"; }) (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.62.0"; sha256 = "0kj9h5gvvrl720kg5jylx8w1jjmcci7bdhabr57sbq31vbgav74d"; }) diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index b7803843c3450..97e1cea9c6cd4 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -9,6 +9,7 @@ , gtk3 , glib , gjs +, enableWebkit2gtk ? stdenv.isLinux , webkitgtk_4_1 , gobject-introspection , wrapGAppsHook @@ -49,13 +50,18 @@ stdenv.mkDerivation rec { gtk3 glib gjs - webkitgtk_4_1 libxml2 python3 python3.pkgs.pygobject3 gsettings-desktop-schemas gdk-pixbuf gnome.adwaita-icon-theme + ] ++ lib.optionals enableWebkit2gtk [ + webkitgtk_4_1 + ]; + + mesonFlags = [ + (lib.mesonEnable "webkit2gtk" enableWebkit2gtk) ]; postPatch = '' @@ -74,6 +80,6 @@ stdenv.mkDerivation rec { description = "User interface designer for GTK applications"; maintainers = teams.gnome.members; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix index 74659dcf50a7b..591e0a28a6965 100644 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchzip +, wrapGAppsHook , cairo , dbus , fontconfig @@ -16,7 +17,6 @@ , libglvnd , libuuid , libxcb -, makeWrapper }: stdenv.mkDerivation (finalAttrs: { @@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-v63sV0HNHSU9H5rhtJcwZCuIXEGe1+BDyxV0/EqBk2E="; }; + nativeBuildInputs = [ wrapGAppsHook ]; + sourceRoot = "."; dontConfigure = true; diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix index d024281205ba5..2a7379db08474 100644 --- a/pkgs/development/tools/go-junit-report/default.nix +++ b/pkgs/development/tools/go-junit-report/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-junit-report"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jstemmer"; repo = "go-junit-report"; rev = "v${version}"; - sha256 = "sha256-Xz2tJtacsd6PqqA0ZT2eRgTACZonhdDtRWfBGcHW3A4="; + sha256 = "sha256-s4XVjACmpd10C5k+P3vtcS/aWxI6UkSUPyxzLhD2vRI="; }; vendorHash = "sha256-+KmC7m6xdkWTT/8MkGaW9gqkzeZ6LWL0DXbt+12iTHY="; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 36379a520899c..552b71cc7067a 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.35.2"; + version = "2.36.0"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-MsaAITGFDnAylxMU+PGbSl+H/W/Y7pghBbfQyqp31AM="; + sha256 = "sha256-lJkxN0FtwfuOMCMGEISkZMMKULE5X5kTltIgDm7Ta0Y="; }; preCheck = '' diff --git a/pkgs/development/tools/goimports-reviser/default.nix b/pkgs/development/tools/goimports-reviser/default.nix index 09bd1541775de..7f79d3b5fe33a 100644 --- a/pkgs/development/tools/goimports-reviser/default.nix +++ b/pkgs/development/tools/goimports-reviser/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goimports-reviser"; - version = "3.4.5"; + version = "3.5.6"; src = fetchFromGitHub { owner = "incu6us"; repo = "goimports-reviser"; rev = "v${version}"; - hash = "sha256-VsG3Y7V59tTh1XS45s3NKGwMxS/y6KbIxWbRK6bHdaw="; + hash = "sha256-OMCmW2GhByuVN8+Kuaw9o2oCrdA6C9fK/C7yl7wI2Ls="; }; vendorHash = "sha256-aYhUsO3Z0uue66XB+/oSVYLG9QGyVcFeZ0ngzhpBZxo="; diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/development/tools/hclfmt/default.nix index 368a1a6e5c5a8..03e934175c0f7 100644 --- a/pkgs/development/tools/hclfmt/default.nix +++ b/pkgs/development/tools/hclfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.18.1"; + version = "2.19.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-31Xqgzd208ypK8u1JV5Rh5cCqGr1MJkLP490nIeovsE="; + hash = "sha256-A7YfjXdblFGBABD/PeJMzh9WdPeIUWOWAr/UlD3ki28="; }; vendorHash = "sha256-DA1IKaC+YSBzCfEMqHsHfwu1o5qvYFaFgDoGG0RZnoo="; diff --git a/pkgs/development/tools/karate/default.nix b/pkgs/development/tools/karate/default.nix index ac3ba5ffdb9d4..bd99903e984f2 100644 --- a/pkgs/development/tools/karate/default.nix +++ b/pkgs/development/tools/karate/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "karate"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar"; - sha256 = "sha256-LTGxS5dsp+UrDzI+eoJJSodShe34KWHWW1QgqnhJawM="; + sha256 = "sha256-3gNoXUchrfGkZC6UAfw2TXorzSlqnOZCe0gnuUHIIb4="; }; dontUnpack = true; diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index 0c02135827228..6085ec71a08d9 100644 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-fRpVAYg4UwRe3bcjQPOnCGWSANfoTwD5Y9vs3QET1eM="; + hash = "sha256-zCiNd0HhGdN65wD7Z6lbGLhvGi8BFtq7X5QDpYl0/Fw="; }; modRoot = "gopls"; - vendorHash = "sha256-9d7vgCMc1M5Cab+O10lQmKGfL9gqO3sajd+3rF5cums="; + vendorHash = "sha256-BK2s44EtMjAEDXZeQHdiIb1tUMogujcDM7tRwO7LMRw="; doCheck = false; diff --git a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix index 790718125613d..8ec9ebb8f30a4 100644 --- a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix +++ b/pkgs/development/tools/language-servers/kotlin-language-server/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "kotlin-language-server"; - version = "1.3.5"; + version = "1.3.7"; src = fetchzip { url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; - hash = "sha256-hoZDbhedauW1TK78rX37Gwn/6OWLXZzy8wKsUrbTmKI="; + hash = "sha256-BEQywg3ZU4LtF9trntGbDp64SIWH4y93o/VVMSRP+cc="; }; dontBuild = true; diff --git a/pkgs/development/tools/language-servers/postgres-lsp/default.nix b/pkgs/development/tools/language-servers/postgres-lsp/default.nix index 167b86216f300..f4bda019b815e 100644 --- a/pkgs/development/tools/language-servers/postgres-lsp/default.nix +++ b/pkgs/development/tools/language-servers/postgres-lsp/default.nix @@ -6,25 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "postgres-lsp"; - version = "unstable-2023-09-21"; + version = "unstable-2023-10-20"; - src = (fetchFromGitHub { + src = fetchFromGitHub { owner = "supabase"; repo = "postgres_lsp"; - rev = "f25f23a683c4e14dea52e3e423584588ab349081"; - hash = "sha256-z8WIUfgnPYdzhBit1V6A5UktjoYCblTKXxwpbHOmFJA="; + rev = "88901a987de9a2d8db05c36bcd87c5c877b51460"; + hash = "sha256-HY83SO2dlXKamIqFEz53A8YDYx9EynX8FCX9EjF+tdw="; fetchSubmodules = true; - }).overrideAttrs { - # workaround to be able to fetch git@github.com submodules - # https://github.com/NixOS/nixpkgs/issues/195117 - env = { - GIT_CONFIG_COUNT = 1; - GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; - GIT_CONFIG_VALUE_0 = "git@github.com:"; - }; }; - cargoHash = "sha256-Nyxiere6/e5Y7YcgHitVkaiS1w3JXkbohIcBNc00YXY="; + cargoHash = "sha256-m8m0Q3UAq6kV2IoXMFTkP0WKzSXiWPkfOkta639dcj0="; nativeBuildInputs = [ protobuf diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index 3740472e2c700..d91ec72ea6aec 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.40"; + version = "0.0.42"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "v${version}"; - hash = "sha256-CQ4SDIGhUTn7fdvoGag+XM7HcY+qJyp9McyzpoTQ0tM="; + hash = "sha256-Dn/xPjYCyJYlDNMUfl61L/tWq5mRJ8WD0G5qZH9OepY="; }; postPatch = '' diff --git a/pkgs/development/tools/language-servers/verible/default.nix b/pkgs/development/tools/language-servers/verible/default.nix index 4b27311671571..2e31b44398bb1 100644 --- a/pkgs/development/tools/language-servers/verible/default.nix +++ b/pkgs/development/tools/language-servers/verible/default.nix @@ -17,17 +17,17 @@ buildBazelPackage rec { # These environment variables are read in bazel/build-version.py to create # a build string shown in the tools --version output. # If env variables not set, it would attempt to extract it from .git/. - GIT_DATE = "2023-08-29"; - GIT_VERSION = "v0.0-3410-g398a8505"; + GIT_DATE = "2023-10-26"; + GIT_VERSION = "v0.0-3428-gcfcbb82b"; # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION))); src = fetchFromGitHub { owner = "chipsalliance"; - repo = "verible"; - rev = "${GIT_VERSION}"; - sha256 = "sha256-qi//Dssgg5ITrL5jCpZXpSrhSm2xCqe53D9ctK7SQoU="; + repo = "verible"; + rev = "${GIT_VERSION}"; + hash = "sha256-snWhOuGyAdtdJDMttcbEjlkwPUO1mdR9vuro0tZt+Z8="; }; patches = [ diff --git a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix index 5f6cf13b54d20..aa77056416151 100644 --- a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix +++ b/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "vscode-langservers-extracted"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "hrsh7th"; repo = pname; rev = "v${version}"; - hash = "sha256-RLRDEHfEJ2ckn0HTMu0WbMK/o9W20Xwm+XI6kCq57u8="; + hash = "sha256-sGnxmEQ0J74zNbhRpsgF/cYoXwn4jh9yBVjk6UiUdK0="; }; - npmDepsHash = "sha256-DhajWr+O0zgJALr7I/Nc5GmkOsa9QXfAQpZCaULV47M="; + npmDepsHash = "sha256-LFWC87Ahvjf2moijayFze1Jk0TmTc7rOUd/s489PHro="; buildPhase = let diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix index 9c2641487df41..6d2bc2b009fd2 100644 --- a/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -4,32 +4,33 @@ , cmake-format , pygls , cmake -, pdm-pep517 +, pdm-backend , pytest-datadir , pytestCheckHook +, pythonOlder }: buildPythonApplication rec { pname = "cmake-language-server"; - version = "0.1.7"; + version = "0.1.8"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "regen100"; repo = "cmake-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-ExEAi47hxxEJeoT3FCwpRwJrf3URnI47/5FDL7fS5sY="; + hash = "sha256-7AlF+FqhZR+6lLsR1dxAGHd/GU+mB3ojYLDXVm7Il4M="; }; - PDM_PEP517_SCM_VERSION = version; - patches = [ # Test timeouts occasionally cause the build to fail ./disable-test-timeouts.patch ]; nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ @@ -44,6 +45,16 @@ buildPythonApplication rec { pytestCheckHook ]; + # version.py generated by pdm, no idea why it's not present in test phase + # https://github.com/regen100/cmake-language-server/blob/68bbc8187b6110a75f498647af7c44df790ffa87/pyproject.toml#L35-L36 + preCheck = '' + echo "__version__ = \"$PDM_BUILD_SCM_VERSION\"" > cmake_language_server/version.py + ''; + + postCheck = '' + rm cmake_language_server/version.py + ''; + dontUseCmakeConfigure = true; pythonImportsCheck = [ diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 2145c9a249a0a..cfcd86f9dc2b1 100644 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , bzip2 @@ -22,16 +21,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go="; }; - patches = [ - # Backport upstream fix for gcc-13 support: - # https://github.com/nxp-imx/mfgtools/pull/360 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/nxp-imx/mfgtools/commit/24fd043225903247f71ac10666d820277c0b10b1.patch"; - hash = "sha256-P7n6+Tiz10GIQ7QOd/qQ3BI7Wo5/66b0EwjFSpOUSJg="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = [ bzip2 libusb1 libzip openssl zstd ]; diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix index 6f554e6d352b6..8af08bd8311fe 100644 --- a/pkgs/development/tools/misc/ptags/default.nix +++ b/pkgs/development/tools/misc/ptags/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ptags"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "dalance"; repo = "ptags"; rev = "v${version}"; - sha256 = "sha256-hFHzNdTX3nw2OwRxk9lKrt/YpaBXwi5aE/Qn3W9PRf4="; + sha256 = "sha256-bxp38zWufqS6PZqhw8X5HR5zMRcwH58MuZaJmDRuiys="; }; - cargoSha256 = "sha256-cFezB7uwUznC/8NXJNrBqP0lf0sXAQBoGksXFOGrUIg="; + cargoHash = "sha256-Se4q4G3hzXIHHSY2YxeRHxU6+wnqR9bfrIQSOagFYZE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index f268a95614feb..138765bb22803 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.5.4"; + version = "0.6.0"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-CaZM8c1dref98VL240PEUQE8XtWAvVlQSGnPQspg+jw="; + sha256 = "sha256-/H4QhkWsvq6UvrxuNhRPwlUi/spSYB78h8yUvdCJ2Ws="; }; - cargoSha256 = "sha256-F4lnE5ig3UnZJOdxpnGLesDP3rgEOFzZO0WGQ8mtj+o="; + cargoSha256 = "sha256-wFkVGKa00WQjk59KSBdOJ9Zfj8MwzC4XOhT9p4yvJM0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/misc/scip/default.nix b/pkgs/development/tools/misc/scip/default.nix index 36fb940f19c70..0438e65aede3e 100644 --- a/pkgs/development/tools/misc/scip/default.nix +++ b/pkgs/development/tools/misc/scip/default.nix @@ -1,33 +1,22 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch , testers , scip }: buildGoModule rec { pname = "scip"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "scip"; rev = "v${version}"; - hash = "sha256-tcnBv+dxuLD/ixeOLGrHu2UVfOnrfANjyaRzW5oDC94="; + hash = "sha256-8CH5rIWvCXZGspAyF6c8Qs/gntpfdpPrxrvxW3bZ/ww="; }; - vendorHash = "sha256-+IR3fc6tvSwPGDZ4DxrE48Ii3azcT0LMmID1LRAu5g8="; - - patches = [ - # update documentation to fix broken test - # https://github.com/sourcegraph/scip/pull/174 - (fetchpatch { - name = "test-fix-out-of-sync-documentation.patch"; - url = "https://github.com/sourcegraph/scip/commit/7450b7701637956d4ae6669338c808234f7a7bfa.patch"; - hash = "sha256-Y5nAVHyy430xdN89ohA8XAssNdSSPq4y7QaesN48jVs="; - }) - ]; + vendorHash = "sha256-3Tq2cexcxHjaH6WIz2hneE1QeBSGoMINBncKbqxODxQ="; ldflags = [ "-s" @@ -35,8 +24,10 @@ buildGoModule rec { "-X=main.Reproducible=true" ]; - postInstall = '' - mv $out/bin/{cmd,scip} + # update documentation to fix broken test + postPatch = '' + substituteInPlace docs/CLI.md \ + --replace 0.3.0 0.3.1 ''; passthru.tests = { diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index d27c06807618b..074a5853ba281 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mod"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "sha256-+xgh/al6954I+DseSHk9k7Rbj0TzQxCtX4X3pbQmoG0="; + sha256 = "sha256-ZFAjiTCmx9o/rUa1vK1Fmz6sE695zzlexTyWJO05M6k="; }; - vendorHash = "sha256-NvTbQcYGMyQ/bfNTJ3eC28n9TIU4HkcD3ij2o9EBX3Y="; + vendorHash = "sha256-5A4W99wcuXMWH0s+uykBWuKCxo8wr3GbTpUKj+Ql0os="; doCheck = false; diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index b12e13d28011a..ba362d65a237c 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -5,7 +5,6 @@ , fetchurl , git , cctools -, developer_cmds , DarwinTools , makeWrapper , CoreServices @@ -38,16 +37,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; - version = "8.0.34"; + version = "8.0.35"; srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; + hash = "sha256-kXxe04cE6ZIRGFzkviTjOowZyRJB7XOvQYGm840VdMI="; }) (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-QY1PmhGw3PhqZ79+H/Xbb9uOvmrBlFQRS7idnV5OXF0="; + hash = "sha256-2Dn/RR5BWHMsD/QzKYPo8tqyAQGmHCGwVl2+bzNfy5I="; }) ]; @@ -66,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.isDarwin [ cctools developer_cmds DarwinTools ]; + ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; buildInputs = [ boost diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/development/tools/parsing/re-flex/default.nix index 3ef4e6db47516..6e224c7178a90 100644 --- a/pkgs/development/tools/parsing/re-flex/default.nix +++ b/pkgs/development/tools/parsing/re-flex/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - sha256 = "sha256-U25W/hNPol6WtBDrKsft00vr/GoRjaNEr36fq2L9FlY="; + sha256 = "sha256-gk+VVfjVPopuzhrEuWNxQxKYjOFbqOGD9YS1npN71Bg="; }; nativeBuildInputs = [ boost autoconf automake ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/README.md b/pkgs/development/tools/poetry2nix/poetry2nix/README.md deleted file mode 100644 index ac4861534f58c..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/README.md +++ /dev/null @@ -1,6 +0,0 @@ -Dont change these files here, they are maintained at https://github.com/nix-community/poetry2nix - -The update procedure is as-follows: -1. Send your change to the upstream poetry2nix repository -2. Get it approved with tests passing -3. Run the update script in pkgs/development/tools/poetry2nix diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix deleted file mode 100755 index 559025f3ec456..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix +++ /dev/null @@ -1,157 +0,0 @@ -#!/usr/bin/env python -from concurrent.futures import ThreadPoolExecutor -import subprocess -import textwrap -import argparse -import toml -import json -import sys - -from typing import Dict, Any, Tuple, List - - -class Package: - def __init__(self, attrs: Dict[str, Any]) -> None: - self.attrs = attrs - self.name = attrs["name"] - self.source = self.attrs["source"] - - def fetch(self) -> Tuple["Package", subprocess.CompletedProcess]: - raise NotImplementedError() - - def expression(self, output: str) -> str: - raise NotImplementedError() - - -class UrlPackage(Package): - def fetch(self) -> Tuple[Package, subprocess.CompletedProcess]: - return ( - self, - subprocess.run( - [ - "nix-prefetch-url", - "--unpack", - self.source["url"], - ], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - text=True - ), - ) - - def expression(self, output: str) -> str: - sha256 = output.rstrip() - return textwrap.dedent(""" - %s = super.%s.overridePythonAttrs ( - _: { - src = pkgs.fetchzip { - url = "%s"; - sha256 = "%s"; - }; - } - );""" % (self.name, self.name, self.source["url"], sha256)) - - -class GitPackage(Package): - def fetch(self) -> Tuple[Package, subprocess.CompletedProcess]: - reference = self.source.get("resolved_reference", self.source["reference"]) - - return ( - self, - subprocess.run( - [ - "nix-prefetch-git", - "--fetch-submodules", - "--url", - self.source["url"], - "--rev", - reference, - ], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - text=True - ), - ) - - def expression(self, output: str) -> str: - meta = json.loads(output) - return textwrap.dedent(""" - %s = super.%s.overridePythonAttrs ( - _: { - src = pkgs.fetchgit { - url = "%s"; - rev = "%s"; - sha256 = "%s"; - }; - } - );""" % (self.name, self.name, meta["url"], meta["rev"], meta["sha256"])) - - -def parse_args() -> argparse.Namespace: - argparser = argparse.ArgumentParser(description="Poetry2nix CLI") - - subparsers = argparser.add_subparsers(dest="subcommand") - subparsers.required = True - - parser_lock = subparsers.add_parser("lock", help="Generate overrides for git hashes",) - parser_lock.add_argument( - "--lock", default="poetry.lock", help="Path to input poetry.lock", - ) - parser_lock.add_argument( - "--out", default="poetry-git-overlay.nix", help="Output file", - ) - return argparser.parse_args() - - -def indent(expr: str, spaces: int = 2) -> str: - i = " " * spaces - return "\n".join([(i if l != "" else "") + l for l in expr.split("\n")]) - - -def main() -> None: - args = parse_args() - - with open(args.lock) as lockf: - lock = toml.load(lockf) - - pkgs: List[Package] = [] - for pkg in lock["package"]: - if "source" in pkg: - source_type = pkg["source"]["type"] - if source_type == "git": - pkgs.append(GitPackage(pkg)) - elif source_type == "url": - pkgs.append(UrlPackage(pkg)) - - with ThreadPoolExecutor() as e: - futures = [] - - for pkg in pkgs: - futures.append(e.submit(pkg.fetch)) - - lines = [ - "{ pkgs }:", - "self: super: {", - ] - - for f in futures: - package, p = f.result() - if p.returncode != 0: - sys.stderr.write(p.stderr) - sys.stderr.flush() - exit(p.returncode) - expr = package.expression(p.stdout) - lines.append(indent(expr)) - - lines.extend(["", "}", ""]) - - expr = "\n".join(lines) - - with open(args.out, "w") as fout: - fout.write(expr) - - print(f"Wrote {args.out}") - - -if __name__ == "__main__": - main() diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix deleted file mode 100644 index b96316e59d83a..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ pkgs ? import <nixpkgs> { } -, lib ? pkgs.lib -, version -}: -let - inherit (pkgs) python3; -in -pkgs.stdenv.mkDerivation { - pname = "poetry2nix"; - inherit version; - - buildInputs = [ - (python3.withPackages (ps: [ ps.toml ])) - ]; - - nativeBuildInputs = [ - pkgs.makeWrapper - ]; - - src = ./bin; - - dontConfigure = true; - - buildPhase = '' - runHook preBuild - patchShebangs poetry2nix - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mv poetry2nix $out/bin - - wrapProgram $out/bin/poetry2nix --prefix PATH ":" ${lib.makeBinPath [ - pkgs.nix-prefetch-git - ]} - - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/nix-community/poetry2nix"; - description = "CLI to supplement sha256 hashes for git dependencies"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.adisbladis ]; - }; - -} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix deleted file mode 100644 index c59501b0a3e8c..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ /dev/null @@ -1,531 +0,0 @@ -{ pkgs ? import <nixpkgs> { } -, lib ? pkgs.lib -, poetryLib ? import ./lib.nix { inherit lib pkgs; stdenv = pkgs.stdenv; } -}: -let - # Poetry2nix version - version = "1.42.1"; - - inherit (poetryLib) isCompatible readTOML normalizePackageName normalizePackageSet; - - # Map SPDX identifiers to license names - spdxLicenses = lib.listToAttrs (lib.filter (pair: pair.name != null) (builtins.map (v: { name = if lib.hasAttr "spdxId" v then v.spdxId else null; value = v; }) (lib.attrValues lib.licenses))); - # Get license by id falling back to input string - getLicenseBySpdxId = spdxId: spdxLicenses.${spdxId} or spdxId; - - # Experimental withPlugins functionality - toPluginAble = (import ./plugins.nix { inherit pkgs lib; }).toPluginAble; - - # List of known build systems that are passed through from nixpkgs unmodified - knownBuildSystems = builtins.fromJSON (builtins.readFile ./known-build-systems.json); - nixpkgsBuildSystems = lib.subtractLists [ "poetry" "poetry-core" ] knownBuildSystems; - - mkInputAttrs = - { py - , pyProject - , attrs - , includeBuildSystem ? true - , groups ? [ ] - , checkGroups ? [ "dev" ] - , extras ? [ "*" ] # * means all extras, otherwise include the dependencies for a given extra - }: - let - getInputs = attr: attrs.${attr} or [ ]; - - # Get dependencies and filter out depending on interpreter version - getDeps = depSet: - let - compat = isCompatible (poetryLib.getPythonVersion py); - depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames depSet); - in - ( - builtins.map - ( - dep: - let - pkg = py.pkgs."${normalizePackageName dep}"; - constraints = depSet.${dep}.python or ""; - isCompat = compat constraints; - in - if isCompat then pkg else null - ) - depAttrs - ); - - buildSystemPkgs = poetryLib.getBuildSystemPkgs { - inherit pyProject; - pythonPackages = py.pkgs; - }; - - mkInput = attr: extraInputs: getInputs attr ++ extraInputs; - - rawDeps = pyProject.tool.poetry."dependencies" or { }; - - rawRequiredDeps = lib.filterAttrs (_: v: !(v.optional or false)) rawDeps; - - desiredExtrasDeps = lib.unique - (lib.concatMap (extra: pyProject.tool.poetry.extras.${extra}) extras); - - allRawDeps = - if extras == [ "*" ] then - rawDeps - else - rawRequiredDeps // lib.getAttrs desiredExtrasDeps rawDeps; - checkInputs' = getDeps (pyProject.tool.poetry."dev-dependencies" or { }) # <poetry-1.2.0 - # >=poetry-1.2.0 dependency groups - ++ lib.flatten (map (g: getDeps (pyProject.tool.poetry.group.${g}.dependencies or { })) checkGroups); - in - { - buildInputs = mkInput "buildInputs" (if includeBuildSystem then buildSystemPkgs else [ ]); - propagatedBuildInputs = mkInput "propagatedBuildInputs" ( - getDeps allRawDeps ++ ( - # >=poetry-1.2.0 dependency groups - if pyProject.tool.poetry.group or { } != { } - then lib.flatten (map (g: getDeps pyProject.tool.poetry.group.${g}.dependencies) groups) - else [ ] - ) - ); - nativeBuildInputs = mkInput "nativeBuildInputs" [ ]; - checkInputs = mkInput "checkInputs" checkInputs'; - nativeCheckInputs = mkInput "nativeCheckInputs" checkInputs'; - }; - - -in -lib.makeScope pkgs.newScope (self: { - - inherit version; - - /* Returns a package of editable sources whose changes will be available without needing to restart the - nix-shell. - In editablePackageSources you can pass a mapping from package name to source directory to have - those packages available in the resulting environment, whose source changes are immediately available. - - */ - mkPoetryEditablePackage = - { projectDir ? null - , pyproject ? projectDir + "/pyproject.toml" - , python ? pkgs.python3 - , pyProject ? readTOML pyproject - # Example: { my-app = ./src; } - , editablePackageSources - }: - assert editablePackageSources != { }; - import ./editable.nix { - inherit pyProject python pkgs lib poetryLib editablePackageSources; - }; - - /* Returns a package containing scripts defined in tool.poetry.scripts. - */ - mkPoetryScriptsPackage = - { projectDir ? null - , pyproject ? projectDir + "/pyproject.toml" - , python ? pkgs.python3 - , pyProject ? readTOML pyproject - , scripts ? pyProject.tool.poetry.scripts - }: - assert scripts != { }; - import ./shell-scripts.nix { - inherit lib python scripts; - }; - - /* - Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. - */ - mkPoetryPackages = - { projectDir ? null - , pyproject ? projectDir + "/pyproject.toml" - , poetrylock ? projectDir + "/poetry.lock" - , poetrylockPos ? { file = toString poetrylock; line = 0; column = 0; } - , overrides ? self.defaultPoetryOverrides - , python ? pkgs.python3 - , pwd ? projectDir - , preferWheels ? false - # Example: { my-app = ./src; } - , editablePackageSources ? { } - , pyProject ? readTOML pyproject - , groups ? [ ] - , checkGroups ? [ "dev" ] - , extras ? [ "*" ] - }: - let - /* The default list of poetry2nix override overlays */ - mkEvalPep508 = import ./pep508.nix { - inherit lib poetryLib; - inherit (python) stdenv; - }; - getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn; - - poetryPkg = pkgs.callPackage ./pkgs/poetry { inherit python; poetry2nix = self; }; - - scripts = pyProject.tool.poetry.scripts or { }; - hasScripts = scripts != { }; - scriptsPackage = self.mkPoetryScriptsPackage { - inherit python scripts; - }; - - editablePackageSources' = lib.filterAttrs (name: path: path != null) editablePackageSources; - hasEditable = editablePackageSources' != { }; - editablePackage = self.mkPoetryEditablePackage { - inherit pyProject python; - editablePackageSources = editablePackageSources'; - }; - - poetryLock = readTOML poetrylock; - - # Lock file version 1.1 files - lockFiles = - let - lockfiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; - in - lib.listToAttrs (lib.mapAttrsToList (n: v: { name = normalizePackageName n; value = v; }) lockfiles); - - evalPep508 = mkEvalPep508 python; - - # Filter packages by their PEP508 markers & pyproject interpreter version - partitions = - let - supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true && isCompatible (poetryLib.getPythonVersion python) pkgMeta.python-versions; - in - lib.partition supportsPythonVersion poetryLock.package; - compatible = partitions.right; - incompatible = partitions.wrong; - - # Create an overridden version of pythonPackages - # - # We need to avoid mixing multiple versions of pythonPackages in the same - # closure as python can only ever have one version of a dependency - baseOverlay = self: super: - let - lockPkgs = builtins.listToAttrs ( - builtins.map - ( - pkgMeta: - let normalizedName = normalizePackageName pkgMeta.name; in - { - name = normalizedName; - value = self.mkPoetryDep ( - pkgMeta // { - inherit pwd preferWheels; - pos = poetrylockPos; - source = pkgMeta.source or null; - # Default to files from lock file version 2.0 and fall back to 1.1 - files = pkgMeta.files or lockFiles.${normalizedName}; - pythonPackages = self; - - sourceSpec = ( - (normalizePackageSet pyProject.tool.poetry.dependencies or { }).${normalizedName} - or (normalizePackageSet pyProject.tool.poetry.dev-dependencies or { }).${normalizedName} - or (normalizePackageSet pyProject.tool.poetry.group.dev.dependencies or { }).${normalizedName} # Poetry 1.2.0+ - or { } - ); - } - ); - } - ) - (lib.reverseList compatible) - ); - buildSystems = builtins.listToAttrs (builtins.map (x: { name = x; value = super.${x}; }) nixpkgsBuildSystems); - in - lockPkgs // buildSystems // { - # Create a dummy null package for the current project in case any dependencies depend on the root project (issue #307) - ${pyProject.tool.poetry.name} = null; - }; - overlays = builtins.map - getFunctorFn - ( - [ - # Remove Python packages aliases with non-normalized names to avoid issues with infinite recursion (issue #750). - (self: super: { - # Upstream nixpkgs uses non canonical names - async-generator = super.async-generator or super.async_generator or null; - }) - - (self: super: lib.attrsets.mapAttrs - ( - name: value: - if lib.isDerivation value && self.hasPythonModule value && (normalizePackageName name) != name - then null - else value - ) - super) - - ( - self: super: - { - mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { - inherit lib python poetryLib evalPep508; - }; - - # # Use poetry-core from the poetry build (pep517/518 build-system) - poetry-core = poetryPkg.passthru.python.pkgs.poetry-core; - poetry = poetryPkg; - - __toPluginAble = toPluginAble self; - } // lib.optionalAttrs (! super ? setuptools-scm) { - # The canonical name is setuptools-scm - setuptools-scm = super.setuptools_scm; - } - ) - - # Fix infinite recursion in a lot of packages because of checkInputs - (self: super: lib.mapAttrs - (name: value: ( - if lib.isDerivation value && lib.hasAttr "overridePythonAttrs" value - then value.overridePythonAttrs (_: { doCheck = false; }) - else value - )) - super) - - # Null out any filtered packages, we don't want python.pkgs from nixpkgs - (self: super: builtins.listToAttrs (builtins.map (x: { name = normalizePackageName x.name; value = null; }) incompatible)) - # Create poetry2nix layer - baseOverlay - - ] ++ # User provided overrides - (if builtins.typeOf overrides == "list" then overrides else [ overrides ]) - ); - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) overlays; - py = python.override { inherit packageOverrides; self = py; }; - - inputAttrs = mkInputAttrs { inherit py pyProject groups checkGroups extras; attrs = { }; includeBuildSystem = false; }; - - requiredPythonModules = python.pkgs.requiredPythonModules; - /* Include all the nested dependencies which are required for each package. - This guarantees that using the "poetryPackages" attribute will return - complete list of dependencies for the poetry project to be portable. - */ - storePackages = requiredPythonModules (builtins.foldl' (acc: v: acc ++ v) [ ] (lib.attrValues inputAttrs)); - in - { - python = py; - poetryPackages = storePackages - ++ lib.optional hasScripts scriptsPackage - ++ lib.optional hasEditable editablePackage; - poetryLock = poetryLock; - inherit pyProject; - }; - - /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file. - In editablePackageSources you can pass a mapping from package name to source directory to have - those packages available in the resulting environment, whose source changes are immediately available. - - Example: - poetry2nix.mkPoetryEnv { poetrylock = ./poetry.lock; python = python3; } - */ - mkPoetryEnv = - { projectDir ? null - , pyproject ? projectDir + "/pyproject.toml" - , poetrylock ? projectDir + "/poetry.lock" - , overrides ? self.defaultPoetryOverrides - , pwd ? projectDir - , python ? pkgs.python3 - , preferWheels ? false - , editablePackageSources ? { } - , extraPackages ? ps: [ ] - , groups ? [ "dev" ] - , checkGroups ? [ "dev" ] - , extras ? [ "*" ] - }: - let - inherit (lib) hasAttr; - - pyProject = readTOML pyproject; - - # Automatically add dependencies with develop = true as editable packages, but only if path dependencies - getEditableDeps = set: lib.mapAttrs - (name: value: projectDir + "/${value.path}") - (lib.filterAttrs (name: dep: dep.develop or false && hasAttr "path" dep) set); - - excludedEditablePackageNames = builtins.filter - (pkg: editablePackageSources."${pkg}" == null) - (builtins.attrNames editablePackageSources); - - allEditablePackageSources = ( - (getEditableDeps (pyProject.tool.poetry."dependencies" or { })) - // (getEditableDeps (pyProject.tool.poetry."dev-dependencies" or { })) - // ( - # Poetry>=1.2.0 - if pyProject.tool.poetry.group or { } != { } then - builtins.foldl' (acc: g: acc // getEditableDeps pyProject.tool.poetry.group.${g}.dependencies) { } groups - else { } - ) - // editablePackageSources - ); - - editablePackageSources' = builtins.removeAttrs - allEditablePackageSources - excludedEditablePackageNames; - - poetryPython = self.mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd preferWheels pyProject groups checkGroups extras; - editablePackageSources = editablePackageSources'; - }; - - inherit (poetryPython) poetryPackages; - - # Don't add editable sources to the environment since they will sometimes fail to build and are not useful in the development env - editableAttrs = lib.attrNames editablePackageSources'; - envPkgs = builtins.filter (drv: ! lib.elem (drv.pname or drv.name or "") editableAttrs) poetryPackages; - - in - poetryPython.python.withPackages (ps: envPkgs ++ (extraPackages ps)); - - /* Creates a Python application from pyproject.toml and poetry.lock - - The result also contains a .dependencyEnv attribute which is a python - environment of all dependencies and this apps modules. This is useful if - you rely on dependencies to invoke your modules for deployment: e.g. this - allows `gunicorn my-module:app`. - */ - mkPoetryApplication = - { projectDir ? null - , src ? ( - # Assume that a project which is the result of a derivation is already adequately filtered - if lib.isDerivation projectDir then projectDir else self.cleanPythonSources { src = projectDir; } - ) - , pyproject ? projectDir + "/pyproject.toml" - , poetrylock ? projectDir + "/poetry.lock" - , overrides ? self.defaultPoetryOverrides - , meta ? { } - , python ? pkgs.python3 - , pwd ? projectDir - , preferWheels ? false - , groups ? [ ] - , checkGroups ? [ "dev" ] - , extras ? [ "*" ] - , ... - }@attrs: - let - poetryPython = self.mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd preferWheels groups checkGroups extras; - }; - py = poetryPython.python; - - hooks = py.pkgs.callPackage ./hooks { }; - - inherit (poetryPython) pyProject; - specialAttrs = [ - "overrides" - "poetrylock" - "projectDir" - "pwd" - "pyproject" - "preferWheels" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; - - inputAttrs = mkInputAttrs { inherit py pyProject attrs groups checkGroups extras; }; - - app = py.pkgs.buildPythonPackage ( - passedAttrs // inputAttrs // { - nativeBuildInputs = inputAttrs.nativeBuildInputs ++ [ - hooks.removePathDependenciesHook - hooks.removeGitDependenciesHook - ]; - } // { - pname = normalizePackageName pyProject.tool.poetry.name; - version = pyProject.tool.poetry.version; - - inherit src; - - format = "pyproject"; - # Like buildPythonApplication, but without the toPythonModule part - # Meaning this ends up looking like an application but it also - # provides python modules - namePrefix = ""; - - passthru = { - python = py; - dependencyEnv = ( - lib.makeOverridable ({ app, ... }@attrs: - let - args = builtins.removeAttrs attrs [ "app" ] // { - extraLibs = [ app ]; - }; - in - py.buildEnv.override args) - ) { inherit app; }; - }; - - # Extract position from explicitly passed attrs so meta.position won't point to poetry2nix internals - pos = builtins.unsafeGetAttrPos (lib.elemAt (lib.attrNames attrs) 0) attrs; - - meta = lib.optionalAttrs (lib.hasAttr "description" pyProject.tool.poetry) - { - inherit (pyProject.tool.poetry) description; - } // lib.optionalAttrs (lib.hasAttr "homepage" pyProject.tool.poetry) { - inherit (pyProject.tool.poetry) homepage; - } // { - inherit (py.meta) platforms; - license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); - } // meta; - - } - ); - in - app; - - /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */ - cli = import ./cli.nix { - inherit pkgs lib; - inherit (self) version; - }; - - # inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages; - - inherit (poetryLib) cleanPythonSources; - - - /* - Create a new default set of overrides with the same structure as the built-in ones - */ - mkDefaultPoetryOverrides = defaults: { - __functor = defaults; - - extend = overlay: - let - composed = lib.foldr lib.composeExtensions overlay [ defaults ]; - in - self.mkDefaultPoetryOverrides composed; - - overrideOverlay = fn: - let - overlay = self: super: - let - defaultSet = defaults self super; - customSet = fn self super; - in - defaultSet // customSet; - in - self.mkDefaultPoetryOverrides overlay; - }; - - /* - The default list of poetry2nix override overlays - - Can be overriden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function - */ - defaultPoetryOverrides = self.mkDefaultPoetryOverrides (import ./overrides { inherit pkgs lib; }); - - /* - Convenience functions for specifying overlays with or without the poerty2nix default overrides - */ - overrides = { - /* - Returns the specified overlay in a list - */ - withoutDefaults = overlay: [ - overlay - ]; - - /* - Returns the specified overlay and returns a list - combining it with poetry2nix default overrides - */ - withDefaults = overlay: [ - overlay - self.defaultPoetryOverrides - ]; - }; -}) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix b/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix deleted file mode 100644 index 13a07e4c85c74..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ pkgs -, lib -, poetryLib -, pyProject -, python -, editablePackageSources -}: -let - name = poetryLib.normalizePackageName pyProject.tool.poetry.name; - - # Just enough standard PKG-INFO fields for an editable installation - pkgInfoFields = { - Metadata-Version = "2.1"; - Name = name; - # While the pyproject.toml could contain arbitrary version strings, for - # simplicity we just use the same one for PKG-INFO, even though that - # should follow follow PEP 440: https://www.python.org/dev/peps/pep-0345/#version - # This is how poetry transforms it: https://github.com/python-poetry/poetry/blob/6cd3645d889f47c10425961661b8193b23f0ed79/poetry/version/version.py - Version = pyProject.tool.poetry.version; - Summary = pyProject.tool.poetry.description; - }; - - pkgInfoFile = builtins.toFile "${name}-PKG-INFO" - (lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: "${key}: ${value}") pkgInfoFields)); - - entryPointsFile = builtins.toFile "${name}-entry_points.txt" - (lib.generators.toINI { } pyProject.tool.poetry.plugins); - - # A python package that contains simple .egg-info and .pth files for an editable installation - editablePackage = python.pkgs.toPythonModule (pkgs.runCommand "${name}-editable" - { } '' - mkdir -p "$out/${python.sitePackages}" - cd "$out/${python.sitePackages}" - - # See https://docs.python.org/3.8/library/site.html for info on such .pth files - # These add another site package path for each line - touch poetry2nix-editable.pth - ${lib.concatMapStringsSep "\n" - (src: '' - echo "${toString src}" >> poetry2nix-editable.pth - '') - (lib.attrValues editablePackageSources)} - - # Create a very simple egg so pkg_resources can find this package - # See https://setuptools.readthedocs.io/en/latest/formats.html for more info on the egg format - mkdir "${name}.egg-info" - cd "${name}.egg-info" - ln -s ${pkgInfoFile} PKG-INFO - ${lib.optionalString (pyProject.tool.poetry ? plugins) '' - ln -s ${entryPointsFile} entry_points.txt - ''} - '' - ); -in -editablePackage diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json b/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json deleted file mode 100644 index 33052efe29684..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - "egg", - "tar", - "tar.bz2", - "tar.gz", - "tar.lz", - "tar.lzma", - "tar.xz", - "tbz", - "tgz", - "tlz", - "txz", - "whl", - "zip" -] diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh deleted file mode 100644 index e56dee6849b2e..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/fetch-from-pypi.sh +++ /dev/null @@ -1,24 +0,0 @@ -source $stdenv/setup -set -euo pipefail - -curl="curl \ - --location \ - --max-redirs 20 \ - --retry 2 \ - --disable-epsv \ - --cookie-jar cookies \ - --insecure \ - --speed-time 5 \ - --progress-bar \ - --fail \ - $curlOpts \ - $NIX_CURL_FLAGS" - -echo "Trying to fetch with predicted URL: $predictedURL" - -$curl $predictedURL --output $out && exit 0 - -echo "Predicted URL '$predictedURL' failed, querying pypi.org" -$curl "https://pypi.org/pypi/$pname/json" | jq -r ".releases.\"$version\"[] | select(.filename == \"$file\") | .url" > url -url=$(cat url) -$curl -k $url --output $out diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py b/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py deleted file mode 100644 index 44ea092acb06f..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/fetch_from_legacy.py +++ /dev/null @@ -1,134 +0,0 @@ -# Some repositories (such as Devpi) expose the Pypi legacy API -# (https://warehouse.pypa.io/api-reference/legacy.html). -# -# Note it is not possible to use pip -# https://discuss.python.org/t/pip-download-just-the-source-packages-no-building-no-metadata-etc/4651/12 - -import os -import sys -import netrc -from urllib.parse import urlparse, urlunparse -from html.parser import HTMLParser -import urllib.request -import shutil -import ssl -from os.path import normpath - - -# Parse the legacy index page to extract the href and package names -class Pep503(HTMLParser): - def __init__(self): - super().__init__() - self.sources = {} - self.url = None - self.name = None - - def handle_data(self, data): - if self.url is not None: - self.name = data - - def handle_starttag(self, tag, attrs): - if tag == "a": - for name, value in attrs: - if name == "href": - self.url = value - - def handle_endtag(self, tag): - if self.url is not None: - self.sources[self.name] = self.url - self.url = None - - -url = sys.argv[1] -package_name = sys.argv[2] -index_url = url + "/" + package_name + "/" -package_filename = sys.argv[3] - -# Parse username and password for this host from the netrc file if given. -username, password = None, None -if os.environ["NETRC"]: - netrc_obj = netrc.netrc(os.environ["NETRC"]) - host = urlparse(index_url).netloc - # Strip port number if present - if ":" in host: - host = host.split(":")[0] - username, _, password = netrc_obj.authenticators(host) - -print("Reading index %s" % index_url) - -context = ssl.create_default_context() -context.check_hostname = False -context.verify_mode = ssl.CERT_NONE - -# Extract out username/password from index_url, if present. -parsed_url = urlparse(index_url) -username = parsed_url.username or username -password = parsed_url.password or password -index_url = parsed_url._replace(netloc=parsed_url.netloc.rpartition("@")[-1]).geturl() - -req = urllib.request.Request(index_url) -if username and password: - import base64 - - password_b64 = base64.b64encode(":".join((username, password)).encode()).decode( - "utf-8" - ) - req.add_header("Authorization", "Basic {}".format(password_b64)) -response = urllib.request.urlopen(req, context=context) -index = response.read() - -parser = Pep503() -parser.feed(str(index, "utf-8")) -if package_filename not in parser.sources: - print( - "The file %s has not be found in the index %s" % (package_filename, index_url) - ) - exit(1) - -package_file = open(package_filename, "wb") -# Sometimes the href is a relative or absolute path within the index's domain. -indicated_url = urlparse(parser.sources[package_filename]) -if indicated_url.netloc == "": - parsed_url = urlparse(index_url) - - if indicated_url.path.startswith("/"): - # An absolute path within the index's domain. - path = parser.sources[package_filename] - else: - # A relative path. - path = parsed_url.path + "/" + parser.sources[package_filename] - - package_url = urlunparse( - ( - parsed_url.scheme, - parsed_url.netloc, - path, - None, - None, - None, - ) - ) -else: - package_url = parser.sources[package_filename] - -# Handle urls containing "../" -parsed_url = urlparse(package_url) -real_package_url = urlunparse( - ( - parsed_url.scheme, - parsed_url.netloc, - normpath(parsed_url.path), - parsed_url.params, - parsed_url.query, - parsed_url.fragment, - ) -) -print("Downloading %s" % real_package_url) - -req = urllib.request.Request(real_package_url) -if username and password: - req.add_unredirected_header("Authorization", "Basic {}".format(password_b64)) -response = urllib.request.urlopen(req, context=context) - -with response as r: - shutil.copyfileobj(r, package_file) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix deleted file mode 100644 index 40dd371b59f00..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ python -, stdenv -, buildPackages -, makeSetupHook -, wheel -, pip -, pkgs -, lib -}: -let - inherit (python.pythonForBuild.pkgs) callPackage; - pythonInterpreter = python.pythonForBuild.interpreter; - pythonSitePackages = python.sitePackages; - - nonOverlayedPython = pkgs.python3.pythonForBuild.withPackages (ps: [ ps.tomlkit ]); - makeRemoveSpecialDependenciesHook = { fields, kind }: - nonOverlayedPython.pkgs.callPackage - ( - _: - makeSetupHook - { - name = "remove-path-dependencies.sh"; - substitutions = { - # NOTE: We have to use a non-overlayed Python here because otherwise we run into an infinite recursion - # because building of tomlkit and its dependencies also use these hooks. - pythonPath = nonOverlayedPython.pkgs.makePythonPath [ nonOverlayedPython ]; - pythonInterpreter = nonOverlayedPython.interpreter; - pyprojectPatchScript = "${./pyproject-without-special-deps.py}"; - inherit fields; - inherit kind; - }; - } ./remove-special-dependencies.sh - ) - { }; - makeSetupHookArgs = deps: - if lib.elem "propagatedBuildInputs" (builtins.attrNames (builtins.functionArgs makeSetupHook)) then - { propagatedBuildInputs = deps; } - else - { inherit deps; }; -in -{ - removePathDependenciesHook = makeRemoveSpecialDependenciesHook { - fields = [ "path" ]; - kind = "path"; - }; - - removeGitDependenciesHook = makeRemoveSpecialDependenciesHook { - fields = [ "git" "branch" "rev" "tag" ]; - kind = "git"; - }; - - - pipBuildHook = callPackage - ( - { pip, wheel }: - makeSetupHook - ({ - name = "pip-build-hook.sh"; - substitutions = { - inherit pythonInterpreter pythonSitePackages; - }; - } // (makeSetupHookArgs [ pip wheel ])) ./pip-build-hook.sh - ) - { }; - - poetry2nixFixupHook = callPackage - ( - _: - makeSetupHook - { - name = "fixup-hook.sh"; - substitutions = { - inherit pythonSitePackages; - filenames = builtins.concatStringsSep " " [ - "pyproject.toml" - "README.md" - "LICENSE" - ]; - }; - } ./fixup-hook.sh - ) - { }; - - # As of 2023-03 a newer version of packaging introduced a new behaviour where python-requires - # cannot contain version wildcards. This behaviour is complaint with PEP440 - # - # The wildcards are a no-op anyway so we can work around this issue by just dropping the precision down to the last known number. - poetry2nixPythonRequiresPatchHook = callPackage - ( - _: - let - # Python pre 3.9 does not contain the ast.unparse method. - # We can extract this from Python 3.8 for any - unparser = stdenv.mkDerivation { - name = "${python.name}-astunparse"; - inherit (python) src; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out/poetry2nix_astunparse - cp ./Tools/parser/unparse.py $out/poetry2nix_astunparse/__init__.py - ''; - }; - - pythonPath = - [ ] - ++ lib.optional (lib.versionOlder python.version "3.9") unparser; - - in - makeSetupHook - { - name = "require-python-patch-hook.sh"; - substitutions = { - inherit pythonInterpreter pythonPath; - patchScript = ./python-requires-patch-hook.py; - }; - } ./python-requires-patch-hook.sh - ) - { }; - - # When the "wheel" package itself is a wheel the nixpkgs hook (which pulls in "wheel") leads to infinite recursion - # It doesn't _really_ depend on wheel though, it just copies the wheel. - wheelUnpackHook = callPackage - (_: - makeSetupHook - { - name = "wheel-unpack-hook.sh"; - } ./wheel-unpack-hook.sh - ) - { }; -} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh deleted file mode 100644 index 8cbe2b178c7ac..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh +++ /dev/null @@ -1,20 +0,0 @@ -poetry2nix-fixup-hook() { - - # Including tests in the output is a common mistake - if [ -z "${dontFixupTests-}" ]; then - rm -rf $out/@pythonSitePackages@/tests - fi - - # Including files in site-packages is a common packaging mistake - # - # While we cannot remove all normal files dumped in site-packages - # we can clean up some common mistakes - if [ -z "${dontFixupSitePackages-}" ]; then - for f in @filenames@; do - rm -f $out/@pythonSitePackages@/$f - done - fi - -} - -postFixupHooks+=(poetry2nix-fixup-hook) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh deleted file mode 100644 index 31e06909b3b69..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh +++ /dev/null @@ -1,42 +0,0 @@ -# Setup hook to use for pip projects -echo "Sourcing pip-build-hook" - -pipBuildPhase() { - echo "Executing pipBuildPhase" - runHook preBuild - - mkdir -p dist - echo "Creating a wheel..." - @pythonInterpreter@ -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . - echo "Finished creating a wheel..." - - runHook postBuild - echo "Finished executing pipBuildPhase" -} - -pipShellHook() { - echo "Executing pipShellHook" - runHook preShellHook - - # Long-term setup.py should be dropped. - if [ -e pyproject.toml ]; then - tmp_path=$(mktemp -d) - export PATH="$tmp_path/bin:$PATH" - export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH" - mkdir -p "$tmp_path/@pythonSitePackages@" - @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" >&2 - fi - - runHook postShellHook - echo "Finished executing pipShellHook" -} - -if [ -z "${dontUsePipBuild-}" ] && [ -z "${buildPhase-}" ]; then - echo "Using pipBuildPhase" - buildPhase=pipBuildPhase -fi - -if [ -z "${shellHook-}" ]; then - echo "Using pipShellHook" - shellHook=pipShellHook -fi diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py deleted file mode 100644 index 76f52604e431e..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env python -# Patch out special dependencies (git and path) from a pyproject.toml file - -import argparse -import sys - -import tomlkit - - -def main(input, output, fields_to_remove): - data = tomlkit.loads(input.read()) - - try: - deps = data["tool"]["poetry"]["dependencies"] - except KeyError: - pass - else: - for dep in deps.values(): - if isinstance(dep, dict): - any_removed = False - for field in fields_to_remove: - any_removed |= dep.pop(field, None) is not None - if any_removed: - dep["version"] = "*" - dep.pop("develop", None) - - output.write(tomlkit.dumps(data)) - - -if __name__ == "__main__": - p = argparse.ArgumentParser() - p.add_argument( - "-i", - "--input", - type=argparse.FileType("r"), - default=sys.stdin, - help="Location from which to read input TOML", - ) - p.add_argument( - "-o", - "--output", - type=argparse.FileType("w"), - default=sys.stdout, - help="Location to write output TOML", - ) - p.add_argument( - "-f", - "--fields-to-remove", - nargs="+", - help="The fields to remove from the dependency's TOML", - ) - - args = p.parse_args() - main(args.input, args.output, args.fields_to_remove) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.py deleted file mode 100644 index cbf4b63741d08..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.py +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/env python -import ast -import sys -import io - - -# Python2 compat -if sys.version_info[0] < 3: - FileNotFoundError = IOError - - -# Python <= 3.8 compat -def astunparse(tree): - # Use bundled unparse by default - if hasattr(ast, "unparse"): - return ast.unparse(tree) - - # Use example tool from Python sources for older interpreter versions - from poetry2nix_astunparse import Unparser - - buf = io.StringIO() - up = Unparser(tree, buf) - - return buf.getvalue() - - -class Rewriter(ast.NodeVisitor): - def __init__(self, *args, **kwargs): - super(Rewriter, self).__init__(*args, **kwargs) - self.modified = False - - def visit_Call(self, node): - function_name = "" - - if isinstance(node.func, ast.Name): - function_name = node.func.id - elif isinstance(node.func, ast.Attribute): - function_name = node.func.attr - else: - return - - if function_name != "setup": - return - - for kw in node.keywords: - if kw.arg != "python_requires": - continue - - value = kw.value - if not isinstance(value, ast.Constant): - return - - # Rewrite version constraints without wildcard characters. - # - # Only rewrite the file if the modified value actually differs, as we lose whitespace and comments when rewriting - # with the AST module. - python_requires = ", ".join( - [v.strip().rstrip(".*") for v in value.value.split(",")] - ) - if value.value != python_requires: - value.value = python_requires - self.modified = True - - -if __name__ == "__main__": - sys.path.extend(sys.argv[1:]) - - try: - with open("setup.py", encoding="utf-8-sig") as f: - tree = ast.parse(f.read()) - except FileNotFoundError: - exit(0) - - r = Rewriter() - r.visit(tree) - - if r.modified: - with open("setup.py", "w") as f: - f.write(astunparse(tree)) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.sh deleted file mode 100644 index 57a718fe453f0..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/python-requires-patch-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -poetry2nix-python-requires-patch-hook() { - if [ -z "${dontFixupPythonRequires-}" ]; then - @pythonInterpreter@ @patchScript@ @pythonPath@ - fi -} - -postPatchHooks+=(poetry2nix-python-requires-patch-hook) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh deleted file mode 100644 index 904efa615b1dc..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh +++ /dev/null @@ -1,23 +0,0 @@ -remove-@kind@-dependencies-hook() { - # Tell poetry not to resolve special dependencies. Any version is fine! - - if ! test -f pyproject.toml; then - return - fi - - echo "Removing @kind@ dependencies" - - # NOTE: We have to reset PYTHONPATH to avoid having propagatedBuildInputs - # from the currently building derivation leaking into our unrelated Python - # environment. - PYTHONPATH=@pythonPath@ \ - @pythonInterpreter@ \ - @pyprojectPatchScript@ \ - --fields-to-remove @fields@ < pyproject.toml > pyproject.formatted.toml - - mv pyproject.formatted.toml pyproject.toml - - echo "Finished removing @kind@ dependencies" -} - -postPatchHooks+=(remove-@kind@-dependencies-hook) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh deleted file mode 100644 index fca808a933bad..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Setup hook to use in case a wheel is fetched -echo "Sourcing wheel setup hook" - -wheelUnpackPhase(){ - echo "Executing wheelUnpackPhase" - runHook preUnpack - - mkdir -p dist - cp "$src" "dist/$(stripHash "$src")" - -# runHook postUnpack # Calls find...? - echo "Finished executing wheelUnpackPhase" -} - -if [ -z "${dontUseWheelUnpack-}" ] && [ -z "${unpackPhase-}" ]; then - echo "Using wheelUnpackPhase" - unpackPhase=wheelUnpackPhase -fi diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json deleted file mode 100644 index 201aae3c92096..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/known-build-systems.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - "poetry", - "poetry-core", - "flit", - "flit-core", - "pbr", - "cython", - "hatchling", - "hatch-vcs", - "setuptools", - "setuptools-scm" -] diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix deleted file mode 100644 index 4c52c07b69fda..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ /dev/null @@ -1,250 +0,0 @@ -{ lib, pkgs, stdenv }: -let - inherit (import ./semver.nix { inherit lib ireplace; }) satisfiesSemver; - inherit (builtins) genList length; - - # Replace a list entry at defined index with set value - ireplace = idx: value: list: ( - genList (i: if i == idx then value else (builtins.elemAt list i)) (length list) - ); - - # Normalize package names as per PEP 503 - normalizePackageName = name: - let - parts = builtins.split "[-_.]+" name; - partsWithoutSeparator = builtins.filter (x: builtins.typeOf x == "string") parts; - in - lib.strings.toLower (lib.strings.concatStringsSep "-" partsWithoutSeparator); - - # Normalize an entire attrset of packages - normalizePackageSet = lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair (normalizePackageName name) value); - - # Get a full semver pythonVersion from a python derivation - getPythonVersion = python: - let - pyVer = lib.splitVersion python.pythonVersion ++ [ "0" ]; - ver = lib.splitVersion python.version; - major = l: lib.elemAt l 0; - minor = l: lib.elemAt l 1; - joinVersion = v: lib.concatStringsSep "." v; - in - joinVersion (if major pyVer == major ver && minor pyVer == minor ver then ver else pyVer); - - # Compare a semver expression with a version - isCompatible = version: - let - operators = { - "||" = cond1: cond2: cond1 || cond2; - "," = cond1: cond2: cond1 && cond2; # , means && - "&&" = cond1: cond2: cond1 && cond2; - }; - splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")"; - in - expr: - let - tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); - combine = acc: v: - let - isOperator = builtins.typeOf v == "list"; - operator = if isOperator then (builtins.elemAt v 0) else acc.operator; - in - if isOperator then (acc // { inherit operator; }) else { - inherit operator; - state = operators."${operator}" acc.state (satisfiesSemver version v); - }; - initial = { operator = "&&"; state = true; }; - in - if expr == "" then true else (builtins.foldl' combine initial tokens).state; - fromTOML = builtins.fromTOML or - ( - toml: builtins.fromJSON ( - builtins.readFile ( - pkgs.runCommand "from-toml" - { - inherit toml; - allowSubstitutes = false; - preferLocalBuild = true; - } - '' - ${pkgs.remarshal}/bin/remarshal \ - -if toml \ - -i <(echo "$toml") \ - -of json \ - -o $out - '' - ) - ) - ); - readTOML = path: fromTOML (builtins.readFile path); - - # - # Returns the appropriate manylinux dependencies and string representation for the file specified - # - getManyLinuxDeps = f: - let - ml = pkgs.pythonManylinuxPackages; - in - if lib.strings.hasInfix "manylinux1" f then { pkg = [ ml.manylinux1 ]; str = "1"; } - else if lib.strings.hasInfix "manylinux2010" f then { pkg = [ ml.manylinux2010 ]; str = "2010"; } - else if lib.strings.hasInfix "manylinux2014" f then { pkg = [ ml.manylinux2014 ]; str = "2014"; } - else if lib.strings.hasInfix "manylinux_" f then { pkg = [ ml.manylinux2014 ]; str = "pep600"; } - else { pkg = [ ]; str = null; }; - - # Predict URL from the PyPI index. - # Args: - # pname: package name - # file: filename including extension - # hash: SRI hash - # kind: Language implementation and version tag - predictURLFromPypi = lib.makeOverridable ( - { pname, file, hash, kind }: - "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}" - ); - - - # Fetch from the PyPI index. - # At first we try to fetch the predicated URL but if that fails we - # will use the Pypi API to determine the correct URL. - # Args: - # pname: package name - # file: filename including extension - # version: the version string of the dependency - # hash: SRI hash - # kind: Language implementation and version tag - fetchFromPypi = lib.makeOverridable ( - { pname, file, version, hash, kind, curlOpts ? "" }: - let - predictedURL = predictURLFromPypi { inherit pname file hash kind; }; - in - (pkgs.stdenvNoCC.mkDerivation { - name = file; - nativeBuildInputs = [ - pkgs.buildPackages.curl - pkgs.buildPackages.jq - ]; - isWheel = lib.strings.hasSuffix "whl" file; - system = "builtin"; - - preferLocalBuild = true; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - "NIX_CURL_FLAGS" - ]; - - inherit pname file version curlOpts predictedURL; - - builder = ./fetch-from-pypi.sh; - - outputHashMode = "flat"; - outputHashAlgo = "sha256"; - outputHash = hash; - - passthru = { - urls = [ predictedURL ]; # retain compatibility with nixpkgs' fetchurl - }; - }) - ); - - fetchFromLegacy = lib.makeOverridable ( - { python, pname, url, file, hash }: - let - pathParts = - (builtins.filter - ({ prefix, path }: "NETRC" == prefix) - builtins.nixPath); - netrc_file = if (pathParts != [ ]) then (builtins.head pathParts).path else ""; - in - pkgs.runCommand file - { - nativeBuildInputs = [ python ]; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - outputHashMode = "flat"; - outputHashAlgo = "sha256"; - outputHash = hash; - NETRC = netrc_file; - passthru.isWheel = lib.strings.hasSuffix "whl" file; - } '' - python ${./fetch_from_legacy.py} ${url} ${pname} ${file} - mv ${file} $out - '' - ); - - getBuildSystemPkgs = - { pythonPackages - , pyProject - }: - let - missingBuildBackendError = "No build-system.build-backend section in pyproject.toml. " - + "Add such a section as described in https://python-poetry.org/docs/pyproject/#poetry-and-pep-517"; - requires = lib.attrByPath [ "build-system" "requires" ] (throw missingBuildBackendError) pyProject; - requiredPkgs = builtins.map (n: lib.elemAt (builtins.match "([^!=<>~[]+).*" n) 0) requires; - in - builtins.map (drvAttr: pythonPackages.${drvAttr} or (throw "unsupported build system requirement ${drvAttr}")) requiredPkgs; - - # Find gitignore files recursively in parent directory stopping with .git - findGitIgnores = path: - let - parent = path + "/.."; - gitIgnore = path + "/.gitignore"; - isGitRoot = builtins.pathExists (path + "/.git"); - hasGitIgnore = builtins.pathExists gitIgnore; - gitIgnores = if hasGitIgnore then [ gitIgnore ] else [ ]; - in - lib.optionals (builtins.pathExists path && builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; - - /* - Provides a source filtering mechanism that: - - - Filters gitignore's - - Filters pycache/pyc files - - Uses cleanSourceFilter to filter out .git/.hg, .o/.so, editor backup files & nix result symlinks - */ - cleanPythonSources = { src }: - let - gitIgnores = findGitIgnores src; - pycacheFilter = name: type: - (type == "directory" && ! lib.strings.hasInfix "__pycache__" name) - || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name) - ; - in - lib.cleanSourceWith { - filter = lib.cleanSourceFilter; - src = lib.cleanSourceWith { - filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; - inherit src; - }; - }; - - # Maps Nixpkgs CPU values to target machines known to be supported for manylinux* wheels. - # (a.k.a. `uname -m` output from CentOS 7) - # - # This is current as of manylinux2014 (PEP-0599), and is a superset of manylinux2010 / manylinux1. - # s390x is not supported in Nixpkgs, so we don't map it. - manyLinuxTargetMachines = { - x86_64 = "x86_64"; - i686 = "i686"; - aarch64 = "aarch64"; - armv7l = "armv7l"; - powerpc64 = "ppc64"; - powerpc64le = "ppc64le"; - }; - - # Machine tag for our target platform (if available) - getTargetMachine = stdenv: manyLinuxTargetMachines.${stdenv.targetPlatform.parsed.cpu.name} or null; - -in -{ - inherit - fetchFromPypi - fetchFromLegacy - getManyLinuxDeps - isCompatible - readTOML - getBuildSystemPkgs - satisfiesSemver - cleanPythonSources - normalizePackageName - normalizePackageSet - getPythonVersion - getTargetMachine - ; -} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix deleted file mode 100644 index 5e39e1e6f50e7..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ /dev/null @@ -1,220 +0,0 @@ -{ autoPatchelfHook -, lib -, python -, buildPythonPackage -, poetryLib -, evalPep508 -}: -{ name -, version -, pos ? __curPos -, files -, source -, dependencies ? { } -, pythonPackages -, python-versions -, pwd -, sourceSpec -, supportedExtensions ? lib.importJSON ./extensions.json -, preferWheels ? false -, ... -}: - -pythonPackages.callPackage - ( - { preferWheel ? preferWheels - , ... - }@args: - let - inherit (python) stdenv; - inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromLegacy fetchFromPypi normalizePackageName; - - inherit (import ./pep425.nix { - inherit lib poetryLib python stdenv; - }) selectWheel - ; - fileCandidates = - let - supportedRegex = ("^.*(" + builtins.concatStringsSep "|" supportedExtensions + ")"); - matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." "+" ] [ "\\." "\\+" ] version + ".*$") fname != null; - hasSupportedExtension = fname: builtins.match supportedRegex fname != null; - isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname; - in - builtins.filter (f: matchesVersion f.file && hasSupportedExtension f.file && isCompatibleEgg f.file) files; - toPath = s: pwd + "/${s}"; - isLocked = lib.length fileCandidates > 0; - isSource = source != null; - isGit = isSource && source.type == "git"; - isUrl = isSource && source.type == "url"; - isWheelUrl = isSource && source.type == "url" && lib.strings.hasSuffix ".whl" source.url; - isDirectory = isSource && source.type == "directory"; - isFile = isSource && source.type == "file"; - isLegacy = isSource && source.type == "legacy"; - localDepPath = toPath source.url; - - buildSystemPkgs = - let - pyProjectPath = localDepPath + "/pyproject.toml"; - pyProject = poetryLib.readTOML pyProjectPath; - in - if builtins.pathExists pyProjectPath then - poetryLib.getBuildSystemPkgs - { - inherit pythonPackages pyProject; - } else [ ]; - - pname = normalizePackageName name; - preferWheel' = preferWheel && pname != "wheel"; - fileInfo = - let - isBdist = f: lib.strings.hasSuffix "whl" f.file; - isSdist = f: ! isBdist f && ! isEgg f; - isEgg = f: lib.strings.hasSuffix ".egg" f.file; - binaryDist = selectWheel fileCandidates; - sourceDist = builtins.filter isSdist fileCandidates; - eggs = builtins.filter isEgg fileCandidates; - # the `wheel` package cannot be built from a wheel, since that requires the wheel package - # this causes a circular dependency so we special-case ignore its `preferWheel` attribute value - entries = (if preferWheel' then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; - lockFileEntry = ( - if lib.length entries > 0 then builtins.head entries - else throw "Missing suitable source/wheel file entry for ${name}" - ); - _isEgg = isEgg lockFileEntry; - in - rec { - inherit (lockFileEntry) file hash; - name = file; - format = - if _isEgg then "egg" - else if lib.strings.hasSuffix ".whl" name then "wheel" - else "pyproject"; - kind = - if _isEgg then python.pythonVersion - else if format == "pyproject" then "source" - else (builtins.elemAt (lib.strings.splitString "-" name) 2); - }; - - format = if isWheelUrl then "wheel" else if isDirectory || isGit || isUrl then "pyproject" else fileInfo.format; - - hooks = python.pkgs.callPackage ./hooks { }; - in - buildPythonPackage { - inherit pname version; - - # Circumvent output separation (https://github.com/NixOS/nixpkgs/pull/190487) - format = if format == "pyproject" then "poetry2nix" else format; - - doCheck = false; # We never get development deps - - # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned` - dontStrip = format == "wheel"; - - nativeBuildInputs = [ - hooks.poetry2nixFixupHook - ] - ++ lib.optional (!pythonPackages.isPy27) hooks.poetry2nixPythonRequiresPatchHook - ++ lib.optional (isLocked && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook - ++ lib.optionals (format == "wheel") [ - hooks.wheelUnpackHook - pythonPackages.pipInstallHook - pythonPackages.setuptools - ] - ++ lib.optionals (format == "pyproject") [ - hooks.removePathDependenciesHook - hooks.removeGitDependenciesHook - hooks.pipBuildHook - ]; - - buildInputs = ( - lib.optional (isLocked) (getManyLinuxDeps fileInfo.name).pkg - ++ lib.optional isDirectory buildSystemPkgs - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) pythonPackages.setuptools - ); - - propagatedBuildInputs = - let - compat = isCompatible (poetryLib.getPythonVersion python); - deps = lib.filterAttrs - (n: v: v) - ( - lib.mapAttrs - ( - n: v: - let - constraints = v.python or ""; - pep508Markers = v.markers or ""; - in - compat constraints && evalPep508 pep508Markers - ) - dependencies - ); - depAttrs = lib.attrNames deps; - in - builtins.map (n: pythonPackages.${normalizePackageName n}) depAttrs; - - inherit pos; - - meta = { - broken = ! isCompatible (poetryLib.getPythonVersion python) python-versions; - license = [ ]; - inherit (python.meta) platforms; - }; - - passthru = { - inherit args; - preferWheel = preferWheel'; - }; - - # We need to retrieve kind from the interpreter and the filename of the package - # Interpreters should declare what wheel types they're compatible with (python type + ABI) - # Here we can then choose a file based on that info. - src = - if isGit then - ( - builtins.fetchGit ({ - inherit (source) url; - rev = source.resolved_reference or source.reference; - ref = sourceSpec.branch or (if sourceSpec ? tag then "refs/tags/${sourceSpec.tag}" else "HEAD"); - } // ( - lib.optionalAttrs ((sourceSpec ? rev) && (lib.versionAtLeast builtins.nixVersion "2.4")) { - allRefs = true; - }) // ( - lib.optionalAttrs (lib.versionAtLeast builtins.nixVersion "2.4") { - submodules = true; - }) - ) - ) - else if isWheelUrl then - builtins.fetchurl - { - inherit (source) url; - sha256 = fileInfo.hash; - } - else if isUrl then - builtins.fetchTarball - { - inherit (source) url; - sha256 = fileInfo.hash; - } - else if isDirectory then - (poetryLib.cleanPythonSources { src = localDepPath; }) - else if isFile then - localDepPath - else if isLegacy then - fetchFromLegacy - { - pname = name; - inherit python; - inherit (fileInfo) file hash; - inherit (source) url; - } - else - fetchFromPypi { - pname = name; - inherit (fileInfo) file hash kind; - inherit version; - }; - } - ) -{ } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json deleted file mode 100644 index 2e859c6ddbf54..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json +++ /dev/null @@ -1,19992 +0,0 @@ -{ - "aadict": [ - "setuptools" - ], - "aafigure": [ - "setuptools" - ], - "aardwolf": [ - "setuptools" - ], - "abodepy": [ - "setuptools" - ], - "absl-py": [ - "setuptools" - ], - "absolufy-imports": [ - "setuptools" - ], - "accuweather": [ - "setuptools" - ], - "acme": [ - "setuptools" - ], - "acme-tiny": [ - "setuptools", - "setuptools-scm" - ], - "acoustics": [ - "flit-core", - "setuptools" - ], - "acquire": [ - "setuptools", - "setuptools-scm" - ], - "actdiag": [ - "setuptools" - ], - "adafruit-io": [ - "setuptools", - "setuptools-scm" - ], - "adafruit-nrfutil": [ - "setuptools" - ], - "adafruit-platformdetect": [ - "setuptools", - "setuptools-scm" - ], - "adafruit-pureio": [ - "setuptools", - "setuptools-scm" - ], - "adal": [ - "setuptools" - ], - "adax": [ - "setuptools" - ], - "adax-local": [ - "setuptools" - ], - "adb-enhanced": [ - "setuptools" - ], - "adb-homeassistant": [ - "setuptools" - ], - "adb-shell": [ - "setuptools" - ], - "adblock": [ - "setuptools" - ], - "add-trailing-comma": [ - "setuptools" - ], - "addict": [ - "setuptools" - ], - "adext": [ - "setuptools", - "setuptools-scm" - ], - "adguardhome": [ - "poetry-core", - "setuptools" - ], - "adjusttext": [ - "setuptools" - ], - "adlfs": [ - "setuptools" - ], - "advantage-air": [ - "setuptools" - ], - "advocate": [ - "setuptools" - ], - "aemet-opendata": [ - "setuptools" - ], - "aenum": [ - "setuptools" - ], - "aeppl": [ - "setuptools" - ], - "aesara": [ - "cython", - "setuptools" - ], - "aesedb": [ - "setuptools" - ], - "afdko": [ - "setuptools", - "setuptools-scm" - ], - "affine": [ - { - "buildSystem": "setuptools", - "until": "2.4.0" - }, - { - "buildSystem": "flit-core", - "from": "2.4.0" - } - ], - "afsapi": [ - "setuptools", - "setuptools-scm" - ], - "agate": [ - "setuptools" - ], - "agate-dbf": [ - "setuptools" - ], - "agate-excel": [ - "setuptools" - ], - "agate-sql": [ - "setuptools" - ], - "agent-py": [ - "setuptools" - ], - "aggdraw": [ - "setuptools" - ], - "ailment": [ - "setuptools" - ], - "aio-geojson-client": [ - "setuptools" - ], - "aio-geojson-generic-client": [ - "setuptools" - ], - "aio-geojson-geonetnz-quakes": [ - "setuptools" - ], - "aio-geojson-geonetnz-volcano": [ - "setuptools" - ], - "aio-geojson-nsw-rfs-incidents": [ - "setuptools" - ], - "aio-geojson-usgs-earthquakes": [ - "setuptools" - ], - "aio-georss-client": [ - "setuptools" - ], - "aio-georss-gdacs": [ - "setuptools" - ], - "aio-pika": [ - "setuptools" - ], - "aioairq": [ - "setuptools" - ], - "aioairzone": [ - "setuptools" - ], - "aioaladdinconnect": [ - "setuptools" - ], - "aioambient": [ - "poetry-core", - "setuptools" - ], - "aioamqp": [ - "setuptools" - ], - "aioapns": [ - "setuptools" - ], - "aioaseko": [ - "setuptools" - ], - "aioasuswrt": [ - "setuptools" - ], - "aioazuredevops": [ - "setuptools" - ], - "aiobiketrax": [ - "poetry-core", - "setuptools" - ], - "aioblescan": [ - "setuptools" - ], - "aioboto3": [ - "poetry" - ], - "aiobotocore": [ - "setuptools" - ], - "aiobroadlink": [ - "setuptools" - ], - "aiocache": [ - "setuptools" - ], - "aiocoap": [ - "setuptools" - ], - "aioconsole": [ - "setuptools" - ], - "aiocontextvars": [ - "setuptools" - ], - "aiocron": [ - "setuptools" - ], - "aiocsv": [ - "cython" - ], - "aiocurrencylayer": [ - "poetry-core", - "setuptools" - ], - "aiodiscover": [ - "setuptools" - ], - "aiodns": [ - "setuptools" - ], - "aioeafm": [ - "poetry-core", - "setuptools" - ], - "aioeagle": [ - "setuptools" - ], - "aioecowitt": [ - "setuptools" - ], - "aioemonitor": [ - "setuptools" - ], - "aioesphomeapi": [ - "setuptools" - ], - "aioextensions": [ - "setuptools" - ], - "aiofile": [ - "poetry-core", - "setuptools" - ], - "aiofiles": [ - "poetry-core", - "setuptools" - ], - "aioflo": [ - "poetry-core", - "setuptools" - ], - "aioftp": [ - "setuptools" - ], - "aiogithubapi": [ - "poetry-core", - "setuptools" - ], - "aioguardian": [ - "poetry-core", - "setuptools" - ], - "aioharmony": [ - "setuptools" - ], - "aiohomekit": [ - "poetry-core", - "setuptools" - ], - "aiohttp": [ - "setuptools" - ], - "aiohttp-apispec": [ - "setuptools" - ], - "aiohttp-cors": [ - "setuptools" - ], - "aiohttp-jinja2": [ - "setuptools" - ], - "aiohttp-remotes": [ - "flit-core", - "setuptools" - ], - "aiohttp-retry": [ - "setuptools" - ], - "aiohttp-socks": [ - "setuptools" - ], - "aiohttp-swagger": [ - "setuptools" - ], - "aiohttp-wsgi": [ - "setuptools" - ], - "aiohue": [ - "setuptools" - ], - "aiohwenergy": [ - "setuptools" - ], - "aioimaplib": [ - "setuptools" - ], - "aioinflux": [ - "setuptools" - ], - "aioitertools": [ - "flit-core", - "setuptools" - ], - "aiojobs": [ - "flit-core", - "setuptools" - ], - "aiokafka": [ - "cython", - "setuptools" - ], - "aiokef": [ - "setuptools" - ], - "aiolifx": [ - "setuptools" - ], - "aiolifx-connection": [ - "setuptools" - ], - "aiolifx-effects": [ - "setuptools" - ], - "aiolifx-themes": [ - "poetry-core" - ], - "aiolimiter": [ - "poetry-core", - "setuptools" - ], - "aiolip": [ - "setuptools" - ], - "aiolookin": [ - "setuptools" - ], - "aiolyric": [ - "setuptools" - ], - "aiomodernforms": [ - "setuptools" - ], - "aiomultiprocess": [ - "flit-core", - "setuptools" - ], - "aiomusiccast": [ - "poetry-core", - "setuptools" - ], - "aiomysensors": [ - "poetry-core", - "setuptools" - ], - "aiomysql": [ - "setuptools", - "setuptools-scm" - ], - "aionanoleaf": [ - "setuptools" - ], - "aionotify": [ - "setuptools" - ], - "aionotion": [ - "poetry-core", - "setuptools" - ], - "aiooncue": [ - "setuptools" - ], - "aioopenexchangerates": [ - "poetry-core", - "setuptools" - ], - "aiopath": [ - "poetry-core", - "setuptools" - ], - "aiopg": [ - "setuptools" - ], - "aioprocessing": [ - "flit-core", - "setuptools" - ], - "aiopulse": [ - "setuptools" - ], - "aiopvapi": [ - "setuptools" - ], - "aiopvpc": [ - "poetry-core", - "setuptools" - ], - "aiopyarr": [ - "setuptools" - ], - "aiopylgtv": [ - "setuptools" - ], - "aioqsw": [ - "setuptools" - ], - "aiorecollect": [ - "poetry-core", - "setuptools" - ], - "aioredis": [ - "setuptools" - ], - "aioresponses": [ - "pbr", - "setuptools" - ], - "aioridwell": [ - "poetry-core", - "setuptools" - ], - "aiormq": [ - "setuptools" - ], - "aiorpcx": [ - "setuptools" - ], - "aiortm": [ - "poetry-core", - "setuptools" - ], - "aiorun": [ - "flit-core", - "setuptools" - ], - "aiosenseme": [ - "setuptools" - ], - "aiosenz": [ - "setuptools" - ], - "aioserial": [ - "setuptools" - ], - "aioshelly": [ - "setuptools" - ], - "aioshutil": [ - "setuptools", - "setuptools-scm" - ], - "aiosignal": [ - "setuptools" - ], - "aioskybell": [ - "setuptools" - ], - "aioslimproto": [ - "setuptools" - ], - "aiosmb": [ - "setuptools" - ], - "aiosmtpd": [ - "setuptools" - ], - "aiosmtplib": [ - "poetry-core", - "setuptools" - ], - "aiosqlite": [ - "flit-core", - "setuptools" - ], - "aiosteamist": [ - "poetry-core", - "setuptools" - ], - "aiostream": [ - "setuptools" - ], - "aioswitcher": [ - "poetry-core", - "setuptools" - ], - "aiosyncthing": [ - "setuptools" - ], - "aiotractive": [ - "setuptools" - ], - "aiounifi": [ - "setuptools" - ], - "aiounittest": [ - "setuptools" - ], - "aiovlc": [ - "setuptools" - ], - "aiowatttime": [ - "poetry-core", - "setuptools" - ], - "aiowebostv": [ - "setuptools" - ], - "aioweenect": [ - "poetry-core" - ], - "aiowinreg": [ - "setuptools" - ], - "aioymaps": [ - "setuptools" - ], - "aiozeroconf": [ - "setuptools" - ], - "airly": [ - "setuptools" - ], - "airthings-ble": [ - "poetry-core", - "setuptools" - ], - "airthings-cloud": [ - "setuptools" - ], - "airtouch4pyapi": [ - "setuptools" - ], - "ajpy": [ - "setuptools" - ], - "ajsonrpc": [ - "setuptools" - ], - "alabaster": [ - "setuptools" - ], - "aladdin-connect": [ - "setuptools" - ], - "alarmdecoder": [ - "setuptools" - ], - "ale-py": [ - "setuptools" - ], - "alectryon": [ - "setuptools" - ], - "alembic": [ - "setuptools" - ], - "algebraic-data-types": [ - "setuptools" - ], - "aliyun-python-sdk-cdn": [ - "setuptools" - ], - "aliyun-python-sdk-config": [ - "setuptools" - ], - "aliyun-python-sdk-core": [ - "setuptools" - ], - "aliyun-python-sdk-dbfs": [ - "setuptools" - ], - "aliyun-python-sdk-iot": [ - "setuptools" - ], - "aliyun-python-sdk-kms": [ - "setuptools" - ], - "aliyun-python-sdk-sts": [ - "setuptools" - ], - "allpairspy": [ - "setuptools" - ], - "allure-behave": [ - "setuptools", - "setuptools-scm" - ], - "allure-pytest": [ - "setuptools", - "setuptools-scm" - ], - "allure-python-commons": [ - "setuptools", - "setuptools-scm" - ], - "allure-python-commons-test": [ - "setuptools", - "setuptools-scm" - ], - "alog": [ - "setuptools" - ], - "alpha-vantage": [ - "setuptools" - ], - "altair": [ - "setuptools" - ], - "amaranth": [ - "setuptools", - "setuptools-scm" - ], - "amaranth-boards": [ - "setuptools", - "setuptools-scm" - ], - "amaranth-soc": [ - "setuptools", - "setuptools-scm" - ], - "amarna": [ - "setuptools" - ], - "amazon-ion": [ - "setuptools" - ], - "ambee": [ - "poetry-core", - "setuptools" - ], - "amberelectric": [ - "setuptools" - ], - "ambiclimate": [ - "setuptools" - ], - "amcrest": [ - "setuptools" - ], - "amiibo-py": [ - "setuptools" - ], - "amply": [ - "setuptools", - "setuptools-scm" - ], - "amqp": [ - "setuptools" - ], - "amqplib": [ - "setuptools" - ], - "amqtt": [ - "poetry-core", - "setuptools" - ], - "androguard": [ - "setuptools" - ], - "android-backup": [ - "setuptools" - ], - "androidtv": [ - "setuptools" - ], - "angr": [ - "setuptools" - ], - "angrcli": [ - "setuptools" - ], - "angrop": [ - "setuptools" - ], - "aniso8601": [ - "setuptools" - ], - "annexremote": [ - "setuptools" - ], - "annoy": [ - "setuptools" - ], - "anonip": [ - "setuptools" - ], - "ansi": [ - "setuptools" - ], - "ansi2html": [ - "setuptools", - "setuptools-scm" - ], - "ansible": [ - "setuptools" - ], - "ansible-base": [ - "setuptools" - ], - "ansible-compat": [ - "setuptools", - "setuptools-scm" - ], - "ansible-core": [ - "setuptools" - ], - "ansible-doctor": [ - "poetry-core", - "setuptools" - ], - "ansible-kernel": [ - "setuptools" - ], - "ansible-later": [ - "poetry-core", - "setuptools" - ], - "ansible-lint": [ - "setuptools", - "setuptools-scm" - ], - "ansible-molecule": [ - "setuptools" - ], - "ansible-runner": [ - "pbr", - "setuptools" - ], - "ansicolor": [ - "setuptools" - ], - "ansicolors": [ - "setuptools" - ], - "ansiconv": [ - "setuptools" - ], - "ansimarkup": [ - "setuptools" - ], - "ansiwrap": [ - "setuptools" - ], - "antlr4-8-python3-runtime": [ - "setuptools" - ], - "antlr4-9-python3-runtime": [ - "setuptools" - ], - "antlr4-python3-runtime": [ - "setuptools" - ], - "anyascii": [ - { - "buildSystem": "setuptools", - "until": "0.1.7" - }, - { - "buildSystem": "flit-core", - "from": "0.1.7" - } - ], - "anybadge": [ - "setuptools" - ], - "anyconfig": [ - "setuptools" - ], - "anyio": [ - "setuptools", - "setuptools-scm" - ], - "anytree": [ - "setuptools" - ], - "aocd": [ - "setuptools" - ], - "apache-beam": [ - "cython", - "setuptools" - ], - "apache-libcloud": [ - "setuptools" - ], - "apcaccess": [ - "setuptools" - ], - "apipkg": [ - "hatch-vcs", - "hatchling", - "setuptools" - ], - "apispec": [ - "setuptools" - ], - "aplpy": [ - "cython", - "setuptools" - ], - "appdirs": [ - "setuptools" - ], - "applicationinsights": [ - "setuptools" - ], - "appnope": [ - "setuptools" - ], - "apprise": [ - "setuptools" - ], - "approvaltests": [ - "setuptools" - ], - "appthreat-vulnerability-db": [ - "setuptools" - ], - "apptools": [ - "setuptools" - ], - "aprslib": [ - "setuptools" - ], - "apscheduler": [ - "setuptools", - "setuptools-scm" - ], - "apsw": [ - "setuptools" - ], - "apycula": [ - "setuptools", - "setuptools-scm" - ], - "aqipy-atmotech": [ - "setuptools" - ], - "aqualogic": [ - "setuptools" - ], - "arabic-reshaper": [ - "setuptools" - ], - "arc4": [ - "setuptools" - ], - "arcam-fmj": [ - "setuptools" - ], - "archinfo": [ - "setuptools" - ], - "archspec": [ - "poetry-core", - "setuptools" - ], - "area": [ - "setuptools" - ], - "arelle": [ - "setuptools" - ], - "arelle-headless": [ - "setuptools" - ], - "aresponses": [ - "setuptools" - ], - "argcomplete": [ - "setuptools" - ], - "argh": [ - "setuptools" - ], - "argon2-cffi": [ - "flit-core", - "setuptools" - ], - "argon2-cffi-bindings": [ - "setuptools", - "setuptools-scm" - ], - "argparse-addons": [ - "setuptools" - ], - "args": [ - "setuptools" - ], - "aria2p": [ - "poetry", - "setuptools" - ], - "arnparse": [ - "setuptools" - ], - "arpeggio": [ - "setuptools" - ], - "arpy": [ - "setuptools" - ], - "arrayqueues": [ - "setuptools" - ], - "arris-tg2492lg": [ - "setuptools" - ], - "arrow": [ - "setuptools" - ], - "arviz": [ - "setuptools" - ], - "arxiv2bib": [ - "setuptools" - ], - "asana": [ - "setuptools" - ], - "ascii-magic": [ - "setuptools" - ], - "asciimatics": [ - "setuptools", - "setuptools-scm" - ], - "asciitree": [ - "setuptools" - ], - "asdf": [ - "setuptools", - "setuptools-scm" - ], - "asdf-standard": [ - "setuptools", - "setuptools-scm" - ], - "asdf-transform-schemas": [ - "setuptools", - "setuptools-scm" - ], - "ase": [ - "setuptools" - ], - "asf-search": [ - "setuptools" - ], - "asgi-csrf": [ - "setuptools" - ], - "asgineer": [ - "setuptools" - ], - "asgiref": [ - "setuptools" - ], - "asks": [ - "setuptools" - ], - "asmog": [ - "setuptools" - ], - "asn1": [ - "setuptools" - ], - "asn1ate": [ - "setuptools" - ], - "asn1crypto": [ - "setuptools" - ], - "asn1tools": [ - "setuptools" - ], - "aspell-python": [ - "setuptools" - ], - "aspy-refactor-imports": [ - "setuptools" - ], - "aspy-yaml": [ - "setuptools" - ], - "assay": [ - "setuptools" - ], - "assertpy": [ - "setuptools" - ], - "asterisk-mbox": [ - "setuptools" - ], - "asteval": [ - "setuptools", - "setuptools-scm" - ], - "astor": [ - "setuptools" - ], - "astral": [ - "setuptools" - ], - "astroid": [ - "setuptools", - "setuptools-scm" - ], - "astropy": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "astropy-extension-helpers": [ - "setuptools", - "setuptools-scm" - ], - "astropy-healpix": [ - "setuptools", - "setuptools-scm" - ], - "astropy-helpers": [ - "setuptools" - ], - "astroquery": [ - "setuptools" - ], - "asttokens": [ - "setuptools", - "setuptools-scm" - ], - "astunparse": [ - "setuptools" - ], - "asv": [ - "setuptools" - ], - "async-cache": [ - "setuptools" - ], - "async-dns": [ - "poetry-core", - "setuptools" - ], - "async-generator": [ - "setuptools" - ], - "async-lru": [ - "setuptools" - ], - "async-modbus": [ - "setuptools" - ], - "async-stagger": [ - "setuptools" - ], - "async-timeout": [ - "setuptools" - ], - "async-upnp-client": [ - "setuptools" - ], - "asyncclick": [ - "setuptools", - "setuptools-scm" - ], - "asynccmd": [ - "setuptools" - ], - "asyncio-dgram": [ - "setuptools" - ], - "asyncio-mqtt": [ - "setuptools", - "setuptools-scm" - ], - "asyncio-nats-client": [ - "setuptools" - ], - "asyncio-rlock": [ - "setuptools" - ], - "asyncio-throttle": [ - "setuptools" - ], - "asyncmy": [ - "cython", - "poetry-core", - "setuptools" - ], - "asyncpg": [ - "setuptools" - ], - "asyncsleepiq": [ - "setuptools" - ], - "asyncssh": [ - "setuptools" - ], - "asyncstdlib": [ - "flit-core", - "setuptools" - ], - "asynctest": [ - "setuptools" - ], - "asyncua": [ - "setuptools" - ], - "asyncwhois": [ - "setuptools" - ], - "asysocks": [ - "setuptools" - ], - "atc-ble": [ - "poetry-core", - "setuptools" - ], - "atenpdu": [ - "setuptools" - ], - "atlassian-python-api": [ - "setuptools" - ], - "atom": [ - "setuptools", - "setuptools-scm" - ], - "atomiclong": [ - "setuptools" - ], - "atomicwrites": [ - "setuptools" - ], - "atomicwrites-homeassistant": [ - "setuptools" - ], - "atomman": [ - "cython", - "setuptools" - ], - "atpublic": [ - "pdm-pep517", - "setuptools" - ], - "atsim-potentials": [ - "setuptools" - ], - "attrdict": [ - "setuptools" - ], - "attrs": [ - { - "buildSystem": "setuptools", - "until": "23.1.0" - }, - { - "buildSystem": "hatchling", - "from": "23.1.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "23.1.0" - }, - { - "buildSystem": "hatch-fancy-pypi-readme", - "from": "23.1.0" - } - ], - "aubio": [ - "setuptools" - ], - "audible": [ - "setuptools" - ], - "audio-metadata": [ - "setuptools" - ], - "audioread": [ - "setuptools" - ], - "audiotools": [ - "setuptools" - ], - "augeas": [ - "setuptools" - ], - "augmax": [ - "setuptools" - ], - "auroranoaa": [ - "setuptools" - ], - "aurorapy": [ - "setuptools" - ], - "autarco": [ - "poetry-core", - "setuptools" - ], - "auth0-python": [ - "setuptools" - ], - "authcaptureproxy": [ - "poetry-core", - "setuptools" - ], - "authheaders": [ - "setuptools" - ], - "authlib": [ - "setuptools" - ], - "authres": [ - "setuptools" - ], - "autobahn": [ - "setuptools" - ], - "autodoc": [ - "setuptools" - ], - "autoflake": [ - "setuptools", - "hatchling" - ], - "autograd": [ - "setuptools" - ], - "autoit-ripper": [ - "setuptools" - ], - "autologging": [ - "setuptools" - ], - "automat": [ - "setuptools", - "setuptools-scm" - ], - "automate-home": [ - "setuptools" - ], - "autopage": [ - "setuptools" - ], - "autopep8": [ - "setuptools" - ], - "av": [ - "cython", - "setuptools" - ], - "avea": [ - "setuptools" - ], - "avion": [ - "setuptools" - ], - "avro": [ - "setuptools" - ], - "avro-python3": [ - "setuptools" - ], - "avro3k": [ - "setuptools" - ], - "awacs": [ - "setuptools" - ], - "awesome-slugify": [ - "setuptools" - ], - "awesomeversion": [ - "poetry-core", - "setuptools" - ], - "awkward": [ - "setuptools" - ], - "awkward0": [ - "setuptools" - ], - "aws-adfs": [ - "poetry-core", - "setuptools" - ], - "aws-cdk-asset-awscli-v1": [ - "setuptools" - ], - "aws-cdk-asset-kubectl-v20": [ - "setuptools" - ], - "aws-cdk-asset-node-proxy-agent": [ - "setuptools" - ], - "aws-cdk-asset-node-proxy-agent-v5": [ - "setuptools" - ], - "aws-cdk-assets": [ - "setuptools" - ], - "aws-cdk-aws-apigateway": [ - "setuptools" - ], - "aws-cdk-aws-applicationautoscaling": [ - "setuptools" - ], - "aws-cdk-aws-autoscaling": [ - "setuptools" - ], - "aws-cdk-aws-autoscaling-common": [ - "setuptools" - ], - "aws-cdk-aws-autoscaling-hooktargets": [ - "setuptools" - ], - "aws-cdk-aws-batch-alpha": [ - "setuptools" - ], - "aws-cdk-aws-certificatemanager": [ - "setuptools" - ], - "aws-cdk-aws-cloudformation": [ - "setuptools" - ], - "aws-cdk-aws-cloudfront": [ - "setuptools" - ], - "aws-cdk-aws-cloudwatch": [ - "setuptools" - ], - "aws-cdk-aws-codebuild": [ - "setuptools" - ], - "aws-cdk-aws-codecommit": [ - "setuptools" - ], - "aws-cdk-aws-codeguruprofiler": [ - "setuptools" - ], - "aws-cdk-aws-codepipeline": [ - "setuptools" - ], - "aws-cdk-aws-codestarnotifications": [ - "setuptools" - ], - "aws-cdk-aws-cognito": [ - "setuptools" - ], - "aws-cdk-aws-ec2": [ - "setuptools" - ], - "aws-cdk-aws-ecr": [ - "setuptools" - ], - "aws-cdk-aws-ecr-assets": [ - "setuptools" - ], - "aws-cdk-aws-ecs": [ - "setuptools" - ], - "aws-cdk-aws-efs": [ - "setuptools" - ], - "aws-cdk-aws-elasticloadbalancing": [ - "setuptools" - ], - "aws-cdk-aws-elasticloadbalancingv2": [ - "setuptools" - ], - "aws-cdk-aws-events": [ - "setuptools" - ], - "aws-cdk-aws-events-targets": [ - "setuptools" - ], - "aws-cdk-aws-globalaccelerator": [ - "setuptools" - ], - "aws-cdk-aws-iam": [ - "setuptools" - ], - "aws-cdk-aws-kinesis": [ - "setuptools" - ], - "aws-cdk-aws-kinesisfirehose": [ - "setuptools" - ], - "aws-cdk-aws-kms": [ - "setuptools" - ], - "aws-cdk-aws-lambda": [ - "setuptools" - ], - "aws-cdk-aws-lambda-python-alpha": [ - "setuptools" - ], - "aws-cdk-aws-logs": [ - "setuptools" - ], - "aws-cdk-aws-route53": [ - "setuptools" - ], - "aws-cdk-aws-route53-targets": [ - "setuptools" - ], - "aws-cdk-aws-s3": [ - "setuptools" - ], - "aws-cdk-aws-s3-assets": [ - "setuptools" - ], - "aws-cdk-aws-sam": [ - "setuptools" - ], - "aws-cdk-aws-secretsmanager": [ - "setuptools" - ], - "aws-cdk-aws-servicediscovery": [ - "setuptools" - ], - "aws-cdk-aws-signer": [ - "setuptools" - ], - "aws-cdk-aws-sns": [ - "setuptools" - ], - "aws-cdk-aws-sns-subscriptions": [ - "setuptools" - ], - "aws-cdk-aws-sqs": [ - "setuptools" - ], - "aws-cdk-aws-ssm": [ - "setuptools" - ], - "aws-cdk-aws-stepfunctions": [ - "setuptools" - ], - "aws-cdk-cloud-assembly-schema": [ - "setuptools" - ], - "aws-cdk-core": [ - "setuptools" - ], - "aws-cdk-custom-resources": [ - "setuptools" - ], - "aws-cdk-cx-api": [ - "setuptools" - ], - "aws-cdk-lib": [ - "setuptools" - ], - "aws-cdk-region-info": [ - "setuptools" - ], - "aws-error-utils": [ - "poetry" - ], - "aws-lambda-builders": [ - "setuptools" - ], - "aws-lambda-context": [ - "setuptools" - ], - "aws-sam-translator": [ - "setuptools" - ], - "aws-sso-lib": [ - "poetry" - ], - "aws-sso-util": [ - "poetry" - ], - "aws-xray-sdk": [ - "setuptools" - ], - "awscli": [ - "setuptools" - ], - "awscli-cwlogs": [ - "setuptools" - ], - "awscli-local": [ - "setuptools" - ], - "awscrt": [ - "setuptools" - ], - "awsiotpythonsdk": [ - "setuptools" - ], - "awslambdaric": [ - "setuptools" - ], - "axis": [ - "setuptools" - ], - "azure-appconfiguration": [ - "setuptools" - ], - "azure-applicationinsights": [ - "setuptools" - ], - "azure-batch": [ - "setuptools" - ], - "azure-common": [ - "setuptools" - ], - "azure-containerregistry": [ - "setuptools" - ], - "azure-core": [ - "setuptools" - ], - "azure-cosmos": [ - "setuptools" - ], - "azure-cosmosdb-nspkg": [ - "setuptools" - ], - "azure-cosmosdb-table": [ - "setuptools" - ], - "azure-data-tables": [ - "setuptools" - ], - "azure-datalake-store": [ - "setuptools" - ], - "azure-eventgrid": [ - "setuptools" - ], - "azure-eventhub": [ - "setuptools" - ], - "azure-functions-devops-build": [ - "setuptools" - ], - "azure-graphrbac": [ - "setuptools" - ], - "azure-identity": [ - "setuptools" - ], - "azure-keyvault": [ - "setuptools" - ], - "azure-keyvault-administration": [ - "setuptools" - ], - "azure-keyvault-certificates": [ - "setuptools" - ], - "azure-keyvault-keys": [ - "setuptools" - ], - "azure-keyvault-nspkg": [ - "setuptools" - ], - "azure-keyvault-secrets": [ - "setuptools" - ], - "azure-loganalytics": [ - "setuptools" - ], - "azure-mgmt-advisor": [ - "setuptools" - ], - "azure-mgmt-apimanagement": [ - "setuptools" - ], - "azure-mgmt-appconfiguration": [ - "setuptools" - ], - "azure-mgmt-applicationinsights": [ - "setuptools" - ], - "azure-mgmt-authorization": [ - "setuptools" - ], - "azure-mgmt-batch": [ - "setuptools" - ], - "azure-mgmt-batchai": [ - "setuptools" - ], - "azure-mgmt-billing": [ - "setuptools" - ], - "azure-mgmt-botservice": [ - "setuptools" - ], - "azure-mgmt-cdn": [ - "setuptools" - ], - "azure-mgmt-cognitiveservices": [ - "setuptools" - ], - "azure-mgmt-commerce": [ - "setuptools" - ], - "azure-mgmt-common": [ - "setuptools" - ], - "azure-mgmt-compute": [ - "setuptools" - ], - "azure-mgmt-consumption": [ - "setuptools" - ], - "azure-mgmt-containerinstance": [ - "setuptools" - ], - "azure-mgmt-containerregistry": [ - "setuptools" - ], - "azure-mgmt-containerservice": [ - "setuptools" - ], - "azure-mgmt-core": [ - "setuptools" - ], - "azure-mgmt-cosmosdb": [ - "setuptools" - ], - "azure-mgmt-databoxedge": [ - "setuptools" - ], - "azure-mgmt-datafactory": [ - "setuptools" - ], - "azure-mgmt-datalake-analytics": [ - "setuptools" - ], - "azure-mgmt-datalake-nspkg": [ - "setuptools" - ], - "azure-mgmt-datalake-store": [ - "setuptools" - ], - "azure-mgmt-datamigration": [ - "setuptools" - ], - "azure-mgmt-deploymentmanager": [ - "setuptools" - ], - "azure-mgmt-devspaces": [ - "setuptools" - ], - "azure-mgmt-devtestlabs": [ - "setuptools" - ], - "azure-mgmt-dns": [ - "setuptools" - ], - "azure-mgmt-eventgrid": [ - "setuptools" - ], - "azure-mgmt-eventhub": [ - "setuptools" - ], - "azure-mgmt-extendedlocation": [ - "setuptools" - ], - "azure-mgmt-hanaonazure": [ - "setuptools" - ], - "azure-mgmt-hdinsight": [ - "setuptools" - ], - "azure-mgmt-imagebuilder": [ - "setuptools" - ], - "azure-mgmt-iotcentral": [ - "setuptools" - ], - "azure-mgmt-iothub": [ - "setuptools" - ], - "azure-mgmt-iothubprovisioningservices": [ - "setuptools" - ], - "azure-mgmt-keyvault": [ - "setuptools" - ], - "azure-mgmt-kusto": [ - "setuptools" - ], - "azure-mgmt-loganalytics": [ - "setuptools" - ], - "azure-mgmt-logic": [ - "setuptools" - ], - "azure-mgmt-machinelearningcompute": [ - "setuptools" - ], - "azure-mgmt-managedservices": [ - "setuptools" - ], - "azure-mgmt-managementgroups": [ - "setuptools" - ], - "azure-mgmt-managementpartner": [ - "setuptools" - ], - "azure-mgmt-maps": [ - "setuptools" - ], - "azure-mgmt-marketplaceordering": [ - "setuptools" - ], - "azure-mgmt-media": [ - "setuptools" - ], - "azure-mgmt-monitor": [ - "setuptools" - ], - "azure-mgmt-msi": [ - "setuptools" - ], - "azure-mgmt-netapp": [ - "setuptools" - ], - "azure-mgmt-network": [ - "setuptools" - ], - "azure-mgmt-notificationhubs": [ - "setuptools" - ], - "azure-mgmt-nspkg": [ - "setuptools" - ], - "azure-mgmt-policyinsights": [ - "setuptools" - ], - "azure-mgmt-powerbiembedded": [ - "setuptools" - ], - "azure-mgmt-privatedns": [ - "setuptools" - ], - "azure-mgmt-rdbms": [ - "setuptools" - ], - "azure-mgmt-recoveryservices": [ - "setuptools" - ], - "azure-mgmt-recoveryservicesbackup": [ - "setuptools" - ], - "azure-mgmt-redhatopenshift": [ - "setuptools" - ], - "azure-mgmt-redis": [ - "setuptools" - ], - "azure-mgmt-relay": [ - "setuptools" - ], - "azure-mgmt-reservations": [ - "setuptools" - ], - "azure-mgmt-resource": [ - "setuptools" - ], - "azure-mgmt-scheduler": [ - "setuptools" - ], - "azure-mgmt-search": [ - "setuptools" - ], - "azure-mgmt-security": [ - "setuptools" - ], - "azure-mgmt-servicebus": [ - "setuptools" - ], - "azure-mgmt-servicefabric": [ - "setuptools" - ], - "azure-mgmt-servicefabricmanagedclusters": [ - "setuptools" - ], - "azure-mgmt-servicelinker": [ - "setuptools" - ], - "azure-mgmt-signalr": [ - "setuptools" - ], - "azure-mgmt-sql": [ - "setuptools" - ], - "azure-mgmt-sqlvirtualmachine": [ - "setuptools" - ], - "azure-mgmt-storage": [ - "setuptools" - ], - "azure-mgmt-subscription": [ - "setuptools" - ], - "azure-mgmt-synapse": [ - "setuptools" - ], - "azure-mgmt-trafficmanager": [ - "setuptools" - ], - "azure-mgmt-web": [ - "setuptools" - ], - "azure-multiapi-storage": [ - "setuptools" - ], - "azure-nspkg": [ - "setuptools" - ], - "azure-servicebus": [ - "setuptools" - ], - "azure-servicefabric": [ - "setuptools" - ], - "azure-servicemanagement-legacy": [ - "setuptools" - ], - "azure-storage": [ - "setuptools" - ], - "azure-storage-blob": [ - "setuptools" - ], - "azure-storage-common": [ - "setuptools" - ], - "azure-storage-file": [ - "setuptools" - ], - "azure-storage-file-share": [ - "setuptools" - ], - "azure-storage-nspkg": [ - "setuptools" - ], - "azure-storage-queue": [ - "setuptools" - ], - "azure-synapse-accesscontrol": [ - "setuptools" - ], - "azure-synapse-artifacts": [ - "setuptools" - ], - "azure-synapse-managedprivateendpoints": [ - "setuptools" - ], - "azure-synapse-spark": [ - "setuptools" - ], - "b2sdk": [ - "setuptools", - "setuptools-scm" - ], - "babel": [ - "setuptools" - ], - "babelfish": [ - "setuptools" - ], - "babelgladeextractor": [ - "setuptools" - ], - "backcall": [ - "flit-core", - "setuptools" - ], - "backoff": [ - "poetry-core", - "setuptools" - ], - "backports-abc": [ - "setuptools" - ], - "backports-cached-property": [ - "setuptools", - "setuptools-scm" - ], - "backports-csv": [ - "setuptools" - ], - "backports-datetime-fromisoformat": [ - "setuptools" - ], - "backports-entry-points-selectable": [ - "setuptools", - "setuptools-scm" - ], - "backports-functools-lru-cache": [ - "setuptools", - "setuptools-scm" - ], - "backports-shutil-which": [ - "setuptools" - ], - "backports-ssl-match-hostname": [ - "setuptools", - "setuptools-scm" - ], - "backports-tempfile": [ - "setuptools", - "setuptools-scm" - ], - "backports-unittest-mock": [ - "setuptools", - "setuptools-scm" - ], - "backports-weakref": [ - "setuptools", - "setuptools-scm" - ], - "backports-zoneinfo": [ - "setuptools" - ], - "bagit": [ - "setuptools", - "setuptools-scm" - ], - "banal": [ - "setuptools" - ], - "bandit": [ - "pbr", - "setuptools" - ], - "bap": [ - "setuptools" - ], - "baron": [ - "setuptools" - ], - "base32-crockford": [ - "setuptools" - ], - "base36": [ - "setuptools" - ], - "base58": [ - "setuptools" - ], - "base58check": [ - "setuptools" - ], - "baseline": [ - "setuptools" - ], - "baselines": [ - "setuptools" - ], - "basemap": [ - "cython", - "setuptools" - ], - "basemap-data": [ - "setuptools" - ], - "bash-kernel": [ - "flit-core", - "setuptools" - ], - "bashlex": [ - "setuptools" - ], - "basiciw": [ - "setuptools" - ], - "batchgenerators": [ - "setuptools" - ], - "batchspawner": [ - "setuptools" - ], - "batinfo": [ - "setuptools" - ], - "bayesian-optimization": [ - "setuptools" - ], - "bayespy": [ - "setuptools" - ], - "bbox": [ - "setuptools" - ], - "bc-detect-secrets": [ - "setuptools" - ], - "bc-jsonpath-ng": [ - "setuptools" - ], - "bc-python-hcl2": [ - "setuptools" - ], - "bcdoc": [ - "setuptools" - ], - "bcrypt": [ - "setuptools" - ], - "beaker": [ - "setuptools" - ], - "beancount": [ - "setuptools" - ], - "beancount-docverif": [ - "setuptools", - "setuptools-scm" - ], - "beanstalkc": [ - "setuptools" - ], - "beartype": [ - "setuptools" - ], - "beautifulsoup4": [ - "hatchling", - "setuptools" - ], - "beautifultable": [ - "setuptools" - ], - "bech32": [ - "setuptools" - ], - "bedup": [ - "setuptools" - ], - "behave": [ - "setuptools" - ], - "bellows": [ - "setuptools" - ], - "bencode-py": [ - "setuptools" - ], - "beniget": [ - "setuptools" - ], - "bespon": [ - "setuptools" - ], - "betacode": [ - "setuptools" - ], - "betamax": [ - "setuptools" - ], - "betamax-matchers": [ - "setuptools" - ], - "betamax-serializers": [ - "setuptools" - ], - "betterproto": [ - "poetry-core", - "setuptools" - ], - "bibtexparser": [ - "setuptools" - ], - "bidict": [ - "setuptools" - ], - "bids-validator": [ - "setuptools" - ], - "biliass": [ - "setuptools" - ], - "billiard": [ - "setuptools" - ], - "bimmer-connected": [ - "pbr", - "setuptools" - ], - "binaryornot": [ - "setuptools" - ], - "bincopy": [ - "setuptools" - ], - "binho-host-adapter": [ - "setuptools" - ], - "binwalk": [ - "setuptools" - ], - "binwalk-full": [ - "setuptools" - ], - "biopython": [ - "setuptools" - ], - "bip-utils": [ - "setuptools" - ], - "biplist": [ - "setuptools" - ], - "bitarray": [ - "setuptools" - ], - "bitbox02": [ - "setuptools" - ], - "bitcoin-utils-fork-minimal": [ - "setuptools" - ], - "bitcoinlib": [ - "setuptools" - ], - "bitcoinrpc": [ - "setuptools" - ], - "bite-parser": [ - "poetry-core", - "setuptools" - ], - "bitlist": [ - "setuptools" - ], - "bitmath": [ - "setuptools" - ], - "bitsandbytes": [ - "setuptools" - ], - "bitstring": [ - "setuptools" - ], - "bitstruct": [ - "setuptools" - ], - "bitvavo-aio": [ - "setuptools" - ], - "bizkaibus": [ - "setuptools" - ], - "bjoern": [ - "setuptools" - ], - "bkcharts": [ - "setuptools" - ], - "black": [ - { - "buildSystem": "setuptools", - "until": "22.10.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "22.10.0" - }, - { - "buildSystem": "hatchling", - "from": "22.10.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "22.10.0" - }, - { - "buildSystem": "hatch-fancy-pypi-readme", - "from": "22.10.0" - } - ], - "black-macchiato": [ - "setuptools" - ], - "blacken-docs": [ - "setuptools" - ], - "bleach": [ - "setuptools" - ], - "bleak": [ - "poetry-core", - "setuptools" - ], - "bleak-retry-connector": [ - "poetry-core", - "setuptools" - ], - "blebox-uniapi": [ - "setuptools" - ], - "bless": [ - "setuptools" - ], - "blessed": [ - "setuptools" - ], - "blessings": [ - "setuptools" - ], - "blinker": [ - "setuptools" - ], - "blinkpy": [ - "setuptools" - ], - "blinkstick": [ - "setuptools" - ], - "blis": [ - "cython", - "setuptools" - ], - "block-io": [ - "setuptools" - ], - "blockchain": [ - "setuptools" - ], - "blockdiag": [ - "setuptools" - ], - "blocksat-cli": [ - "setuptools" - ], - "blspy": [ - "setuptools", - "setuptools-scm" - ], - "blue": [ - "setuptools" - ], - "bluemaestro-ble": [ - "poetry-core", - "setuptools" - ], - "bluepy": [ - "setuptools" - ], - "bluepy-devices": [ - "setuptools" - ], - "bluetooth-adapters": [ - "poetry-core", - "setuptools" - ], - "bluetooth-auto-recovery": [ - "poetry-core", - "setuptools" - ], - "bluetooth-data-tools": [ - "poetry-core", - "setuptools" - ], - "bluetooth-sensor-state-data": [ - "poetry-core", - "setuptools" - ], - "blurhash": [ - "setuptools" - ], - "bme280spi": [ - "setuptools" - ], - "bme680": [ - "setuptools" - ], - "bokeh": [ - "setuptools" - ], - "boltons": [ - "setuptools" - ], - "boltz-client": [ - "poetry" - ], - "boltztrap2": [ - "cython", - "setuptools" - ], - "bond-api": [ - "setuptools" - ], - "bond-async": [ - "setuptools" - ], - "boolean-py": [ - "setuptools" - ], - "booleanoperations": [ - "setuptools", - "setuptools-scm" - ], - "boost-histogram": [ - "setuptools", - "setuptools-scm" - ], - "boschshcpy": [ - "setuptools" - ], - "boto": [ - "setuptools" - ], - "boto3": [ - "setuptools" - ], - "boto3-stubs": [ - "setuptools" - ], - "botocore": [ - "setuptools" - ], - "botocore-stubs": [ - "poetry-core", - "setuptools" - ], - "bottle": [ - "setuptools" - ], - "bottleneck": [ - "setuptools" - ], - "boxx": [ - "setuptools" - ], - "bpycv": [ - "setuptools" - ], - "bpython": [ - "setuptools" - ], - "braceexpand": [ - "setuptools" - ], - "bracex": [ - "hatchling", - "setuptools" - ], - "braintree": [ - "setuptools" - ], - "branca": [ - "setuptools" - ], - "bravado-core": [ - "setuptools" - ], - "bravia-tv": [ - "setuptools" - ], - "breathe": [ - "setuptools" - ], - "breezy": [ - "setuptools" - ], - "brelpy": [ - "setuptools" - ], - "broadlink": [ - "setuptools" - ], - "brother": [ - "setuptools" - ], - "brother-ql": [ - "setuptools" - ], - "brotli": [ - "setuptools" - ], - "brotlicffi": [ - "setuptools" - ], - "brotlipy": [ - "setuptools" - ], - "brottsplatskartan": [ - "setuptools" - ], - "browser-cookie3": [ - "setuptools" - ], - "brunns-matchers": [ - "setuptools" - ], - "brunns-row": [ - "setuptools" - ], - "brunt": [ - "setuptools" - ], - "bsblan": [ - "poetry-core", - "setuptools" - ], - "bsddb3": [ - "setuptools" - ], - "bsdiff4": [ - "setuptools" - ], - "bson": [ - "setuptools" - ], - "bsuite": [ - "setuptools" - ], - "bt-proximity": [ - "setuptools" - ], - "btchip": [ - "setuptools" - ], - "bthome-ble": [ - "poetry-core", - "setuptools" - ], - "btrees": [ - "setuptools" - ], - "btrfs": [ - "setuptools" - ], - "btrfsutil": [ - "setuptools" - ], - "btsocket": [ - "setuptools" - ], - "bucketstore": [ - "setuptools" - ], - "bugsnag": [ - "setuptools" - ], - "bugwarrior": [ - "setuptools" - ], - "bugz": [ - "setuptools" - ], - "bugzilla": [ - "setuptools" - ], - "buienradar": [ - "setuptools" - ], - "build": [ - { - "buildSystem": "setuptools", - "until": "0.10.0" - }, - { - "buildSystem": "flit-core", - "from": "0.10.0" - } - ], - "buildbot": [ - "setuptools" - ], - "buildbot-full": [ - "setuptools" - ], - "buildbot-pkg": [ - "setuptools" - ], - "buildbot-plugins-console-view": [ - "setuptools" - ], - "buildbot-plugins-grid-view": [ - "setuptools" - ], - "buildbot-plugins-waterfall-view": [ - "setuptools" - ], - "buildbot-plugins-wsgi-dashboards": [ - "setuptools" - ], - "buildbot-plugins-www": [ - "setuptools" - ], - "buildbot-ui": [ - "setuptools" - ], - "buildbot-worker": [ - "setuptools" - ], - "buildcatrust": [ - "setuptools" - ], - "builddsl": [ - "poetry" - ], - "bumps": [ - "setuptools" - ], - "bunch": [ - "setuptools" - ], - "bundlewrap": [ - "setuptools" - ], - "bwapy": [ - "setuptools" - ], - "bx-python": [ - "cython", - "setuptools" - ], - "bytecode": [ - "setuptools" - ], - "bz2file": [ - "setuptools" - ], - "cachecontrol": [ - "setuptools" - ], - "cached-property": [ - "setuptools" - ], - "cachelib": [ - "setuptools" - ], - "cachetools": [ - "setuptools" - ], - "cachey": [ - "setuptools" - ], - "cachy": [ - "setuptools" - ], - "caio": [ - "setuptools" - ], - "cairo-lang": [ - "setuptools" - ], - "cairocffi": [ - "setuptools" - ], - "cairosvg": [ - "setuptools" - ], - "caldav": [ - "setuptools" - ], - "callee": [ - "setuptools" - ], - "calmjs-parse": [ - "setuptools" - ], - "can": [ - "setuptools" - ], - "canmatrix": [ - "setuptools" - ], - "canonicaljson": [ - "setuptools" - ], - "canopen": [ - "setuptools", - "setuptools-scm" - ], - "capstone": [ - "setuptools" - ], - "capturer": [ - "setuptools" - ], - "carbon": [ - "setuptools" - ], - "cart": [ - "setuptools" - ], - "cartopy": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "casa-formats-io": [ - "setuptools", - "setuptools-scm" - ], - "casbin": [ - "setuptools" - ], - "case": [ - "setuptools" - ], - "casefy": [ - "hatchling" - ], - "cashu": [ - "poetry" - ], - "cassandra-driver": [ - "cython", - "setuptools" - ], - "castepxbin": [ - "setuptools" - ], - "casttube": [ - "setuptools" - ], - "catalogue": [ - "setuptools" - ], - "catboost": [ - "setuptools" - ], - "cattrs": [ - "poetry-core", - "setuptools" - ], - "cbeams": [ - "setuptools" - ], - "cbor": [ - "setuptools" - ], - "cbor2": [ - "setuptools", - "setuptools-scm" - ], - "cccolutils": [ - "setuptools" - ], - "cchardet": [ - "setuptools" - ], - "cdcs": [ - "setuptools" - ], - "celery": [ - "setuptools" - ], - "celery-redbeat": [ - "setuptools" - ], - "cement": [ - "setuptools" - ], - "censys": [ - "poetry-core", - "setuptools" - ], - "cepa": [ - "setuptools" - ], - "cerberus": [ - "setuptools" - ], - "cert-chain-resolver": [ - "setuptools" - ], - "certauth": [ - "setuptools" - ], - "certbot": [ - "setuptools" - ], - "certbot-dns-cloudflare": [ - "setuptools" - ], - "certbot-dns-google": [ - "setuptools" - ], - "certbot-dns-inwx": [ - "setuptools" - ], - "certbot-dns-ovh": [ - "setuptools" - ], - "certbot-dns-rfc2136": [ - "setuptools" - ], - "certbot-dns-route53": [ - "setuptools" - ], - "certifi": [ - "setuptools" - ], - "certipy": [ - "setuptools" - ], - "certomancer": [ - "setuptools" - ], - "certvalidator": [ - "setuptools" - ], - "cexprtk": [ - "setuptools" - ], - "cfel-pylint-checkers": [ - "poetry-core" - ], - "cffi": [ - "setuptools" - ], - "cffsubr": [ - "setuptools", - "setuptools-scm" - ], - "cfgv": [ - "setuptools" - ], - "cfn-flip": [ - "setuptools" - ], - "cfn-lint": [ - "setuptools" - ], - "cfnresponse": [ - "setuptools" - ], - "cfscrape": [ - "setuptools" - ], - "cftime": [ - "cython", - "setuptools" - ], - "cgen": [ - "setuptools" - ], - "cgroup-utils": [ - "setuptools" - ], - "chacha20poly1305-reuseable": [ - "poetry-core", - "setuptools" - ], - "chai": [ - "setuptools" - ], - "chainer": [ - "setuptools" - ], - "chainmap": [ - "setuptools" - ], - "chalice": [ - "setuptools" - ], - "chameleon": [ - "setuptools" - ], - "channels": [ - "setuptools" - ], - "channels-redis": [ - "setuptools" - ], - "characteristic": [ - "setuptools" - ], - "chardet": [ - "setuptools" - ], - "charset-normalizer": [ - "setuptools" - ], - "chart-studio": [ - "setuptools" - ], - "chat-downloader": [ - "setuptools" - ], - "check-manifest": [ - "setuptools" - ], - "cheetah3": [ - "setuptools" - ], - "cheroot": [ - "setuptools", - "setuptools-scm" - ], - "cherrypy": [ - "setuptools", - "setuptools-scm" - ], - "chess": [ - "setuptools" - ], - "chevron": [ - "setuptools" - ], - "chex": [ - "setuptools" - ], - "chia-rs": [ - "setuptools" - ], - "chiabip158": [ - "setuptools", - "setuptools-scm" - ], - "chiapos": [ - "setuptools", - "setuptools-scm" - ], - "chiavdf": [ - "setuptools", - "setuptools-scm" - ], - "chirpstack-api": [ - "setuptools" - ], - "chispa": [ - "poetry-core", - "setuptools" - ], - "ci-info": [ - "setuptools" - ], - "ci-py": [ - "setuptools" - ], - "cinemagoer": [ - "setuptools" - ], - "circuit-webhook": [ - "setuptools" - ], - "circuitbreaker": [ - "setuptools" - ], - "cirq": [ - "setuptools" - ], - "cirq-aqt": [ - "setuptools" - ], - "cirq-core": [ - "setuptools" - ], - "cirq-google": [ - "setuptools" - ], - "cirq-ionq": [ - "setuptools" - ], - "cirq-pasqal": [ - "setuptools" - ], - "cirq-rigetti": [ - "setuptools" - ], - "cirq-web": [ - "setuptools" - ], - "ciscoconfparse": [ - "poetry-core", - "setuptools" - ], - "ciscomobilityexpress": [ - "setuptools" - ], - "ciso8601": [ - "setuptools" - ], - "citeproc-py": [ - "setuptools" - ], - "cjkwrap": [ - "setuptools" - ], - "ckcc-protocol": [ - "setuptools" - ], - "claripy": [ - "setuptools" - ], - "class-registry": [ - "setuptools" - ], - "classify-imports": [ - "setuptools" - ], - "cld2-cffi": [ - "setuptools" - ], - "cle": [ - "setuptools" - ], - "cleo": [ - "poetry-core", - "setuptools" - ], - "clevercsv": [ - "setuptools" - ], - "clf": [ - "setuptools" - ], - "cli-helpers": [ - "setuptools" - ], - "click": [ - "setuptools" - ], - "click-completion": [ - "setuptools" - ], - "click-configfile": [ - "setuptools" - ], - "click-datetime": [ - "setuptools" - ], - "click-default-group": [ - "setuptools" - ], - "click-didyoumean": [ - { - "buildSystem": "setuptools", - "until": "0.2.0" - }, - { - "buildSystem": "poetry", - "from": "0.2.0" - } - ], - "click-help-colors": [ - "setuptools" - ], - "click-log": [ - "setuptools" - ], - "click-odoo": [ - "setuptools-scm" - ], - "click-odoo-contrib": [ - "setuptools" - ], - "click-option-group": [ - "setuptools" - ], - "click-plugins": [ - "setuptools" - ], - "click-repl": [ - "setuptools" - ], - "click-spinner": [ - "setuptools" - ], - "click-threading": [ - "setuptools" - ], - "clickclick": [ - "setuptools" - ], - "clickgen": [ - "setuptools" - ], - "clickhouse-cityhash": [ - "setuptools" - ], - "clickhouse-cli": [ - "setuptools" - ], - "clickhouse-driver": [ - "setuptools" - ], - "cliff": [ - "pbr", - "setuptools" - ], - "clifford": [ - "setuptools" - ], - "cligj": [ - "setuptools" - ], - "clikit": [ - "poetry-core", - "setuptools" - ], - "clint": [ - "setuptools" - ], - "clintermission": [ - "setuptools" - ], - "clize": [ - "setuptools", - "setuptools-scm" - ], - "clldutils": [ - "setuptools" - ], - "cloudflare": [ - "setuptools" - ], - "cloudflare-dyndns": [ - "poetry-core", - "setuptools" - ], - "cloudinary": [ - "setuptools" - ], - "cloudpickle": [ - "setuptools" - ], - "cloudscraper": [ - "setuptools" - ], - "cloudsmith-api": [ - "setuptools" - ], - "cloudsplaining": [ - "setuptools" - ], - "cloup": [ - "setuptools", - "setuptools-scm" - ], - "clustershell": [ - "setuptools" - ], - "clvm": [ - "setuptools", - "setuptools-scm" - ], - "clvm-rs": [ - "setuptools" - ], - "clvm-tools": [ - "setuptools", - "setuptools-scm" - ], - "clvm-tools-rs": [ - "setuptools" - ], - "cma": [ - "setuptools" - ], - "cmarkgfm": [ - "setuptools" - ], - "cmd2": [ - "setuptools", - "setuptools-scm" - ], - "cmdline": [ - "setuptools" - ], - "cmdstanpy": [ - "setuptools" - ], - "cmigemo": [ - "setuptools" - ], - "cmsis-pack-manager": [ - "setuptools", - "setuptools-scm" - ], - "cmsis-svd": [ - "setuptools" - ], - "cnvkit": [ - "setuptools" - ], - "co2signal": [ - "setuptools" - ], - "coapthon3": [ - "setuptools" - ], - "cock": [ - "setuptools" - ], - "coconut": [ - "setuptools" - ], - "cocotb": [ - "setuptools", - "setuptools-scm" - ], - "cocotb-bus": [ - "setuptools" - ], - "codecov": [ - "setuptools" - ], - "codepy": [ - "setuptools" - ], - "codespell": [ - "setuptools" - ], - "cogapp": [ - "setuptools" - ], - "coincurve": [ - "setuptools" - ], - "coinmetrics-api-client": [ - "poetry-core", - "setuptools" - ], - "colander": [ - "babel", - "setuptools" - ], - "colanderalchemy": [ - "setuptools" - ], - "collections-extended": [ - "poetry-core", - "setuptools" - ], - "color-operations": [ - "setuptools" - ], - "colorama": [ - { - "buildSystem": "hatchling", - "from": "0.4.6" - }, - "setuptools" - ], - "colorcet": [ - "setuptools" - ], - "colorclass": [ - "poetry", - "setuptools" - ], - "colored": [ - "setuptools" - ], - "colored-traceback": [ - "setuptools" - ], - "coloredlogs": [ - "setuptools" - ], - "colorful": [ - "setuptools" - ], - "colorhash": [ - "poetry" - ], - "colorlog": [ - "setuptools" - ], - "colorlover": [ - "setuptools" - ], - "colormath": [ - "setuptools" - ], - "colorspacious": [ - "setuptools" - ], - "colorthief": [ - "setuptools" - ], - "colorzero": [ - "setuptools" - ], - "colour": [ - "setuptools" - ], - "cometblue-lite": [ - "setuptools" - ], - "comm": [ - "hatchling" - ], - "commandparse": [ - "setuptools" - ], - "commentjson": [ - "setuptools" - ], - "commitizen": [ - "poetry-core" - ], - "commoncode": [ - "setuptools", - "setuptools-scm" - ], - "commonmark": [ - "setuptools" - ], - "compiledb": [ - "setuptools" - ], - "compreffor": [ - "setuptools", - "setuptools-scm" - ], - "concurrent-log-handler": [ - "setuptools" - ], - "conda": [ - "setuptools" - ], - "config-formatter": [ - "setuptools" - ], - "configargparse": [ - "setuptools" - ], - "configclass": [ - "setuptools" - ], - "confight": [ - "setuptools" - ], - "configobj": [ - "setuptools" - ], - "configparser": [ - "setuptools", - "setuptools-scm" - ], - "configshell": [ - "setuptools" - ], - "configupdater": [ - "setuptools", - "setuptools-scm" - ], - "confluent-kafka": [ - "setuptools" - ], - "confusable-homoglyphs": [ - "setuptools" - ], - "confuse": [ - "flit-core", - "setuptools" - ], - "connect-box": [ - "setuptools" - ], - "connection-pool": [ - "setuptools" - ], - "connexion": [ - "setuptools" - ], - "cons": [ - "setuptools" - ], - "consonance": [ - "setuptools" - ], - "constantly": [ - "setuptools" - ], - "construct": [ - "setuptools" - ], - "construct-classes": [ - "poetry-core" - ], - "constructs": [ - "setuptools" - ], - "consul": [ - "setuptools" - ], - "consulate": [ - "setuptools" - ], - "container-inspector": [ - "setuptools", - "setuptools-scm" - ], - "contexter": [ - "setuptools" - ], - "contextlib2": [ - "setuptools" - ], - "contexttimer": [ - "setuptools" - ], - "contourpy": [ - "pybind11", - "setuptools" - ], - "convertdate": [ - "setuptools" - ], - "cookiecutter": [ - "setuptools" - ], - "cookies": [ - "setuptools" - ], - "coordinates": [ - "setuptools" - ], - "copier": [ - "poetry-core", - "poetry-dynamic-versioning" - ], - "copier-template-tester": [ - "poetry-core" - ], - "coqpit": [ - "setuptools" - ], - "coqui-trainer": [ - "setuptools" - ], - "corallium": [ - "poetry-core" - ], - "coreapi": [ - "setuptools" - ], - "coreschema": [ - "setuptools" - ], - "cornice": [ - "setuptools" - ], - "coronavirus": [ - "setuptools" - ], - "corsair-scan": [ - "setuptools" - ], - "cot": [ - "setuptools" - ], - "covcore": [ - "setuptools" - ], - "coverage": [ - "setuptools" - ], - "coveralls": [ - "setuptools" - ], - "cppe": [ - "setuptools" - ], - "cppheaderparser": [ - "setuptools" - ], - "cppy": [ - "setuptools", - "setuptools-scm" - ], - "cpyparsing": [ - "cython", - "setuptools" - ], - "cram": [ - "setuptools" - ], - "cramjam": [ - "setuptools" - ], - "crashtest": [ - "poetry-core", - "setuptools" - ], - "crate": [ - "setuptools" - ], - "crayons": [ - "setuptools" - ], - "crc16": [ - "setuptools" - ], - "crc32c": [ - "setuptools" - ], - "crccheck": [ - "setuptools" - ], - "crcmod": [ - "setuptools" - ], - "credis": [ - "cython", - "poetry-core" - ], - "credstash": [ - "setuptools" - ], - "crispy-bootstrap5": [ - "setuptools" - ], - "criticality-score": [ - "setuptools" - ], - "cron-descriptor": [ - "setuptools" - ], - "croniter": [ - "setuptools" - ], - "cronsim": [ - "setuptools" - ], - "crossplane": [ - "setuptools" - ], - "crownstone-cloud": [ - "setuptools" - ], - "crownstone-core": [ - "setuptools" - ], - "crownstone-sse": [ - "setuptools" - ], - "crownstone-uart": [ - "setuptools" - ], - "cruft": [ - "poetry-core" - ], - "cryptg": [ - "setuptools" - ], - "cryptography": [ - "setuptools" - ], - "cryptolyzer": [ - "setuptools" - ], - "cryptoparser": [ - "setuptools" - ], - "crytic-compile": [ - "setuptools" - ], - "csrmesh": [ - "setuptools" - ], - "css-html-js-minify": [ - "setuptools" - ], - "css-parser": [ - "setuptools" - ], - "cssbeautifier": [ - "setuptools" - ], - "csscompressor": [ - "setuptools" - ], - "cssmin": [ - "setuptools" - ], - "cssselect": [ - "setuptools" - ], - "cssselect2": [ - "flit", - "flit-core", - "setuptools" - ], - "cssutils": [ - "setuptools", - "setuptools-scm" - ], - "csvw": [ - "setuptools" - ], - "cucumber-tag-expressions": [ - "setuptools" - ], - "cufflinks": [ - "setuptools" - ], - "cupy": [ - "cython", - "setuptools" - ], - "curio": [ - "setuptools" - ], - "curtsies": [ - "setuptools" - ], - "curve25519-donna": [ - "setuptools" - ], - "customerio": [ - "setuptools" - ], - "cvxopt": [ - "setuptools" - ], - "cvxpy": [ - "setuptools" - ], - "cwcwidth": [ - "cython", - "setuptools" - ], - "cx-freeze": [ - "setuptools" - ], - "cx-oracle": [ - "setuptools" - ], - "cxxfilt": [ - "setuptools" - ], - "cycler": [ - "setuptools" - ], - "cyclonedx-python-lib": [ - "poetry-core", - "setuptools" - ], - "cymem": [ - "cython", - "setuptools" - ], - "cypari2": [ - "cython", - "setuptools" - ], - "cypherpunkpay": [ - "poetry-core", - "setuptools" - ], - "cysignals": [ - "cython", - "setuptools" - ], - "cysimdjson": [ - "cython" - ], - "cysystemd": [ - "setuptools" - ], - "cython": [ - "setuptools" - ], - "cython-3": [ - "setuptools" - ], - "cytoolz": [ - "cython", - "setuptools" - ], - "d20": [ - "setuptools" - ], - "d2to1": [ - "setuptools" - ], - "dacite": [ - "setuptools" - ], - "daemonize": [ - "setuptools" - ], - "daemonocle": [ - "setuptools" - ], - "dalle-mini": [ - "setuptools" - ], - "daphne": [ - "setuptools" - ], - "darglint": [ - "poetry" - ], - "dasbus": [ - "setuptools" - ], - "dash": [ - "setuptools" - ], - "dash-core-components": [ - "setuptools" - ], - "dash-html-components": [ - "setuptools" - ], - "dash-renderer": [ - "setuptools" - ], - "dash-table": [ - "setuptools" - ], - "dask": [ - "setuptools", - { - "buildSystem": "versioneer", - "from": "2.0.0" - } - ], - "dask-gateway": [ - "setuptools" - ], - "dask-gateway-server": [ - "setuptools" - ], - "dask-glm": [ - "setuptools", - "setuptools-scm" - ], - "dask-image": [ - "setuptools" - ], - "dask-jobqueue": [ - "setuptools" - ], - "dask-ml": [ - "setuptools", - "setuptools-scm" - ], - "dask-mpi": [ - "setuptools" - ], - "dask-yarn": [ - "setuptools" - ], - "databases": [ - "setuptools" - ], - "databind": [ - "poetry" - ], - "databind-core": [ - "poetry" - ], - "databind-json": [ - "poetry" - ], - "databricks-cli": [ - "setuptools" - ], - "databricks-connect": [ - "setuptools" - ], - "databricks-sql-connector": [ - "poetry-core" - ], - "dataclass-wizard": [ - "setuptools" - ], - "dataclasses-json": [ - "setuptools" - ], - "dataclasses-serialization": [ - "setuptools" - ], - "datadiff": [ - "setuptools" - ], - "datadog": [ - "hatchling", - "setuptools" - ], - "datafusion": [ - "setuptools" - ], - "datamodeldict": [ - "setuptools" - ], - "datapoint": [ - "setuptools" - ], - "datargs": [ - "poetry" - ], - "dataset": [ - "setuptools" - ], - "datasets": [ - "setuptools" - ], - "datasette": [ - "setuptools" - ], - "datasette-template-sql": [ - "setuptools" - ], - "datashader": [ - "setuptools" - ], - "datashape": [ - "setuptools" - ], - "datauri": [ - "setuptools" - ], - "dateparser": [ - "setuptools" - ], - "dateutil": [ - "setuptools", - "setuptools-scm" - ], - "dateutils": [ - "setuptools" - ], - "datrie": [ - "cython", - "setuptools" - ], - "dawg-python": [ - "setuptools" - ], - "db-dtypes": [ - "setuptools" - ], - "dbf": [ - "setuptools" - ], - "dbfread": [ - "setuptools" - ], - "dbus-client-gen": [ - "setuptools" - ], - "dbus-fast": [ - "poetry-core", - "setuptools" - ], - "dbus-next": [ - "setuptools" - ], - "dbus-python": [ - "setuptools" - ], - "dbus-python-client-gen": [ - "setuptools" - ], - "dbus-signature-pyparsing": [ - "setuptools" - ], - "dbutils": [ - "setuptools" - ], - "ddsketch": [ - "setuptools" - ], - "ddt": [ - "setuptools" - ], - "ddtrace": [ - "cython", - "setuptools" - ], - "deal": [ - "flit-core", - "setuptools" - ], - "deal-solver": [ - "flit-core", - "setuptools" - ], - "deap": [ - "setuptools" - ], - "debian": [ - "setuptools" - ], - "debian-inspector": [ - "setuptools", - "setuptools-scm" - ], - "debtcollector": [ - "pbr", - "setuptools" - ], - "debts": [ - "setuptools" - ], - "debuglater": [ - "setuptools" - ], - "debugpy": [ - "setuptools" - ], - "decli": [ - "setuptools" - ], - "decopatch": [ - "setuptools", - "setuptools-scm" - ], - "decorator": [ - "setuptools" - ], - "deemix": [ - "setuptools" - ], - "deep-chainmap": [ - "setuptools" - ], - "deep-merge": [ - "setuptools" - ], - "deep-translator": [ - "setuptools" - ], - "deepdiff": [ - "setuptools" - ], - "deepdish": [ - "setuptools" - ], - "deepmerge": [ - "setuptools", - "setuptools-scm" - ], - "deeptoolsintervals": [ - "setuptools" - ], - "deepwave": [ - "setuptools" - ], - "deezer-py": [ - "setuptools" - ], - "deezer-python": [ - "poetry-core", - "setuptools" - ], - "defcon": [ - "setuptools", - "setuptools-scm" - ], - "deform": [ - "setuptools" - ], - "defusedxml": [ - "setuptools" - ], - "delegator-py": [ - "setuptools" - ], - "delorean": [ - "setuptools" - ], - "deltachat": [ - "setuptools", - "setuptools-scm" - ], - "deluge-client": [ - "setuptools" - ], - "demetriek": [ - "poetry-core" - ], - "demjson3": [ - "setuptools" - ], - "dendropy": [ - "setuptools" - ], - "denonavr": [ - "setuptools" - ], - "dependency-injector": [ - "setuptools" - ], - "deploykit": [ - "setuptools" - ], - "deprecated": [ - "setuptools" - ], - "deprecation": [ - "setuptools" - ], - "derpconf": [ - "setuptools" - ], - "desktop-notifier": [ - "setuptools" - ], - "detect-secrets": [ - "setuptools" - ], - "devito": [ - "setuptools" - ], - "devolo-home-control-api": [ - "setuptools", - "setuptools-scm" - ], - "devolo-plc-api": [ - "setuptools", - "setuptools-scm" - ], - "devtools": [ - "setuptools" - ], - "diagrams": [ - "poetry-core", - "setuptools" - ], - "diceware": [ - "setuptools" - ], - "dicom2nifti": [ - "setuptools" - ], - "dict2xml": [ - "setuptools" - ], - "dictdiffer": [ - "setuptools", - "setuptools-scm" - ], - "dictionaries": [ - "setuptools" - ], - "dictpath": [ - "setuptools" - ], - "dicttoxml": [ - "setuptools" - ], - "dicttoxml2": [ - "setuptools" - ], - "diff-cover": [ - "setuptools" - ], - "diff-match-patch": [ - "setuptools" - ], - "digi-xbee": [ - "setuptools" - ], - "digital-ocean": [ - "setuptools" - ], - "dill": [ - "setuptools" - ], - "dinghy": [ - "setuptools" - ], - "dingz": [ - "setuptools" - ], - "diofant": [ - "setuptools", - "setuptools-scm" - ], - "dipy": [ - "cython", - "setuptools" - ], - "directv": [ - "setuptools" - ], - "dirty-equals": [ - "poetry-core", - "setuptools" - ], - "discid": [ - "setuptools" - ], - "discogs-client": [ - "setuptools" - ], - "discordpy": [ - "setuptools" - ], - "discovery30303": [ - "poetry-core", - "setuptools" - ], - "diskcache": [ - "setuptools" - ], - "dissect": [ - "setuptools", - "setuptools-scm" - ], - "dissect-cim": [ - "setuptools", - "setuptools-scm" - ], - "dissect-clfs": [ - "setuptools", - "setuptools-scm" - ], - "dissect-cstruct": [ - "setuptools", - "setuptools-scm" - ], - "dissect-esedb": [ - "setuptools", - "setuptools-scm" - ], - "dissect-etl": [ - "setuptools", - "setuptools-scm" - ], - "dissect-eventlog": [ - "setuptools", - "setuptools-scm" - ], - "dissect-evidence": [ - "setuptools", - "setuptools-scm" - ], - "dissect-extfs": [ - "setuptools", - "setuptools-scm" - ], - "dissect-fat": [ - "setuptools", - "setuptools-scm" - ], - "dissect-ffs": [ - "setuptools", - "setuptools-scm" - ], - "dissect-hypervisor": [ - "setuptools", - "setuptools-scm" - ], - "dissect-ntfs": [ - "setuptools", - "setuptools-scm" - ], - "dissect-ole": [ - "setuptools", - "setuptools-scm" - ], - "dissect-regf": [ - "setuptools", - "setuptools-scm" - ], - "dissect-shellitem": [ - "setuptools", - "setuptools-scm" - ], - "dissect-sql": [ - "setuptools", - "setuptools-scm" - ], - "dissect-target": [ - "setuptools", - "setuptools-scm" - ], - "dissect-util": [ - "setuptools", - "setuptools-scm" - ], - "dissect-vmfs": [ - "setuptools", - "setuptools-scm" - ], - "dissect-volume": [ - "setuptools", - "setuptools-scm" - ], - "dissect-xfs": [ - "setuptools", - "setuptools-scm" - ], - "dissononce": [ - "setuptools" - ], - "distlib": [ - "setuptools" - ], - "distorm3": [ - "setuptools" - ], - "distrax": [ - "setuptools" - ], - "distributed": [ - "setuptools", - { - "buildSystem": "versioneer", - "from": "2.0.0" - } - ], - "distro": [ - "setuptools" - ], - "distutils-extra": [ - "setuptools" - ], - "dj-database-url": [ - "setuptools" - ], - "dj-email-url": [ - "setuptools" - ], - "dj-inmemorystorage": [ - "setuptools" - ], - "dj-rest-auth": [ - "setuptools" - ], - "dj-search-url": [ - "setuptools" - ], - "django": [ - "setuptools" - ], - "django-3": [ - "setuptools" - ], - "django-4": [ - "setuptools" - ], - "django-admin-sortable2": [ - "setuptools" - ], - "django-allauth": [ - "setuptools" - ], - "django-anymail": [ - "setuptools" - ], - "django-appconf": [ - "setuptools" - ], - "django-auth-ldap": [ - "setuptools", - "setuptools-scm" - ], - "django-bootstrap-form": [ - "setuptools" - ], - "django-cache-memoize": [ - "setuptools" - ], - "django-cache-url": [ - "setuptools" - ], - "django-cacheops": [ - "setuptools" - ], - "django-celery-beat": [ - "setuptools" - ], - "django-celery-email": [ - "setuptools" - ], - "django-classytags": [ - "setuptools" - ], - "django-cleanup": [ - "setuptools" - ], - "django-cockroachdb": [ - "setuptools" - ], - "django-colorfield": [ - "setuptools" - ], - "django-colorful": [ - "setuptools" - ], - "django-compat": [ - "setuptools" - ], - "django-compressor": [ - "setuptools" - ], - "django-configurations": [ - "setuptools", - "setuptools-scm" - ], - "django-contrib-comments": [ - "setuptools" - ], - "django-cors-headers": [ - "setuptools" - ], - "django-countries": [ - "setuptools" - ], - "django-coverage-plugin": [ - "setuptools" - ], - "django-crispy-forms": [ - "setuptools" - ], - "django-cryptography": [ - "setuptools" - ], - "django-csp": [ - "setuptools" - ], - "django-debug-toolbar": [ - { - "buildSystem": "setuptools", - "until": "3.8.0" - }, - { - "buildSystem": "hatchling", - "from": "3.8.0" - } - ], - "django-discover-runner": [ - "setuptools" - ], - "django-dynamic-preferences": [ - "setuptools" - ], - "django-encrypted-model-fields": [ - "poetry-core", - "setuptools" - ], - "django-environ": [ - "setuptools" - ], - "django-extensions": [ - "setuptools" - ], - "django-filter": [ - "setuptools" - ], - "django-floppyforms": [ - "setuptools" - ], - "django-formtools": [ - "setuptools", - "setuptools-scm" - ], - "django-graphiql-debug-toolbar": [ - "poetry-core", - "setuptools" - ], - "django-gravatar2": [ - "setuptools" - ], - "django-guardian": [ - "setuptools" - ], - "django-haystack": [ - "setuptools", - "setuptools-scm" - ], - "django-health-check": [ - "setuptools", - "setuptools-scm" - ], - "django-hijack": [ - "setuptools" - ], - "django-htmx": [ - "setuptools" - ], - "django-ipware": [ - "setuptools" - ], - "django-jinja": [ - "setuptools" - ], - "django-js-asset": [ - "setuptools" - ], - "django-logentry-admin": [ - "setuptools" - ], - "django-mailman3": [ - "setuptools" - ], - "django-maintenance-mode": [ - "setuptools" - ], - "django-model-utils": [ - "setuptools", - "setuptools-scm" - ], - "django-modelcluster": [ - "setuptools" - ], - "django-modeltranslation": [ - "setuptools" - ], - "django-mptt": [ - "setuptools" - ], - "django-multiselectfield": [ - "setuptools" - ], - "django-nested-admin": [ - "setuptools" - ], - "django-nose": [ - "setuptools" - ], - "django-oauth-toolkit": [ - "setuptools" - ], - "django-otp": [ - "setuptools" - ], - "django-paintstore": [ - "setuptools" - ], - "django-permissionedforms": [ - "setuptools" - ], - "django-pglocks": [ - "setuptools" - ], - "django-phonenumber-field": [ - "setuptools", - "setuptools-scm" - ], - "django-picklefield": [ - "setuptools" - ], - "django-polymorphic": [ - "setuptools" - ], - "django-postgresql-netfields": [ - "setuptools" - ], - "django-prometheus": [ - "setuptools" - ], - "django-q": [ - "poetry-core", - "setuptools" - ], - "django-ranged-response": [ - "setuptools" - ], - "django-raster": [ - "setuptools" - ], - "django-redis": [ - "setuptools" - ], - "django-registration": [ - "setuptools" - ], - "django-rest-auth": [ - "setuptools" - ], - "django-rest-polymorphic": [ - "setuptools" - ], - "django-rest-swagger": [ - "setuptools" - ], - "django-reversion": [ - "setuptools" - ], - "django-rosetta": [ - "setuptools" - ], - "django-rq": [ - "setuptools" - ], - "django-sesame": [ - "setuptools" - ], - "django-silk": [ - "setuptools", - "setuptools-scm" - ], - "django-simple-captcha": [ - "setuptools" - ], - "django-sites": [ - "setuptools" - ], - "django-sr": [ - "setuptools" - ], - "django-statici18n": [ - "setuptools" - ], - "django-storages": [ - "setuptools" - ], - "django-stubs": [ - "setuptools" - ], - "django-stubs-ext": [ - "setuptools" - ], - "django-tables2": [ - "setuptools" - ], - "django-tagging": [ - "setuptools" - ], - "django-taggit": [ - "setuptools" - ], - "django-tastypie": [ - "setuptools" - ], - "django-timezone-field": [ - "poetry-core", - "setuptools" - ], - "django-treebeard": [ - "setuptools" - ], - "django-types": [ - "poetry-core" - ], - "django-versatileimagefield": [ - "setuptools" - ], - "django-webpack-loader": [ - "setuptools" - ], - "django-widget-tweaks": [ - "setuptools", - "setuptools-scm" - ], - "djangoql": [ - "setuptools" - ], - "djangorestframework": [ - "setuptools" - ], - "djangorestframework-camel-case": [ - "setuptools" - ], - "djangorestframework-dataclasses": [ - "setuptools" - ], - "djangorestframework-guardian": [ - "setuptools" - ], - "djangorestframework-jwt": [ - "setuptools" - ], - "djangorestframework-recursive": [ - "setuptools" - ], - "djangorestframework-simplejwt": [ - "setuptools", - "setuptools-scm" - ], - "djangorestframework-stubs": [ - "setuptools" - ], - "djangorestframework-types": [ - "poetry" - ], - "djlint": [ - "poetry" - ], - "djmail": [ - "setuptools" - ], - "dkimpy": [ - "setuptools" - ], - "dlib": [ - "setuptools" - ], - "dlinfo": [ - "setuptools", - "setuptools-scm" - ], - "dlx": [ - "setuptools" - ], - "dm-env": [ - "setuptools" - ], - "dm-haiku": [ - "setuptools" - ], - "dm-sonnet": [ - "setuptools" - ], - "dm-tree": [ - "setuptools" - ], - "dmenu-python": [ - "setuptools" - ], - "dnachisel": [ - "setuptools" - ], - "dns": [ - "setuptools", - "setuptools-scm" - ], - "dnslib": [ - "setuptools" - ], - "dnspython": [ - "poetry-core", - "setuptools", - "setuptools-scm" - ], - "dnspythonchia": [ - "setuptools", - "setuptools-scm" - ], - "dnsq": [ - "setuptools" - ], - "doc8": [ - "pbr", - "setuptools", - "setuptools-scm" - ], - "docformatter": [ - { - "buildSystem": "poetry-core", - "from": "1.5.0" - }, - "setuptools" - ], - "docker": [ - "setuptools", - "setuptools-scm" - ], - "docker-py": [ - "setuptools" - ], - "docker-pycreds": [ - "setuptools" - ], - "dockerfile-parse": [ - "setuptools" - ], - "dockerpty": [ - "setuptools" - ], - "dockerspawner": [ - "setuptools" - ], - "docloud": [ - "setuptools" - ], - "docopt": [ - "setuptools" - ], - "docopt-ng": [ - "setuptools" - ], - "docplex": [ - "setuptools" - ], - "docrep": [ - "setuptools" - ], - "docstr-coverage": [ - "setuptools" - ], - "docstring-parser": [ - "poetry-core", - "setuptools" - ], - "docstring-to-markdown": [ - "setuptools" - ], - "doctest-ignore-unicode": [ - "setuptools" - ], - "docutils": [ - "setuptools" - ], - "docx2python": [ - "setuptools" - ], - "docx2txt": [ - "setuptools" - ], - "dodgy": [ - "setuptools" - ], - "dogpile-cache": [ - "setuptools" - ], - "dogtail": [ - "setuptools" - ], - "doit": [ - "setuptools" - ], - "doit-py": [ - "setuptools" - ], - "domeneshop": [ - "setuptools" - ], - "dominate": [ - "setuptools" - ], - "doorbirdpy": [ - "setuptools" - ], - "dopy": [ - "setuptools" - ], - "dot2tex": [ - "setuptools" - ], - "dotmap": [ - "setuptools" - ], - "dotty-dict": [ - "poetry-core", - "setuptools", - "setuptools-scm" - ], - "downloader-cli": [ - "setuptools" - ], - "dparse": [ - "setuptools" - ], - "dparse2": [ - "setuptools" - ], - "dpath": [ - "setuptools" - ], - "dpcontracts": [ - "setuptools" - ], - "dpkt": [ - "setuptools" - ], - "draftjs-exporter": [ - "setuptools" - ], - "dragonfly": [ - "setuptools" - ], - "dremel3dpy": [ - "setuptools" - ], - "drf-jwt": [ - "setuptools" - ], - "drf-nested-routers": [ - "setuptools" - ], - "drf-spectacular": [ - "setuptools" - ], - "drf-spectacular-sidecar": [ - "setuptools" - ], - "drf-yasg": [ - "setuptools", - "setuptools-scm" - ], - "drivelib": [ - "setuptools" - ], - "drms": [ - "setuptools", - "setuptools-scm" - ], - "dropbox": [ - "setuptools" - ], - "ds-store": [ - "setuptools" - ], - "ds4drv": [ - "setuptools" - ], - "dsinternals": [ - "setuptools" - ], - "dsmr-parser": [ - "setuptools" - ], - "dtlssocket": [ - "cython", - "setuptools" - ], - "ducc0": [ - "setuptools" - ], - "duckdb": [ - "pybind11", - "setuptools", - "setuptools-scm" - ], - "duckdb-engine": [ - "poetry-core", - "setuptools" - ], - "duecredit": [ - "setuptools" - ], - "duet": [ - "setuptools" - ], - "dufte": [ - "setuptools" - ], - "dugong": [ - "setuptools" - ], - "dulwich": [ - "setuptools" - ], - "dunamai": [ - "poetry-core", - "setuptools" - ], - "dungeon-eos": [ - "setuptools" - ], - "duo-client": [ - "setuptools" - ], - "durus": [ - "setuptools" - ], - "dvc-data": [ - "setuptools", - "setuptools-scm" - ], - "dvc-objects": [ - "setuptools", - "setuptools-scm" - ], - "dvc-render": [ - "setuptools", - "setuptools-scm" - ], - "dvc-task": [ - "setuptools", - "setuptools-scm" - ], - "dvclive": [ - "setuptools" - ], - "dwdwfsapi": [ - "setuptools" - ], - "dyn": [ - "setuptools" - ], - "dynalite-devices": [ - "setuptools" - ], - "dynd": [ - "cython", - "setuptools" - ], - "eagle100": [ - "setuptools" - ], - "easy-thumbnails": [ - "setuptools" - ], - "easydict": [ - "setuptools" - ], - "easygui": [ - "setuptools" - ], - "easyprocess": [ - "setuptools" - ], - "easywatch": [ - "setuptools" - ], - "ebaysdk": [ - "setuptools" - ], - "ec2instanceconnectcli": [ - "setuptools" - ], - "ecdsa": [ - "setuptools" - ], - "ecoaliface": [ - "setuptools" - ], - "ecos": [ - "setuptools" - ], - "ecpy": [ - "setuptools" - ], - "ecs-logging": [ - "flit-core", - "setuptools" - ], - "ed25519": [ - "setuptools" - ], - "edalize": [ - "setuptools" - ], - "editables": [ - "setuptools" - ], - "editdistance": [ - "cython", - "setuptools" - ], - "editdistance-s": [ - "setuptools" - ], - "editorconfig": [ - "setuptools" - ], - "edward": [ - "setuptools" - ], - "eebrightbox": [ - "pbr" - ], - "effect": [ - "setuptools" - ], - "eggdeps": [ - "setuptools" - ], - "egginstallhook": [ - "setuptools" - ], - "einops": [ - "setuptools" - ], - "eiswarnung": [ - "poetry-core", - "setuptools" - ], - "elastic-apm": [ - "setuptools" - ], - "elasticsearch": [ - "setuptools" - ], - "elasticsearch-dsl": [ - "setuptools" - ], - "elasticsearchdsl": [ - "setuptools" - ], - "elegy": [ - "poetry", - "setuptools" - ], - "elementpath": [ - "setuptools" - ], - "elevate": [ - "setuptools", - "setuptools-scm" - ], - "elgato": [ - "poetry-core", - "setuptools" - ], - "eliot": [ - "setuptools" - ], - "eliqonline": [ - "setuptools" - ], - "elkm1-lib": [ - "poetry-core", - "setuptools" - ], - "elmax": [ - "poetry-core", - "setuptools" - ], - "elmax-api": [ - "setuptools" - ], - "email-validator": [ - "setuptools" - ], - "emailthreads": [ - "setuptools" - ], - "embit": [ - "setuptools" - ], - "embrace": [ - "setuptools" - ], - "emcee": [ - "setuptools", - "setuptools-scm" - ], - "emoji": [ - "setuptools" - ], - "empty-files": [ - "setuptools" - ], - "empy": [ - "setuptools" - ], - "emulated-roku": [ - "setuptools" - ], - "emv": [ - "setuptools" - ], - "enaml": [ - "setuptools", - "setuptools-scm" - ], - "enamlx": [ - "setuptools" - ], - "enhancements": [ - "setuptools" - ], - "enlighten": [ - "setuptools" - ], - "enocean": [ - "setuptools" - ], - "enrich": [ - "setuptools", - "setuptools-scm" - ], - "entrance": [ - "setuptools" - ], - "entrance-with-router-features": [ - "setuptools" - ], - "entry-points-txt": [ - "setuptools" - ], - "entrypoint2": [ - "setuptools" - ], - "entrypoints": [ - "flit", - "flit-core", - "setuptools" - ], - "enturclient": [ - "poetry-core", - "setuptools" - ], - "enum-compat": [ - "setuptools" - ], - "enum34": [ - "setuptools" - ], - "enumatch": [ - "poetry" - ], - "env-canada": [ - "setuptools" - ], - "envier": [ - "setuptools" - ], - "environmental-override": [ - "setuptools" - ], - "environs": [ - "setuptools" - ], - "envisage": [ - "setuptools" - ], - "envoy-reader": [ - "setuptools" - ], - "envoy-utils": [ - "setuptools" - ], - "envs": [ - "poetry-core", - "setuptools" - ], - "enzyme": [ - "setuptools" - ], - "epc": [ - "setuptools" - ], - "ephem": [ - "setuptools" - ], - "ephemeral-port-reserve": [ - "setuptools" - ], - "epson-projector": [ - "setuptools" - ], - "eradicate": [ - "setuptools" - ], - "erppeek": [ - "setuptools" - ], - "escapism": [ - "setuptools" - ], - "esprima": [ - "setuptools" - ], - "et-xmlfile": [ - "setuptools" - ], - "etcd": [ - "setuptools" - ], - "ete3": [ - "setuptools" - ], - "etebase": [ - "setuptools" - ], - "etebase-server": [ - "setuptools" - ], - "etelemetry": [ - "setuptools" - ], - "eternalegypt": [ - "setuptools" - ], - "etesync": [ - "setuptools" - ], - "eth-abi": [ - "setuptools" - ], - "eth-account": [ - "setuptools" - ], - "eth-hash": [ - "setuptools" - ], - "eth-keyfile": [ - "setuptools" - ], - "eth-keys": [ - "setuptools" - ], - "eth-rlp": [ - "setuptools" - ], - "eth-typing": [ - "setuptools" - ], - "eth-utils": [ - "setuptools" - ], - "etils": [ - "flit-core", - "setuptools" - ], - "etuples": [ - "setuptools" - ], - "ev3dev2": [ - "setuptools" - ], - "evdev": [ - "setuptools" - ], - "eve": [ - "setuptools" - ], - "eventlet": [ - "setuptools" - ], - "events": [ - "setuptools" - ], - "evohome-async": [ - "setuptools" - ], - "evtx": [ - "setuptools" - ], - "ewmh": [ - "setuptools" - ], - "exceptiongroup": [ - "flit-core", - "flit-scm", - "flit-core", - "setuptools" - ], - "exchangelib": [ - "setuptools" - ], - "exdown": [ - "setuptools" - ], - "execnet": [ - "setuptools", - "setuptools-scm" - ], - "executing": [ - "setuptools", - "setuptools-scm" - ], - "executor": [ - "setuptools" - ], - "exif": [ - "setuptools" - ], - "exifread": [ - "setuptools" - ], - "expandvars": [ - "setuptools" - ], - "expects": [ - "setuptools" - ], - "expecttest": [ - "poetry-core", - "setuptools" - ], - "expiringdict": [ - "setuptools" - ], - "explorerscript": [ - "setuptools" - ], - "exrex": [ - "setuptools" - ], - "extractcode": [ - "setuptools", - "setuptools-scm" - ], - "extractcode-7z": [ - "setuptools" - ], - "extractcode-libarchive": [ - "setuptools" - ], - "extras": [ - "setuptools" - ], - "eyed3": [ - "setuptools" - ], - "ezdxf": [ - "setuptools" - ], - "ezyrb": [ - "setuptools" - ], - "f90nml": [ - "setuptools", - "setuptools-scm" - ], - "faadelays": [ - "setuptools" - ], - "fabric": [ - "setuptools" - ], - "fabric2": [ - "setuptools" - ], - "fabric3": [ - "setuptools" - ], - "fabulous": [ - "setuptools" - ], - "face": [ - "setuptools" - ], - "face-recognition": [ - "setuptools" - ], - "face-recognition-models": [ - "setuptools" - ], - "facebook-sdk": [ - "setuptools" - ], - "facedancer": [ - "setuptools" - ], - "factory-boy": [ - "setuptools" - ], - "faiss": [ - "setuptools" - ], - "fake-useragent": [ - "setuptools" - ], - "faker": [ - "setuptools" - ], - "fakeredis": [ - "poetry-core", - "setuptools" - ], - "falcon": [ - "cython", - "setuptools" - ], - "fancycompleter": [ - "setuptools" - ], - "faraday-agent-parameters-types": [ - "setuptools" - ], - "faraday-plugins": [ - "setuptools" - ], - "fastapi": [ - "flit-core", - "hatchling", - "setuptools" - ], - "fastapi-csrf-protect": [ - "poetry-core" - ], - "fastapi-mail": [ - "hatchling", - "poetry-core", - "setuptools" - ], - "fastapi-restful": [ - "poetry" - ], - "fastapi-utils": [ - "poetry" - ], - "fastavro": [ - "cython", - "setuptools" - ], - "fastbencode": [ - "cython", - "setuptools" - ], - "fastcache": [ - "setuptools" - ], - "fastcore": [ - "setuptools" - ], - "fastdiff": [ - "setuptools" - ], - "fastdtw": [ - "cython", - "setuptools" - ], - "fastecdsa": [ - "setuptools" - ], - "fasteners": [ - "setuptools" - ], - "fastentrypoints": [ - "setuptools" - ], - "fastimport": [ - "setuptools" - ], - "fastjsonschema": [ - "setuptools" - ], - "fastnumbers": [ - "setuptools" - ], - "fastpair": [ - "setuptools" - ], - "fastparquet": [ - "setuptools" - ], - "fastpbkdf2": [ - "setuptools" - ], - "fastprogress": [ - "setuptools" - ], - "fastrlock": [ - "cython", - "setuptools" - ], - "fasttext": [ - "setuptools" - ], - "faust-streaming": [ - "setuptools" - ], - "favicon": [ - "setuptools" - ], - "fb-re2": [ - "setuptools" - ], - "fe25519": [ - "setuptools" - ], - "feedgen": [ - "setuptools" - ], - "feedgenerator": [ - "setuptools" - ], - "feedparser": [ - "setuptools" - ], - "fenics": [ - "setuptools" - ], - "ffcv": [ - "setuptools" - ], - "ffmpeg-progress-yield": [ - "setuptools" - ], - "ffmpeg-python": [ - "setuptools" - ], - "ffmpy": [ - "setuptools" - ], - "fhconfparser": [ - "poetry-core" - ], - "fiblary3-fork": [ - "setuptools" - ], - "fido2": [ - "poetry-core", - "setuptools" - ], - "fields": [ - "setuptools" - ], - "file-read-backwards": [ - "setuptools" - ], - "filebrowser-safe": [ - "setuptools" - ], - "filebytes": [ - "setuptools" - ], - "filecheck": [ - "poetry-core", - "setuptools" - ], - "filelock": [ - { - "buildSystem": "setuptools", - "until": "3.9.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "3.9.0" - }, - { - "buildSystem": "hatchling", - "from": "3.9.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "3.9.0" - } - ], - "filemagic": [ - "setuptools" - ], - "filetype": [ - "setuptools" - ], - "filterpy": [ - "setuptools" - ], - "finalfusion": [ - "cython", - "setuptools" - ], - "findimports": [ - "setuptools" - ], - "findpython": [ - "setuptools" - ], - "fingerprints": [ - "setuptools" - ], - "finitude": [ - "setuptools" - ], - "fints": [ - "setuptools" - ], - "fiona": [ - { - "buildSystem": "setuptools", - "until": "1.9.0" - }, - { - "buildSystem": "cython", - "from": "1.9.0" - } - ], - "fipy": [ - "setuptools" - ], - "fire": [ - "setuptools" - ], - "fireflyalgorithm": [ - "poetry-core", - "setuptools" - ], - "firetv": [ - "setuptools" - ], - "first": [ - "setuptools" - ], - "fitbit": [ - "setuptools" - ], - "fivem-api": [ - "setuptools", - "setuptools-scm" - ], - "fixerio": [ - "setuptools" - ], - "fixtures": [ - "pbr", - "setuptools" - ], - "fjaraskupan": [ - "setuptools" - ], - "flake8": [ - "setuptools" - ], - "flake8-blind-except": [ - "setuptools" - ], - "flake8-bugbear": [ - "setuptools" - ], - "flake8-builtins": [ - "setuptools" - ], - "flake8-coding": [ - "setuptools" - ], - "flake8-commas": [ - "setuptools" - ], - "flake8-comprehensions": [ - "setuptools" - ], - "flake8-debugger": [ - "poetry-core", - "setuptools" - ], - "flake8-deprecated": [ - "setuptools" - ], - "flake8-docstrings": [ - "setuptools" - ], - "flake8-ensure-ascii": [ - "setuptools" - ], - "flake8-future-import": [ - "setuptools" - ], - "flake8-import-order": [ - "setuptools" - ], - "flake8-length": [ - "setuptools" - ], - "flake8-mock": [ - "setuptools" - ], - "flake8-mutable": [ - "setuptools" - ], - "flake8-noqa": [ - "setuptools" - ], - "flake8-pep3101": [ - "setuptools" - ], - "flake8-plone-hasattr": [ - "setuptools" - ], - "flake8-plugin-utils": [ - "poetry" - ], - "flake8-polyfill": [ - "setuptools" - ], - "flake8-print": [ - "poetry-core" - ], - "flake8-pyprojecttoml": [ - "setuptools" - ], - "flake8-pytest-style": [ - "poetry-core" - ], - "flake8-quotes": [ - "setuptools" - ], - "flake8-simplify": [ - "setuptools" - ], - "flake8-string-format": [ - "setuptools" - ], - "flake8-super-call": [ - "setuptools" - ], - "flake8-todo": [ - "setuptools" - ], - "flake8-tuple": [ - "setuptools" - ], - "flaky": [ - "setuptools" - ], - "flametree": [ - "setuptools" - ], - "flammkuchen": [ - "setuptools" - ], - "flanker": [ - "setuptools" - ], - "flashtext": [ - "setuptools" - ], - "flask": [ - "setuptools" - ], - "flask-admin": [ - "setuptools" - ], - "flask-api": [ - "setuptools" - ], - "flask-appbuilder": [ - "setuptools" - ], - "flask-assets": [ - "setuptools" - ], - "flask-autoindex": [ - "setuptools" - ], - "flask-babel": [ - "setuptools" - ], - "flask-babelex": [ - "setuptools" - ], - "flask-basicauth": [ - "setuptools" - ], - "flask-bcrypt": [ - "setuptools" - ], - "flask-bootstrap": [ - "setuptools" - ], - "flask-caching": [ - "setuptools" - ], - "flask-common": [ - "setuptools" - ], - "flask-compress": [ - "setuptools", - "setuptools-scm" - ], - "flask-cors": [ - "setuptools" - ], - "flask-elastic": [ - "setuptools" - ], - "flask-gravatar": [ - "setuptools" - ], - "flask-httpauth": [ - "setuptools" - ], - "flask-jwt-extended": [ - "setuptools" - ], - "flask-limiter": [ - "setuptools" - ], - "flask-login": [ - "setuptools" - ], - "flask-mail": [ - "setuptools" - ], - "flask-mailman": [ - "poetry-core" - ], - "flask-marshmallow": [ - "setuptools" - ], - "flask-migrate": [ - "setuptools" - ], - "flask-minio": [ - "pytest-runner", - "setuptools" - ], - "flask-mongoengine": [ - "setuptools" - ], - "flask-openid": [ - "setuptools" - ], - "flask-paginate": [ - "setuptools" - ], - "flask-paranoid": [ - "setuptools" - ], - "flask-principal": [ - "setuptools" - ], - "flask-pymongo": [ - "setuptools" - ], - "flask-restful": [ - "setuptools" - ], - "flask-restplus": [ - "setuptools" - ], - "flask-restx": [ - "setuptools" - ], - "flask-reverse-proxy-fix": [ - "setuptools" - ], - "flask-script": [ - "setuptools" - ], - "flask-seasurf": [ - "setuptools" - ], - "flask-security-too": [ - "setuptools" - ], - "flask-session": [ - "setuptools" - ], - "flask-silk": [ - "setuptools" - ], - "flask-socketio": [ - "setuptools" - ], - "flask-sockets": [ - "setuptools" - ], - "flask-sqlalchemy": [ - "setuptools" - ], - "flask-sslify": [ - "setuptools" - ], - "flask-swagger": [ - "setuptools" - ], - "flask-swagger-ui": [ - "setuptools" - ], - "flask-talisman": [ - "setuptools" - ], - "flask-testing": [ - "setuptools" - ], - "flask-versioned": [ - "setuptools" - ], - "flask-wtf": [ - "setuptools" - ], - "flaskbabel": [ - "setuptools" - ], - "flatbuffers": [ - "setuptools" - ], - "flatdict": [ - "setuptools" - ], - "flatten-dict": [ - "poetry-core", - "setuptools" - ], - "flax": [ - "setuptools" - ], - "fleep": [ - "setuptools" - ], - "flet": [ - "poetry-core" - ], - "flet-core": [ - "poetry-core", - "setuptools" - ], - "flexmock": [ - "setuptools" - ], - "flickrapi": [ - "setuptools" - ], - "flipr-api": [ - "poetry-core", - "setuptools" - ], - "flit": [ - "flit-core" - ], - "flit-scm": [ - "flit-core", - "setuptools-scm" - ], - "flow-record": [ - "setuptools", - "setuptools-scm" - ], - "flower": [ - "setuptools" - ], - "flowlogs-reader": [ - "setuptools" - ], - "fluent-logger": [ - "setuptools" - ], - "flufl-bounce": [ - "setuptools" - ], - "flufl-i18n": [ - "setuptools" - ], - "flufl-lock": [ - "setuptools" - ], - "flux-led": [ - "setuptools" - ], - "flynt": [ - "setuptools" - ], - "fn": [ - "setuptools" - ], - "fnvhash": [ - "setuptools" - ], - "folium": [ - "setuptools", - "setuptools-scm" - ], - "fontmake": [ - "setuptools", - "setuptools-scm" - ], - "fontmath": [ - "setuptools", - "setuptools-scm" - ], - "fontparts": [ - "setuptools", - "setuptools-scm" - ], - "fontpens": [ - "setuptools" - ], - "fonttools": [ - "setuptools", - "setuptools-scm" - ], - "foobot-async": [ - "setuptools" - ], - "foolscap": [ - "setuptools" - ], - "forbiddenfruit": [ - "setuptools" - ], - "fordpass": [ - "setuptools" - ], - "forecast-solar": [ - "setuptools" - ], - "formbox": [ - "flit-core", - "setuptools" - ], - "formencode": [ - "setuptools", - "setuptools-scm" - ], - "fortiosapi": [ - "setuptools" - ], - "foundationdb51": [ - "setuptools" - ], - "foundationdb52": [ - "setuptools" - ], - "foundationdb60": [ - "setuptools" - ], - "foundationdb61": [ - "setuptools" - ], - "fountains": [ - "setuptools" - ], - "foxdot": [ - "setuptools" - ], - "fpdf": [ - "setuptools" - ], - "fpylll": [ - "cython", - "setuptools" - ], - "fpyutils": [ - "setuptools" - ], - "fqdn": [ - "setuptools" - ], - "freebox-api": [ - "poetry-core", - "setuptools" - ], - "freetype-py": [ - "setuptools", - "setuptools-scm" - ], - "freezegun": [ - "setuptools" - ], - "frigidaire": [ - "setuptools" - ], - "frilouz": [ - "setuptools" - ], - "fritzconnection": [ - "setuptools" - ], - "fritzprofiles": [ - "setuptools" - ], - "frozendict": [ - "setuptools" - ], - "frozenlist": [ - "cython", - "setuptools" - ], - "fs": [ - "setuptools" - ], - "fs-s3fs": [ - "setuptools" - ], - "fsspec": [ - "setuptools" - ], - "ftfy": [ - "poetry", - "setuptools" - ], - "ftputil": [ - "setuptools" - ], - "func-timeout": [ - "setuptools" - ], - "funcparserlib": [ - "poetry-core", - "setuptools" - ], - "funcsigs": [ - "setuptools" - ], - "functorch": [ - "setuptools" - ], - "funcy": [ - "setuptools" - ], - "furl": [ - "setuptools" - ], - "furo": [ - "flit-core", - "setuptools" - ], - "fuse": [ - "setuptools" - ], - "fusepy": [ - "setuptools" - ], - "future": [ - "setuptools" - ], - "future-fstrings": [ - "setuptools" - ], - "future-typing": [ - "setuptools" - ], - "futures": [ - "setuptools" - ], - "futurist": [ - "pbr", - "setuptools" - ], - "fuzzyfinder": [ - "setuptools" - ], - "fuzzywuzzy": [ - "setuptools" - ], - "fx2": [ - "setuptools" - ], - "galario": [ - "cython" - ], - "galois": [ - "setuptools", - "setuptools-scm" - ], - "gamble": [ - "setuptools" - ], - "gaphas": [ - "poetry-core", - "setuptools" - ], - "garages-amsterdam": [ - "poetry-core", - "setuptools" - ], - "garminconnect": [ - "setuptools" - ], - "garminconnect-aio": [ - "setuptools" - ], - "garminconnect-ha": [ - "setuptools" - ], - "gast": [ - "setuptools" - ], - "gatt": [ - "setuptools" - ], - "gattlib": [ - "setuptools" - ], - "gb-io": [ - "setuptools" - ], - "gbinder-python": [ - "cython", - "setuptools" - ], - "gbulb": [ - "setuptools" - ], - "gcal-sync": [ - "setuptools" - ], - "gcovr": [ - "setuptools" - ], - "gcsfs": [ - "setuptools" - ], - "gdal": [ - "setuptools" - ], - "gdata": [ - "setuptools" - ], - "gdown": [ - "setuptools" - ], - "gdtoolkit": [ - "setuptools" - ], - "ge25519": [ - "setuptools" - ], - "gehomesdk": [ - "setuptools" - ], - "gekitchen": [ - "setuptools" - ], - "gemfileparser": [ - "setuptools" - ], - "genanki": [ - "setuptools" - ], - "generic": [ - "poetry-core", - "setuptools" - ], - "geniushub-client": [ - "setuptools" - ], - "genome-collector": [ - "setuptools" - ], - "genpy": [ - "setuptools" - ], - "genshi": [ - "setuptools" - ], - "gensim": [ - "cython", - "setuptools" - ], - "genson": [ - "setuptools" - ], - "gentools": [ - "setuptools" - ], - "genzshcomp": [ - "setuptools" - ], - "geoalchemy2": [ - "setuptools", - "setuptools-scm" - ], - "geocachingapi": [ - "setuptools", - "setuptools-scm" - ], - "geographiclib": [ - "setuptools" - ], - "geoip": [ - "setuptools" - ], - "geoip2": [ - "setuptools" - ], - "geojson": [ - "setuptools" - ], - "geojson-client": [ - "setuptools" - ], - "geomet": [ - "setuptools" - ], - "geometric": [ - "setuptools" - ], - "geopandas": [ - "setuptools" - ], - "geopy": [ - "setuptools" - ], - "georss-client": [ - "setuptools" - ], - "georss-generic-client": [ - "setuptools" - ], - "georss-ign-sismologia-client": [ - "setuptools" - ], - "georss-ingv-centro-nazionale-terremoti-client": [ - "setuptools" - ], - "georss-nrcan-earthquakes-client": [ - "setuptools" - ], - "georss-qld-bushfire-alert-client": [ - "setuptools" - ], - "georss-tfs-incidents-client": [ - "setuptools" - ], - "georss-wa-dfes-client": [ - "setuptools" - ], - "get-video-properties": [ - "setuptools" - ], - "getkey": [ - "setuptools" - ], - "getmac": [ - "setuptools" - ], - "gevent": [ - "setuptools" - ], - "gevent-socketio": [ - "setuptools" - ], - "gevent-websocket": [ - "setuptools" - ], - "geventhttpclient": [ - "setuptools" - ], - "gflags": [ - "setuptools" - ], - "ghapi": [ - "setuptools" - ], - "ghdiff": [ - "setuptools" - ], - "ghp-import": [ - "setuptools" - ], - "ghrepo-stats": [ - "setuptools" - ], - "gibberish-detector": [ - "setuptools" - ], - "gidgethub": [ - "flit-core", - "setuptools" - ], - "gigalixir": [ - "setuptools" - ], - "gin-config": [ - "setuptools" - ], - "gios": [ - "setuptools" - ], - "gipc": [ - "setuptools" - ], - "gistyc": [ - "setuptools" - ], - "git-annex-adapter": [ - "setuptools" - ], - "git-autoshare": [ - "setuptools-scm" - ], - "git-filter-repo": [ - "setuptools", - "setuptools-scm" - ], - "git-revise": [ - "setuptools" - ], - "git-sweep": [ - "setuptools" - ], - "gitdb": [ - "setuptools" - ], - "github-to-sqlite": [ - "setuptools" - ], - "github-webhook": [ - "setuptools" - ], - "github3-py": [ - "setuptools" - ], - "gitlint": [ - { - "buildSystem": "setuptools", - "until": "0.19" - }, - { - "buildSystem": "hatchling", - "from": "0.19" - }, - { - "buildSystem": "hatch-vcs", - "from": "0.19" - } - ], - "gitlint-core": [ - { - "buildSystem": "setuptools", - "until": "0.19" - }, - { - "buildSystem": "hatchling", - "from": "0.19" - }, - { - "buildSystem": "hatch-vcs", - "from": "0.19" - } - ], - "gitpython": [ - "setuptools" - ], - "glad": [ - "setuptools" - ], - "glances-api": [ - "poetry-core", - "setuptools" - ], - "glasgow": [ - "setuptools", - "setuptools-scm" - ], - "glcontext": [ - "setuptools" - ], - "glean-parser": [ - "setuptools", - "setuptools-scm" - ], - "glean-sdk": [ - "setuptools" - ], - "glfw": [ - "setuptools" - ], - "glob2": [ - "setuptools" - ], - "globus-sdk": [ - "setuptools" - ], - "glom": [ - "setuptools" - ], - "glymur": [ - "setuptools" - ], - "glyphslib": [ - "setuptools", - "setuptools-scm" - ], - "gmpy": [ - "setuptools" - ], - "gmpy2": [ - "setuptools" - ], - "gntp": [ - "setuptools" - ], - "gnureadline": [ - "setuptools" - ], - "goalzero": [ - "setuptools" - ], - "goobook": [ - "poetry-core", - "setuptools" - ], - "goocalendar": [ - "setuptools" - ], - "goodwe": [ - "setuptools" - ], - "google-api-core": [ - "setuptools" - ], - "google-api-python-client": [ - "setuptools" - ], - "google-auth": [ - "setuptools" - ], - "google-auth-httplib2": [ - "setuptools" - ], - "google-auth-oauthlib": [ - "setuptools" - ], - "google-cloud-access-context-manager": [ - "setuptools" - ], - "google-cloud-appengine-logging": [ - "setuptools" - ], - "google-cloud-asset": [ - "setuptools" - ], - "google-cloud-audit-log": [ - "setuptools" - ], - "google-cloud-automl": [ - "setuptools" - ], - "google-cloud-bigquery": [ - "setuptools" - ], - "google-cloud-bigquery-datatransfer": [ - "setuptools" - ], - "google-cloud-bigquery-logging": [ - "setuptools" - ], - "google-cloud-bigquery-storage": [ - "setuptools" - ], - "google-cloud-bigtable": [ - "setuptools" - ], - "google-cloud-compute": [ - "setuptools" - ], - "google-cloud-container": [ - "setuptools" - ], - "google-cloud-core": [ - "setuptools" - ], - "google-cloud-datacatalog": [ - "setuptools" - ], - "google-cloud-dataproc": [ - "setuptools" - ], - "google-cloud-datastore": [ - "setuptools" - ], - "google-cloud-dlp": [ - "setuptools" - ], - "google-cloud-dns": [ - "setuptools" - ], - "google-cloud-error-reporting": [ - "setuptools" - ], - "google-cloud-firestore": [ - "setuptools" - ], - "google-cloud-iam": [ - "setuptools" - ], - "google-cloud-iam-logging": [ - "setuptools" - ], - "google-cloud-iot": [ - "setuptools" - ], - "google-cloud-kms": [ - "setuptools" - ], - "google-cloud-language": [ - "setuptools" - ], - "google-cloud-logging": [ - "setuptools" - ], - "google-cloud-monitoring": [ - "setuptools" - ], - "google-cloud-org-policy": [ - "setuptools" - ], - "google-cloud-os-config": [ - "setuptools" - ], - "google-cloud-pubsub": [ - "setuptools" - ], - "google-cloud-redis": [ - "setuptools" - ], - "google-cloud-resource-manager": [ - "setuptools" - ], - "google-cloud-runtimeconfig": [ - "setuptools" - ], - "google-cloud-secret-manager": [ - "setuptools" - ], - "google-cloud-securitycenter": [ - "setuptools" - ], - "google-cloud-spanner": [ - "setuptools" - ], - "google-cloud-speech": [ - "setuptools" - ], - "google-cloud-storage": [ - "setuptools" - ], - "google-cloud-tasks": [ - "setuptools" - ], - "google-cloud-testutils": [ - "setuptools" - ], - "google-cloud-texttospeech": [ - "setuptools" - ], - "google-cloud-trace": [ - "setuptools" - ], - "google-cloud-translate": [ - "setuptools" - ], - "google-cloud-videointelligence": [ - "setuptools" - ], - "google-cloud-vision": [ - "setuptools" - ], - "google-cloud-websecurityscanner": [ - "setuptools" - ], - "google-compute-engine": [ - "setuptools" - ], - "google-crc32c": [ - "setuptools" - ], - "google-i18n-address": [ - "setuptools" - ], - "google-nest-sdm": [ - "setuptools" - ], - "google-pasta": [ - "setuptools" - ], - "google-re2": [ - "setuptools" - ], - "google-resumable-media": [ - "setuptools" - ], - "googleapis-common-protos": [ - "setuptools" - ], - "googlemaps": [ - "setuptools" - ], - "googletrans": [ - "setuptools" - ], - "gorilla": [ - "setuptools" - ], - "govee-ble": [ - "poetry-core", - "setuptools" - ], - "goveelights": [ - "setuptools" - ], - "gpapi": [ - "setuptools" - ], - "gpaw": [ - "setuptools" - ], - "gphoto2": [ - "setuptools" - ], - "gpiozero": [ - "setuptools" - ], - "gplaycli": [ - "setuptools" - ], - "gprof2dot": [ - "setuptools" - ], - "gps3": [ - "setuptools" - ], - "gpsoauth": [ - "setuptools" - ], - "gpt-2-simple": [ - "setuptools" - ], - "gpxpy": [ - "setuptools" - ], - "gpy": [ - "cython", - "setuptools" - ], - "gpyopt": [ - "cython", - "setuptools" - ], - "gql": [ - "setuptools" - ], - "gqt": [ - "setuptools" - ], - "gradient": [ - "setuptools" - ], - "gradient-statsd": [ - "setuptools" - ], - "gradient-utils": [ - "poetry-core", - "setuptools" - ], - "grammalecte": [ - "setuptools" - ], - "grandalf": [ - "setuptools" - ], - "graph-tool": [ - "setuptools" - ], - "grapheme": [ - "setuptools" - ], - "graphene": [ - "setuptools" - ], - "graphene-django": [ - "setuptools" - ], - "graphite-web": [ - "setuptools" - ], - "graphql-core": [ - "poetry-core", - "setuptools" - ], - "graphql-relay": [ - "poetry-core", - "setuptools" - ], - "graphql-server-core": [ - "setuptools" - ], - "graphql-subscription-manager": [ - "setuptools" - ], - "graphqlclient": [ - "setuptools" - ], - "graphtage": [ - "setuptools" - ], - "graphviz": [ - "setuptools" - ], - "grappelli-safe": [ - "setuptools" - ], - "greatfet": [ - "setuptools" - ], - "greeclimate": [ - "setuptools" - ], - "green": [ - "setuptools" - ], - "greeneye-monitor": [ - "setuptools" - ], - "greenlet": [ - "setuptools" - ], - "gremlinpython": [ - "setuptools" - ], - "grequests": [ - "setuptools" - ], - "gridnet": [ - "poetry-core", - "setuptools" - ], - "griffe": [ - "pdm-pep517", - "setuptools" - ], - "grip": [ - "setuptools" - ], - "groestlcoin-hash": [ - "setuptools" - ], - "growattserver": [ - "setuptools" - ], - "grpc-google-iam-v1": [ - "setuptools" - ], - "grpcio": [ - "cython", - "setuptools" - ], - "grpcio-gcp": [ - "setuptools" - ], - "grpcio-reflection": [ - "setuptools" - ], - "grpcio-status": [ - "setuptools" - ], - "grpcio-tools": [ - "setuptools" - ], - "grpclib": [ - "setuptools" - ], - "gruut": [ - "setuptools" - ], - "gruut-ipa": [ - "setuptools" - ], - "gsd": [ - "cython", - "setuptools" - ], - "gspread": [ - "setuptools" - ], - "gssapi": [ - "cython", - "setuptools" - ], - "gst-python": [ - "setuptools" - ], - "gtfs-realtime-bindings": [ - "setuptools" - ], - "gtimelog": [ - "setuptools" - ], - "gtts": [ - "setuptools" - ], - "gtts-token": [ - "setuptools" - ], - "gudhi": [ - "cython", - "setuptools" - ], - "guessit": [ - "setuptools" - ], - "guestfs": [ - "setuptools" - ], - "gumath": [ - "setuptools" - ], - "gunicorn": [ - "setuptools" - ], - "guppy3": [ - "setuptools" - ], - "gurobipy": [ - "setuptools" - ], - "guzzle-sphinx-theme": [ - "setuptools" - ], - "gviz-api": [ - "setuptools" - ], - "gvm-tools": [ - "poetry-core", - "setuptools" - ], - "gym": [ - "setuptools" - ], - "gyp": [ - "setuptools" - ], - "gypsum-dl": [ - "setuptools" - ], - "h11": [ - "setuptools" - ], - "h2": [ - "setuptools" - ], - "h3": [ - "cython", - "setuptools" - ], - "h5netcdf": [ - "setuptools", - "setuptools-scm" - ], - "h5py": [ - "cython", - "setuptools" - ], - "h5py-mpi": [ - "cython", - "setuptools" - ], - "ha-ffmpeg": [ - "setuptools" - ], - "ha-philipsjs": [ - "setuptools" - ], - "habanero": [ - "setuptools" - ], - "habitipy": [ - "setuptools" - ], - "hachoir": [ - "setuptools" - ], - "hacking": [ - "pbr", - "setuptools" - ], - "hahomematic": [ - "setuptools" - ], - "halo": [ - "setuptools" - ], - "halohome": [ - "setuptools" - ], - "hammett": [ - "setuptools" - ], - "hammock": [ - "setuptools" - ], - "handout": [ - "setuptools" - ], - "hangups": [ - "setuptools" - ], - "hap-python": [ - "setuptools" - ], - "hashids": [ - "flit-core" - ], - "hass-nabucasa": [ - "setuptools" - ], - "hatasmota": [ - "setuptools" - ], - "hatch-fancy-pypi-readme": [ - "hatchling", - "setuptools" - ], - "hatch-nodejs-version": [ - "hatchling" - ], - "hatch-vcs": [ - "hatchling", - "setuptools", - "setuptools-scm" - ], - "hatchling": [ - "setuptools" - ], - "haversine": [ - "setuptools" - ], - "hawkauthlib": [ - "setuptools" - ], - "hcloud": [ - "setuptools" - ], - "hcs-utils": [ - "setuptools" - ], - "hdate": [ - "poetry-core", - "setuptools" - ], - "hdbscan": [ - "cython", - "setuptools" - ], - "hdfs": [ - "setuptools" - ], - "hdmedians": [ - "cython", - "setuptools" - ], - "headerparser": [ - "setuptools" - ], - "heapdict": [ - "setuptools" - ], - "heatzypy": [ - "setuptools" - ], - "helpdev": [ - "setuptools" - ], - "helper": [ - "setuptools" - ], - "hepunits": [ - "setuptools", - "setuptools-scm" - ], - "herepy": [ - "setuptools" - ], - "hetzner": [ - "setuptools" - ], - "hexbytes": [ - "setuptools" - ], - "hexdump": [ - "setuptools" - ], - "hg-evolve": [ - "setuptools" - ], - "hg-git": [ - "setuptools" - ], - "hglib": [ - "setuptools" - ], - "hickle": [ - "setuptools" - ], - "hid": [ - "setuptools" - ], - "hidapi": [ - "cython", - "setuptools" - ], - "hieroglyph": [ - "setuptools" - ], - "hijri-converter": [ - "setuptools" - ], - "hikvision": [ - "setuptools" - ], - "hiredis": [ - "setuptools" - ], - "hiro": [ - "setuptools" - ], - "hiyapyco": [ - "setuptools" - ], - "hjson": [ - "setuptools" - ], - "hkavr": [ - "setuptools" - ], - "hkdf": [ - "setuptools" - ], - "hlk-sw16": [ - "setuptools" - ], - "hmmlearn": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "hocr-tools": [ - "setuptools" - ], - "hole": [ - "setuptools" - ], - "holidays": [ - "setuptools" - ], - "holoviews": [ - "setuptools" - ], - "home-assistant-bluetooth": [ - "cython", - "poetry-core", - "setuptools" - ], - "homeassistant-pyozw": [ - "cython", - "setuptools" - ], - "homeconnect": [ - "setuptools" - ], - "homematicip": [ - "setuptools" - ], - "homepluscontrol": [ - "setuptools" - ], - "hopcroftkarp": [ - "setuptools" - ], - "howdoi": [ - "setuptools" - ], - "hpack": [ - "setuptools" - ], - "hpccm": [ - "setuptools" - ], - "hs-dbus-signature": [ - "setuptools" - ], - "hsaudiotag3k": [ - "setuptools" - ], - "hsluv": [ - "setuptools" - ], - "hstspreload": [ - "setuptools" - ], - "html-sanitizer": [ - "setuptools" - ], - "html-tag-names": [ - "poetry" - ], - "html-void-elements": [ - "poetry" - ], - "html2text": [ - "setuptools" - ], - "html5-parser": [ - "setuptools" - ], - "html5lib": [ - "flit-core", - "setuptools" - ], - "htmllaundry": [ - "setuptools" - ], - "htmlmin": [ - "setuptools" - ], - "htseq": [ - "cython", - "setuptools" - ], - "httmock": [ - "setuptools" - ], - "http-ece": [ - "setuptools" - ], - "http-message-signatures": [ - "setuptools", - "setuptools-scm" - ], - "http-parser": [ - "setuptools" - ], - "http-sfv": [ - "setuptools" - ], - "httpagentparser": [ - "setuptools" - ], - "httpauth": [ - "setuptools" - ], - "httpbin": [ - "setuptools" - ], - "httpcore": [ - "setuptools" - ], - "httpie": [ - "setuptools" - ], - "httpie-ntlm": [ - "setuptools" - ], - "httplib2": [ - "setuptools" - ], - "httpretty": [ - "setuptools" - ], - "httpserver": [ - "setuptools" - ], - "httpsig": [ - "setuptools", - "setuptools-scm" - ], - "httptools": [ - "setuptools" - ], - "httpx": [ - { - "buildSystem": "hatch-fancy-pypi-readme", - "from": "0.23.1" - }, - { - "buildSystem": "hatchling", - "from": "0.23.1" - }, - { - "buildSystem": "setuptools", - "until": "0.23.1" - } - ], - "httpx-auth": [ - "setuptools" - ], - "httpx-ntlm": [ - "setuptools" - ], - "httpx-socks": [ - "setuptools" - ], - "huawei-lte-api": [ - "setuptools" - ], - "huey": [ - "setuptools" - ], - "huggingface-hub": [ - "setuptools" - ], - "huisbaasje-client": [ - "setuptools" - ], - "humanfriendly": [ - "setuptools" - ], - "humanize": [ - { - "buildSystem": "setuptools", - "until": "4.6.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "4.6.0" - }, - { - "buildSystem": "hatchling", - "from": "4.6.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "4.6.0" - } - ], - "humblewx": [ - "setuptools" - ], - "hupper": [ - "setuptools" - ], - "huum": [ - "poetry-core", - "setuptools" - ], - "hvac": [ - { - "buildSystem": "setuptools", - "until": "1.0.0" - }, - { - "buildSystem": "poetry-core", - "from": "1.0.0" - } - ], - "hvplot": [ - "setuptools" - ], - "hwi": [ - "setuptools" - ], - "hy": [ - "setuptools" - ], - "hydra": [ - "setuptools" - ], - "hydra-check": [ - "poetry-core", - "setuptools" - ], - "hydrawiser": [ - "setuptools" - ], - "hypchat": [ - "setuptools" - ], - "hypercorn": [ - "poetry-core", - "setuptools" - ], - "hyperframe": [ - "setuptools" - ], - "hyperion-py": [ - "poetry-core", - "setuptools" - ], - "hyperlink": [ - "setuptools" - ], - "hyperopt": [ - "setuptools" - ], - "hypothesis": [ - "setuptools" - ], - "hypothesis-auto": [ - "poetry-core", - "setuptools" - ], - "hypothesis-graphql": [ - "poetry" - ], - "hypothesmith": [ - "setuptools" - ], - "hyppo": [ - "setuptools" - ], - "hyrule": [ - "setuptools" - ], - "i-pi": [ - "setuptools" - ], - "i2c-tools": [ - "setuptools" - ], - "i2csense": [ - "setuptools" - ], - "i3-py": [ - "setuptools" - ], - "i3ipc": [ - "setuptools" - ], - "iapws": [ - "setuptools" - ], - "iaqualink": [ - "hatch-vcs", - "hatchling", - "setuptools" - ], - "ibeacon-ble": [ - "poetry-core" - ], - "ibis": [ - "setuptools" - ], - "ibis-framework": [ - "poetry-core", - "setuptools" - ], - "ibm-cloud-sdk-core": [ - "setuptools" - ], - "ibm-watson": [ - "setuptools" - ], - "icalendar": [ - "setuptools" - ], - "icecream": [ - "setuptools" - ], - "icmplib": [ - "pbr", - "setuptools" - ], - "icnsutil": [ - "setuptools" - ], - "icontract": [ - "setuptools" - ], - "ics": [ - "setuptools" - ], - "idasen": [ - "poetry-core", - "setuptools" - ], - "identify": [ - "setuptools" - ], - "idna": [ - "flit-core", - "setuptools" - ], - "idna-ssl": [ - "setuptools" - ], - "ifaddr": [ - "setuptools" - ], - "ifconfig-parser": [ - "setuptools" - ], - "ifcopenshell": [ - "setuptools" - ], - "ignite": [ - "setuptools" - ], - "igraph": [ - "setuptools" - ], - "ihatemoney": [ - "setuptools" - ], - "ijson": [ - "setuptools" - ], - "ilua": [ - "setuptools" - ], - "image-go-nord": [ - "setuptools" - ], - "image-match": [ - "setuptools" - ], - "imagecodecs-lite": [ - "cython", - "setuptools" - ], - "imagecorruptions": [ - "setuptools" - ], - "imageio": [ - "setuptools" - ], - "imageio-ffmpeg": [ - "setuptools" - ], - "imagesize": [ - "setuptools" - ], - "imantics": [ - "setuptools" - ], - "imap-tools": [ - "setuptools" - ], - "imapclient": [ - "setuptools" - ], - "imaplib2": [ - "setuptools" - ], - "imbalanced-learn": [ - "setuptools" - ], - "img2pdf": [ - "setuptools" - ], - "imgsize": [ - "setuptools" - ], - "iminuit": [ - "setuptools" - ], - "immutabledict": [ - "poetry-core", - "setuptools" - ], - "immutables": [ - "setuptools" - ], - "impacket": [ - "setuptools" - ], - "importlab": [ - "setuptools" - ], - "importlib-metadata": [ - "setuptools", - "setuptools-scm" - ], - "importlib-resources": [ - "setuptools", - "setuptools-scm" - ], - "importmagic": [ - "setuptools" - ], - "impyla": [ - "setuptools" - ], - "imread": [ - "setuptools" - ], - "imutils": [ - "setuptools" - ], - "in-place": [ - "setuptools" - ], - "incomfort-client": [ - "setuptools" - ], - "incremental": [ - "setuptools" - ], - "infinity": [ - "setuptools" - ], - "inflect": [ - "setuptools", - "setuptools-scm" - ], - "inflection": [ - "setuptools" - ], - "influxdb": [ - "setuptools" - ], - "influxdb-client": [ - "setuptools" - ], - "inform": [ - "setuptools" - ], - "iniconfig": [ - { - "buildSystem": "setuptools", - "until": "2.0.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "2.0.0" - }, - { - "buildSystem": "hatchling", - "from": "2.0.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "2.0.0" - } - ], - "inifile": [ - "setuptools" - ], - "iniparse": [ - "setuptools" - ], - "injector": [ - "setuptools" - ], - "inkbird-ble": [ - "poetry-core", - "setuptools" - ], - "inkex": [ - "setuptools" - ], - "inotify": [ - "setuptools" - ], - "inotify-simple": [ - "setuptools" - ], - "inotifyrecursive": [ - "setuptools" - ], - "inquirer": [ - "poetry-core", - "setuptools" - ], - "insegel": [ - "setuptools" - ], - "insights-core": [ - "setuptools" - ], - "installer": [ - "flit-core" - ], - "insteon-frontend-home-assistant": [ - "setuptools" - ], - "intake": [ - "setuptools" - ], - "intake-parquet": [ - "setuptools" - ], - "intbitset": [ - "setuptools" - ], - "intelhex": [ - "setuptools" - ], - "intellifire4py": [ - "setuptools" - ], - "internetarchive": [ - "setuptools" - ], - "interruptingcow": [ - "setuptools" - ], - "intervaltree": [ - "setuptools" - ], - "into-dbus-python": [ - "setuptools" - ], - "intreehooks": [ - "setuptools" - ], - "invocations": [ - "setuptools" - ], - "invoke": [ - "setuptools" - ], - "iocapture": [ - "setuptools" - ], - "iodata": [ - "cython", - "setuptools" - ], - "ionhash": [ - "setuptools" - ], - "iotawattpy": [ - "setuptools" - ], - "iowait": [ - "setuptools" - ], - "ipaddr": [ - "setuptools" - ], - "ipaddress": [ - "setuptools" - ], - "ipdb": [ - "setuptools" - ], - "ipdbplugin": [ - "setuptools" - ], - "ipfshttpclient": [ - "flit-core", - "setuptools" - ], - "iptools": [ - "setuptools" - ], - "ipwhl": [ - "flit-core", - "setuptools" - ], - "ipwhois": [ - "setuptools" - ], - "ipy": [ - "setuptools" - ], - "ipydatawidgets": [ - "setuptools" - ], - "ipykernel": [ - "hatchling", - "setuptools" - ], - "ipympl": [ - "setuptools" - ], - "ipyparallel": [ - "hatchling", - "setuptools" - ], - "ipython": [ - "setuptools" - ], - "ipython-genutils": [ - "setuptools" - ], - "ipython-sql": [ - "setuptools" - ], - "ipyvue": [ - "setuptools" - ], - "ipyvuetify": [ - "setuptools" - ], - "ipywidgets": [ - "setuptools" - ], - "irc": [ - "setuptools", - "setuptools-scm" - ], - "ircrobots": [ - "setuptools" - ], - "ircstates": [ - "setuptools" - ], - "irctokens": [ - "setuptools" - ], - "isbnlib": [ - "setuptools" - ], - "islpy": [ - "setuptools" - ], - "ismartgate": [ - "setuptools" - ], - "iso-639": [ - "setuptools" - ], - "iso3166": [ - "setuptools" - ], - "iso4217": [ - "setuptools" - ], - "iso8601": [ - "poetry-core", - "setuptools" - ], - "isodate": [ - "setuptools" - ], - "isoduration": [ - "setuptools" - ], - "isort": [ - "poetry-core", - "setuptools" - ], - "isosurfaces": [ - "setuptools" - ], - "isounidecode": [ - "setuptools" - ], - "isoweek": [ - "setuptools" - ], - "itanium-demangler": [ - "setuptools" - ], - "itemadapter": [ - "setuptools" - ], - "itemdb": [ - "setuptools" - ], - "itemloaders": [ - "setuptools" - ], - "iteration-utilities": [ - "setuptools" - ], - "itsdangerous": [ - "setuptools" - ], - "itunespy": [ - "setuptools" - ], - "itypes": [ - "setuptools" - ], - "j2cli": [ - "setuptools" - ], - "jaconv": [ - "setuptools" - ], - "jaeger-client": [ - "setuptools" - ], - "janus": [ - "setuptools" - ], - "jarac-itertools": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-classes": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-collections": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-context": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-functools": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-itertools": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-logging": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-stream": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-test": [ - "setuptools", - "setuptools-scm" - ], - "jaraco-text": [ - "setuptools", - "setuptools-scm" - ], - "jarowinkler": [ - "cython", - "setuptools" - ], - "javaobj-py3": [ - "setuptools" - ], - "javaproperties": [ - "setuptools" - ], - "jax": [ - "setuptools" - ], - "jaxlib": [ - "setuptools" - ], - "jaxlib-bin": [ - "setuptools" - ], - "jaxlib-build": [ - "setuptools" - ], - "jaxlibwithcuda": [ - "setuptools" - ], - "jaxlibwithoutcuda": [ - "setuptools" - ], - "jaydebeapi": [ - "setuptools" - ], - "jc": [ - "setuptools" - ], - "jdatetime": [ - "setuptools" - ], - "jdcal": [ - "setuptools" - ], - "jedi": [ - "setuptools" - ], - "jedi-language-server": [ - "poetry-core", - "setuptools" - ], - "jeepney": [ - "flit-core", - "setuptools" - ], - "jellyfin-apiclient-python": [ - "setuptools" - ], - "jellyfish": [ - "setuptools" - ], - "jenkins-job-builder": [ - "pbr", - "setuptools" - ], - "jieba": [ - "setuptools" - ], - "jinja2": [ - "setuptools" - ], - "jinja2-ansible-filters": [ - "setuptools" - ], - "jinja2-git": [ - "poetry-core", - "setuptools" - ], - "jinja2-pluralize": [ - "setuptools" - ], - "jinja2-time": [ - "setuptools" - ], - "jira": [ - "setuptools", - "setuptools-scm" - ], - "jmespath": [ - "setuptools" - ], - "jmp": [ - "setuptools" - ], - "joblib": [ - "setuptools" - ], - "johnnycanencrypt": [ - "setuptools" - ], - "josepy": [ - "setuptools" - ], - "journalwatch": [ - "setuptools" - ], - "jplephem": [ - "setuptools" - ], - "jproperties": [ - "setuptools", - "setuptools-scm" - ], - "jpylyzer": [ - "setuptools" - ], - "jpype1": [ - "setuptools" - ], - "jq": [ - "cython", - "setuptools" - ], - "js2py": [ - "setuptools" - ], - "jsbeautifier": [ - "setuptools" - ], - "jschema-to-python": [ - "pbr", - "setuptools" - ], - "jsii": [ - "setuptools" - ], - "jsmin": [ - "setuptools" - ], - "json-home-client": [ - "setuptools" - ], - "json-logging": [ - "setuptools" - ], - "json-merge-patch": [ - "setuptools" - ], - "json-rpc": [ - "setuptools" - ], - "json-schema-for-humans": [ - "poetry-core", - "setuptools" - ], - "json-stream": [ - "setuptools" - ], - "json-tricks": [ - "setuptools" - ], - "json5": [ - "setuptools" - ], - "jsonconversion": [ - "setuptools" - ], - "jsondate": [ - "setuptools" - ], - "jsondiff": [ - "setuptools" - ], - "jsonfield": [ - "setuptools" - ], - "jsonlines": [ - "setuptools" - ], - "jsonmerge": [ - "setuptools" - ], - "jsonnet": [ - "setuptools" - ], - "jsonpatch": [ - "setuptools" - ], - "jsonpath": [ - "setuptools" - ], - "jsonpath-ng": [ - "setuptools" - ], - "jsonpath-rw": [ - "setuptools" - ], - "jsonpickle": [ - "setuptools", - "setuptools-scm" - ], - "jsonpointer": [ - "setuptools" - ], - "jsonref": [ - { - "buildSystem": "setuptools", - "until": "0.3.0" - }, - { - "buildSystem": "poetry", - "from": "0.3.0", - "until": "1.1.0" - }, - { - "buildSystem": "pdm-pep517", - "from": "1.1.0" - } - ], - "jsonrpc-async": [ - "setuptools" - ], - "jsonrpc-base": [ - "setuptools" - ], - "jsonrpc-websocket": [ - "setuptools" - ], - "jsonrpclib-pelix": [ - "setuptools" - ], - "jsons": [ - "setuptools" - ], - "jsonschema": [ - { - "buildSystem": "hatch-fancy-pypi-readme", - "from": "4.11.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "4.6.0" - }, - { - "buildSystem": "hatchling", - "from": "4.6.0" - }, - { - "buildSystem": "setuptools", - "until": "4.6.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "4.6.0" - } - ], - "jsonschema-3": [ - "setuptools-scm" - ], - "jsonschema-spec": [ - "poetry-core" - ], - "jsonstreams": [ - "setuptools" - ], - "jug": [ - "setuptools" - ], - "junit-xml": [ - "setuptools" - ], - "junitparser": [ - "setuptools" - ], - "junos-eznc": [ - "setuptools" - ], - "jupyter": [ - "setuptools" - ], - "jupyter-book": [ - "flit-core", - "setuptools" - ], - "jupyter-c-kernel": [ - "setuptools" - ], - "jupyter-cache": [ - "setuptools" - ], - "jupyter-client": [ - "hatchling", - "setuptools" - ], - "jupyter-console": [ - { - "buildSystem": "setuptools", - "until": "6.6.0" - }, - { - "buildSystem": "hatchling", - "from": "6.6.0" - } - ], - "jupyter-core": [ - { - "buildSystem": "hatchling", - "from": "4.11.0" - }, - { - "buildSystem": "setuptools", - "until": "4.11.0" - } - ], - "jupyter-events": [ - "hatchling" - ], - "jupyter-lsp": [ - "setuptools" - ], - "jupyter-packaging": [ - "hatchling", - "setuptools" - ], - "jupyter-repo2docker": [ - "setuptools" - ], - "jupyter-server": [ - { - "buildSystem": "setuptools", - "until": "1.21.0" - }, - { - "buildSystem": "jupyter-packaging", - "from": "1.21.0" - } - ], - "jupyter-server-fileid": [ - "hatchling" - ], - "jupyter-server-mathjax": [ - "jupyter-packaging", - "setuptools" - ], - "jupyter-server-terminals": [ - "hatchling" - ], - "jupyter-server-ydoc": [ - "hatchling" - ], - "jupyter-sphinx": [ - "setuptools" - ], - "jupyter-telemetry": [ - "setuptools" - ], - "jupyter-ydoc": [ - { - "buildSystem": "hatchling" - }, - { - "buildSystem": "hatch-nodejs-version", - "from": "0.2.3" - } - ], - "jupyterhub": [ - "setuptools" - ], - "jupyterhub-ldapauthenticator": [ - "setuptools" - ], - "jupyterhub-systemdspawner": [ - "setuptools" - ], - "jupyterhub-tmpauthenticator": [ - "setuptools" - ], - "jupyterlab": [ - { - "buildSystem": "jupyter-packaging", - "until": "4" - }, - { - "buildSystem": "setuptools", - "until": "4" - }, - { - "buildSystem": "hatchling", - "from": "4" - }, - { - "buildSystem": "hatch-jupyter-builder", - "from": "4" - } - ], - "jupyterlab-code-formatter": [ - "jupyter-packaging" - ], - "jupyterlab-git": [ - "jupyter-packaging", - "setuptools" - ], - "jupyterlab-launcher": [ - "setuptools" - ], - "jupyterlab-lsp": [ - "setuptools" - ], - "jupyterlab-pygments": [ - "jupyter-packaging", - "setuptools" - ], - "jupyterlab-server": [ - "hatchling", - "setuptools" - ], - "jupyterlab-widgets": [ - "setuptools" - ], - "jupytext": [ - "setuptools" - ], - "justbackoff": [ - "setuptools" - ], - "justbases": [ - "setuptools" - ], - "justbytes": [ - "setuptools" - ], - "justnimbus": [ - "poetry-core", - "setuptools" - ], - "justpy": [ - "flit-core" - ], - "jwcrypto": [ - "setuptools" - ], - "jxmlease": [ - "setuptools" - ], - "k5test": [ - "setuptools" - ], - "kafka-python": [ - "setuptools" - ], - "kaggle": [ - "setuptools" - ], - "kaitaistruct": [ - "setuptools" - ], - "kajiki": [ - "setuptools" - ], - "kaldi-active-grammar": [ - "setuptools" - ], - "kanidm": [ - "poetry-core", - "setuptools" - ], - "kaptan": [ - "setuptools" - ], - "karton-asciimagic": [ - "setuptools" - ], - "karton-autoit-ripper": [ - "setuptools" - ], - "karton-classifier": [ - "setuptools" - ], - "karton-config-extractor": [ - "setuptools" - ], - "karton-core": [ - "setuptools" - ], - "karton-dashboard": [ - "setuptools" - ], - "karton-mwdb-reporter": [ - "setuptools" - ], - "karton-yaramatcher": [ - "setuptools" - ], - "kazoo": [ - "setuptools" - ], - "kbcstorage": [ - "setuptools", - "setuptools-scm" - ], - "kconfiglib": [ - "setuptools" - ], - "keep": [ - "setuptools" - ], - "keepkey": [ - "setuptools" - ], - "keepkey-agent": [ - "setuptools" - ], - "kegtron-ble": [ - "poetry-core" - ], - "keras": [ - "setuptools" - ], - "keras-applications": [ - "setuptools" - ], - "keras-preprocessing": [ - "setuptools" - ], - "kerberos": [ - "setuptools" - ], - "keyboard": [ - "setuptools" - ], - "keyring": [ - "setuptools", - "setuptools-scm" - ], - "keyring-pass": [ - "poetry-core" - ], - "keyrings-alt": [ - "setuptools", - "setuptools-scm" - ], - "keyrings-cryptfile": [ - "setuptools" - ], - "keyrings-google-artifactregistry-auth": [ - "setuptools", - "setuptools-scm" - ], - "keystone-engine": [ - "setuptools" - ], - "keystoneauth1": [ - "pbr", - "setuptools" - ], - "keyutils": [ - "setuptools" - ], - "kinparse": [ - "setuptools" - ], - "kiss-headers": [ - "setuptools" - ], - "kitchen": [ - "setuptools" - ], - "kivy": [ - "cython", - "setuptools" - ], - "kivy-garden": [ - "setuptools" - ], - "kiwisolver": [ - "setuptools", - "setuptools-scm" - ], - "klaus": [ - "setuptools" - ], - "klein": [ - "setuptools" - ], - "kmapper": [ - "setuptools" - ], - "kml2geojson": [ - "poetry-core", - "setuptools" - ], - "knack": [ - "setuptools" - ], - "kombu": [ - "setuptools" - ], - "konnected": [ - "setuptools" - ], - "kopf": [ - "setuptools", - "setuptools-scm" - ], - "korean-lunar-calendar": [ - "setuptools" - ], - "kraken-common": [ - "poetry" - ], - "krakenex": [ - "setuptools" - ], - "kubernetes": [ - "setuptools" - ], - "kubernetes-stubs": [ - "poetry" - ], - "l18n": [ - "setuptools" - ], - "labgrid": [ - "setuptools", - "setuptools-scm" - ], - "labmath": [ - "setuptools" - ], - "langcodes": [ - "poetry-core", - "setuptools" - ], - "langdetect": [ - "setuptools" - ], - "language-data": [ - "poetry-core", - "setuptools" - ], - "language-formatters-pre-commit-hooks": [ - "setuptools" - ], - "lark": [ - "setuptools" - ], - "lark-parser": [ - "setuptools" - ], - "latexcodec": [ - "setuptools" - ], - "latexify-py": [ - "hatchling" - ], - "launchpadlib": [ - "setuptools" - ], - "laundrify-aio": [ - "setuptools" - ], - "lazr-config": [ - "setuptools" - ], - "lazr-delegates": [ - "setuptools" - ], - "lazr-restfulclient": [ - "setuptools" - ], - "lazr-uri": [ - "setuptools" - ], - "lazy": [ - "setuptools" - ], - "lazy-import": [ - "setuptools" - ], - "lazy-object-proxy": [ - "setuptools", - "setuptools-scm" - ], - "lc7001": [ - "poetry-core", - "setuptools" - ], - "ldap": [ - "setuptools" - ], - "ldap3": [ - "setuptools" - ], - "ldapdomaindump": [ - "setuptools" - ], - "ldappool": [ - "pbr", - "setuptools" - ], - "ldaptor": [ - "setuptools" - ], - "leather": [ - "setuptools" - ], - "leb128": [ - "setuptools" - ], - "led-ble": [ - "poetry-core", - "setuptools" - ], - "ledger-agent": [ - "setuptools" - ], - "ledgerblue": [ - "setuptools" - ], - "ledgerwallet": [ - "setuptools" - ], - "lektor": [ - "setuptools" - ], - "leveldb": [ - "setuptools" - ], - "levenshtein": [ - "cython", - "setuptools" - ], - "lexid": [ - "setuptools" - ], - "lhapdf": [ - "cython" - ], - "libagent": [ - "setuptools" - ], - "libais": [ - "setuptools" - ], - "libarchive-c": [ - "setuptools" - ], - "libarcus": [ - "setuptools" - ], - "libasyncns": [ - "setuptools" - ], - "libclang": [ - "setuptools" - ], - "libcloud": [ - "setuptools" - ], - "libcst": [ - "setuptools", - "setuptools-scm" - ], - "libevdev": [ - "setuptools" - ], - "libgpuarray": [ - "cython", - "setuptools" - ], - "libiio": [ - "setuptools" - ], - "libkeepass": [ - "setuptools" - ], - "liblarch": [ - "setuptools" - ], - "liblzfse": [ - "setuptools" - ], - "libmr": [ - "cython", - "setuptools" - ], - "libnacl": [ - "setuptools" - ], - "libpurecool": [ - "setuptools" - ], - "libpyfoscam": [ - "setuptools" - ], - "libpyvivotek": [ - "setuptools" - ], - "librosa": [ - "setuptools" - ], - "librouteros": [ - "setuptools" - ], - "libsass": [ - "setuptools" - ], - "libsavitar": [ - "setuptools" - ], - "libsixel": [ - "setuptools" - ], - "libsoundtouch": [ - "setuptools" - ], - "libthumbor": [ - "setuptools" - ], - "libtmux": [ - "poetry-core", - "setuptools" - ], - "libusb1": [ - "setuptools" - ], - "libusbsio": [ - "setuptools" - ], - "libversion": [ - "setuptools" - ], - "libvirt": [ - "setuptools" - ], - "libvirt-python": [ - "setuptools" - ], - "license-expression": [ - "setuptools", - "setuptools-scm" - ], - "licensecheck": [ - "poetry-core" - ], - "life360": [ - "setuptools" - ], - "lightgbm": [ - "setuptools" - ], - "lightning": [ - "setuptools" - ], - "lightning-cloud": [ - "setuptools" - ], - "lightning-utilities": [ - "setuptools" - ], - "lightparam": [ - "setuptools" - ], - "lightwave": [ - "setuptools" - ], - "lightwave2": [ - "setuptools" - ], - "ligo-segments": [ - "setuptools" - ], - "lima": [ - "setuptools" - ], - "limiter": [ - "setuptools" - ], - "limitlessled": [ - "setuptools" - ], - "limits": [ - "setuptools" - ], - "limnoria": [ - "setuptools" - ], - "line-profiler": [ - "cython", - "setuptools" - ], - "linecache2": [ - "pbr", - "setuptools" - ], - "lingua": [ - "flit-core", - "setuptools" - ], - "linkify-it-py": [ - "setuptools" - ], - "linode": [ - "setuptools" - ], - "linode-api": [ - "setuptools" - ], - "linuxfd": [ - "setuptools" - ], - "linz-logger": [ - "poetry-core" - ], - "liquidctl": [ - "setuptools" - ], - "lit": [ - "setuptools" - ], - "littleutils": [ - "setuptools" - ], - "livelossplot": [ - "setuptools" - ], - "livereload": [ - "setuptools" - ], - "livestreamer": [ - "setuptools" - ], - "livestreamer-curses": [ - "setuptools" - ], - "lizard": [ - "setuptools" - ], - "llama-cpp-python": [ - "setuptools", - "scikit-build" - ], - "llfuse": [ - "cython", - "setuptools" - ], - "llvmlite": [ - "setuptools" - ], - "lmdb": [ - "setuptools" - ], - "lmfit": [ - "setuptools" - ], - "lml": [ - "setuptools" - ], - "lmnotify": [ - "setuptools" - ], - "lmtpd": [ - "setuptools" - ], - "lnurl": [ - "setuptools" - ], - "loca": [ - "flit-core", - "setuptools" - ], - "localimport": [ - "setuptools" - ], - "localstack": [ - "setuptools" - ], - "localstack-client": [ - "setuptools" - ], - "localstack-ext": [ - "setuptools" - ], - "localzone": [ - "setuptools" - ], - "locationsharinglib": [ - "setuptools" - ], - "locket": [ - "setuptools" - ], - "lockfile": [ - "pbr", - "setuptools" - ], - "log-symbols": [ - "setuptools" - ], - "logbook": [ - "setuptools" - ], - "logfury": [ - "setuptools", - "setuptools-scm" - ], - "logi-circle": [ - "setuptools" - ], - "logical-unification": [ - "setuptools" - ], - "logilab-astng": [ - "setuptools" - ], - "logilab-common": [ - "setuptools" - ], - "logilab-constraint": [ - "setuptools" - ], - "logster": [ - "setuptools" - ], - "loguru": [ - "setuptools" - ], - "logutils": [ - "setuptools" - ], - "logzero": [ - "setuptools" - ], - "lomond": [ - "setuptools" - ], - "loo-py": [ - "setuptools" - ], - "loopy": [ - "setuptools" - ], - "losant-rest": [ - "setuptools" - ], - "lrcalc-python": [ - "cython", - "setuptools" - ], - "lru-dict": [ - "setuptools" - ], - "lsassy": [ - "poetry-core", - "setuptools" - ], - "luddite": [ - "setuptools" - ], - "luftdaten": [ - "poetry-core", - "setuptools" - ], - "luhn": [ - "setuptools" - ], - "lunarcalendar": [ - "setuptools" - ], - "lupa": [ - "cython", - "setuptools" - ], - "lupupy": [ - "setuptools" - ], - "luxor": [ - "setuptools" - ], - "luxtronik": [ - "setuptools" - ], - "lxmf": [ - "setuptools" - ], - "lxml": [ - "cython", - "setuptools" - ], - "lxml-stubs": [ - "setuptools" - ], - "lyricwikia": [ - "setuptools" - ], - "lz4": [ - "pkgconfig", - "setuptools", - "setuptools-scm" - ], - "lzstring": [ - "setuptools" - ], - "m2crypto": [ - "setuptools" - ], - "m3u8": [ - "setuptools" - ], - "mac-alias": [ - "setuptools" - ], - "maestral": [ - "pbr", - "setuptools" - ], - "magic": [ - "setuptools" - ], - "magic-wormhole": [ - "setuptools" - ], - "magic-wormhole-mailbox-server": [ - "setuptools" - ], - "magic-wormhole-transit-relay": [ - "setuptools" - ], - "magicgui": [ - "setuptools", - "setuptools-scm" - ], - "mahotas": [ - "setuptools" - ], - "mail-parser": [ - "setuptools" - ], - "mailcap-fix": [ - "setuptools" - ], - "mailchecker": [ - "setuptools" - ], - "mailchimp": [ - "setuptools" - ], - "mailmanclient": [ - "setuptools" - ], - "mailsuite": [ - "hatchling", - "setuptools" - ], - "makefun": [ - "setuptools", - "setuptools-scm" - ], - "mako": [ - "setuptools" - ], - "malduck": [ - "setuptools" - ], - "manage-fastapi": [ - "poetry" - ], - "managesieve": [ - "setuptools" - ], - "mangum": [ - "setuptools" - ], - "manhole": [ - "setuptools" - ], - "manifestoo": [ - { - "buildSystem": "flit-core", - "until": "0.5" - }, - { - "buildSystem": "hatch-vcs", - "from": "0.5" - }, - { - "buildSystem": "hatchling", - "from": "0.5" - } - ], - "manifestoo-core": [ - "hatch-vcs", - "hatchling" - ], - "manimpango": [ - "cython", - "setuptools" - ], - "manuel": [ - "setuptools" - ], - "mapbox-earcut": [ - "setuptools" - ], - "mariadb": [ - "setuptools" - ], - "marisa-trie": [ - "cython", - "setuptools" - ], - "markdown": [ - "setuptools" - ], - "markdown-include": [ - "setuptools" - ], - "markdown-it-py": [ - "flit-core", - "setuptools" - ], - "markdown-macros": [ - "setuptools" - ], - "markdown2": [ - "setuptools" - ], - "markdownify": [ - "setuptools" - ], - "markerlib": [ - "setuptools" - ], - "markups": [ - "setuptools" - ], - "markupsafe": [ - "setuptools" - ], - "marshmallow": [ - "setuptools" - ], - "marshmallow-dataclass": [ - "setuptools" - ], - "marshmallow-enum": [ - "setuptools" - ], - "marshmallow-oneofschema": [ - "setuptools" - ], - "marshmallow-polyfield": [ - "setuptools" - ], - "marshmallow-sqlalchemy": [ - "setuptools" - ], - "mask-rcnn": [ - "cython" - ], - "mastodon-py": [ - "setuptools" - ], - "mat2": [ - "setuptools" - ], - "matchpy": [ - "setuptools", - "setuptools-scm" - ], - "mathlibtools": [ - "setuptools" - ], - "matlink-gpapi": [ - "setuptools" - ], - "matplotlib": [ - "setuptools", - "setuptools-scm" - ], - "matplotlib-inline": [ - "setuptools" - ], - "matrix-api-async": [ - "setuptools" - ], - "matrix-client": [ - "setuptools" - ], - "matrix-common": [ - "setuptools" - ], - "matrix-nio": [ - "poetry-core", - "setuptools" - ], - "mattermostdriver": [ - "setuptools" - ], - "mautrix": [ - "setuptools" - ], - "mautrix-appservice": [ - "setuptools" - ], - "maxcube-api": [ - "setuptools" - ], - "maxminddb": [ - "setuptools" - ], - "maxminddb-geolite2": [ - "setuptools" - ], - "maya": [ - "setuptools" - ], - "mayavi": [ - "setuptools" - ], - "mbddns": [ - "setuptools" - ], - "mbtest": [ - "setuptools" - ], - "mccabe": [ - "setuptools" - ], - "mcstatus": [ - "poetry-core", - "setuptools" - ], - "md-toc": [ - "setuptools" - ], - "md2gemini": [ - "setuptools" - ], - "mdformat": [ - "poetry-core", - "setuptools" - ], - "mdit-py-plugins": [ - "flit-core", - "setuptools" - ], - "mdp": [ - "setuptools" - ], - "mdurl": [ - "flit-core", - "setuptools" - ], - "mdutils": [ - "setuptools" - ], - "mdx-truly-sane-lists": [ - "setuptools" - ], - "measurement": [ - "setuptools", - "setuptools-scm" - ], - "meater-python": [ - "setuptools" - ], - "mecab-python3": [ - "setuptools", - "setuptools-scm" - ], - "mechanicalsoup": [ - "setuptools" - ], - "mechanize": [ - "setuptools" - ], - "mediafile": [ - "flit-core", - "setuptools" - ], - "mediapy": [ - "setuptools" - ], - "meeko": [ - "setuptools" - ], - "meilisearch": [ - "setuptools" - ], - "meinheld": [ - "setuptools" - ], - "meld3": [ - "setuptools" - ], - "memcached": [ - "setuptools" - ], - "memory-allocator": [ - "cython", - "setuptools" - ], - "memory-profiler": [ - "setuptools" - ], - "mercantile": [ - "setuptools" - ], - "mercurial": [ - "setuptools" - ], - "mergedb": [ - "setuptools", - "setuptools-scm" - ], - "mergedeep": [ - "setuptools" - ], - "mergedict": [ - "setuptools" - ], - "merkletools": [ - "setuptools" - ], - "meross-iot": [ - "setuptools" - ], - "mesa": [ - "setuptools" - ], - "meshio": [ - "setuptools" - ], - "meshlabxml": [ - "setuptools" - ], - "meshtastic": [ - "setuptools" - ], - "meson": [ - "setuptools" - ], - "mesonpep517": [ - "setuptools" - ], - "messagebird": [ - "setuptools" - ], - "metakernel": [ - "hatchling", - "setuptools" - ], - "metar": [ - "setuptools" - ], - "meteoalertapi": [ - "setuptools" - ], - "meteocalc": [ - "setuptools" - ], - "meteofrance-api": [ - "poetry-core", - "setuptools" - ], - "metprint": [ - "poetry-core" - ], - "mezzanine": [ - "setuptools" - ], - "micawber": [ - "setuptools" - ], - "micloud": [ - "setuptools" - ], - "midiutil": [ - "setuptools" - ], - "mido": [ - "setuptools" - ], - "migen": [ - "setuptools" - ], - "migra": [ - "poetry-core" - ], - "mike": [ - "setuptools" - ], - "milc": [ - "setuptools" - ], - "milksnake": [ - "setuptools" - ], - "mill-local": [ - "setuptools" - ], - "millheater": [ - "setuptools" - ], - "minexr": [ - "setuptools" - ], - "miniaudio": [ - "setuptools" - ], - "minidb": [ - "setuptools" - ], - "minidump": [ - "setuptools" - ], - "minikanren": [ - "setuptools" - ], - "minikerberos": [ - "setuptools" - ], - "minimal-dydb": [ - "poetry-core" - ], - "minimock": [ - "setuptools" - ], - "mininet-python": [ - "setuptools" - ], - "minio": [ - "setuptools" - ], - "miniupnpc": [ - "setuptools" - ], - "misaka": [ - "setuptools" - ], - "mistletoe": [ - "setuptools" - ], - "mistune": [ - "setuptools" - ], - "mistune-2-0": [ - "setuptools" - ], - "mitmproxy": [ - "setuptools" - ], - "mitogen": [ - "setuptools" - ], - "mixer": [ - "setuptools" - ], - "mixpanel": [ - "setuptools" - ], - "mizani": [ - "setuptools" - ], - "mkdocs": [ - { - "buildSystem": "hatchling", - "from": "1.4.1" - }, - "setuptools" - ], - "mkdocs-autorefs": [ - "pdm-pep517", - "poetry", - "setuptools" - ], - "mkdocs-awesome-pages-plugin": [ - "poetry" - ], - "mkdocs-drawio-exporter": [ - "setuptools" - ], - "mkdocs-exclude": [ - "setuptools" - ], - "mkdocs-exclude-search": [ - "setuptools" - ], - "mkdocs-gen-files": [ - "poetry" - ], - "mkdocs-git-revision-date-localized-plugin": [ - "setuptools" - ], - "mkdocs-gitlab": [ - "setuptools" - ], - "mkdocs-jupyter": [ - "ipython-genutils", - "poetry-core" - ], - "mkdocs-literate-nav": [ - "poetry" - ], - "mkdocs-macros": [ - "setuptools" - ], - "mkdocs-macros-plugin": [ - "setuptools" - ], - "mkdocs-material": [ - { - "buildSystem": "hatchling", - "from": "8.5.3" - }, - { - "buildSystem": "hatch-nodejs-version", - "from": "8.5.3" - }, - "setuptools" - ], - "mkdocs-material-extensions": [ - { - "buildSystem": "hatchling", - "from": "1.1" - }, - "setuptools" - ], - "mkdocs-minify": [ - "setuptools" - ], - "mkdocs-redirects": [ - "setuptools" - ], - "mkdocs-swagger-ui-tag": [ - "setuptools" - ], - "mkdocs-table-reader-plugin": [ - "setuptools" - ], - "mkdocstrings": [ - "pdm-pep517", - "setuptools" - ], - "mkdocstrings-python": [ - "setuptools" - ], - "mkl-service": [ - "cython", - "setuptools" - ], - "ml-collections": [ - "setuptools" - ], - "mlflow": [ - "setuptools" - ], - "mlrose": [ - "setuptools" - ], - "mmcif-pdbx": [ - "setuptools" - ], - "mmh3": [ - "setuptools" - ], - "mne-python": [ - "setuptools" - ], - "mnemonic": [ - "setuptools" - ], - "mnist": [ - "setuptools" - ], - "moat-ble": [ - "poetry-core", - "setuptools" - ], - "mock": [ - "pbr", - "setuptools" - ], - "mock-open": [ - "setuptools" - ], - "mock-services": [ - "setuptools" - ], - "mocket": [ - "setuptools" - ], - "mockito": [ - "setuptools" - ], - "mockupdb": [ - "setuptools" - ], - "mode-streaming": [ - "setuptools" - ], - "moderngl": [ - "setuptools" - ], - "moderngl-window": [ - "setuptools" - ], - "mohawk": [ - "setuptools" - ], - "moku": [ - "setuptools" - ], - "monai": [ - "setuptools" - ], - "monero": [ - "setuptools" - ], - "mongodict": [ - "setuptools" - ], - "mongoengine": [ - "setuptools" - ], - "mongomock": [ - "pbr", - "setuptools" - ], - "monkeyhex": [ - "setuptools" - ], - "monosat": [ - "cython", - "setuptools" - ], - "monotonic": [ - "setuptools" - ], - "monty": [ - "setuptools" - ], - "moonraker-api": [ - "setuptools" - ], - "more-itertools": [ - "flit-core", - "setuptools" - ], - "more-properties": [ - "setuptools" - ], - "morecantile": [ - { - "buildSystem": "setuptools", - "until": "3.2.0" - }, - { - "buildSystem": "flit-core", - "from": "3.2.0" - } - ], - "morphys": [ - "setuptools" - ], - "mortgage": [ - "setuptools" - ], - "motionblinds": [ - "setuptools" - ], - "motioneye-client": [ - "poetry-core", - "setuptools" - ], - "moto": [ - "setuptools" - ], - "motor": [ - "setuptools" - ], - "mouseinfo": [ - "setuptools" - ], - "moviepy": [ - "setuptools" - ], - "mox": [ - "setuptools" - ], - "mox3": [ - "pbr", - "setuptools" - ], - "mpd2": [ - "setuptools" - ], - "mpi4py": [ - "setuptools" - ], - "mpldatacursor": [ - "setuptools" - ], - "mplfinance": [ - "setuptools" - ], - "mplleaflet": [ - "setuptools" - ], - "mpmath": [ - "setuptools", - "setuptools-scm" - ], - "mpv": [ - "setuptools" - ], - "mpyq": [ - "setuptools" - ], - "ms-active-directory": [ - "setuptools" - ], - "ms-cv": [ - "setuptools" - ], - "msal": [ - "setuptools" - ], - "msal-extensions": [ - "setuptools" - ], - "msgpack": [ - "setuptools" - ], - "msgpack-numpy": [ - "cython", - "setuptools" - ], - "msgpack-python": [ - "setuptools" - ], - "msgpack-types": [ - "poetry" - ], - "msgraph-core": [ - "flit-core", - "setuptools" - ], - "msldap": [ - "setuptools" - ], - "msoffcrypto-tool": [ - "poetry-core", - "setuptools" - ], - "msrest": [ - "setuptools" - ], - "msrestazure": [ - "setuptools" - ], - "mss": [ - "setuptools" - ], - "mt-940": [ - "setuptools" - ], - "mujson": [ - "setuptools" - ], - "mullvad-api": [ - "setuptools" - ], - "mulpyplexer": [ - "setuptools" - ], - "multi-key-dict": [ - "setuptools" - ], - "multiaddr": [ - "setuptools" - ], - "multidict": [ - "setuptools" - ], - "multihash": [ - "setuptools" - ], - "multimethod": [ - "setuptools" - ], - "multipledispatch": [ - "setuptools" - ], - "multiprocess": [ - "setuptools" - ], - "multiset": [ - "setuptools", - "setuptools-scm" - ], - "multitasking": [ - "setuptools" - ], - "munch": [ - "pbr", - "setuptools" - ], - "munkres": [ - "setuptools" - ], - "murmurhash": [ - "cython", - "setuptools" - ], - "musicbrainzngs": [ - "setuptools" - ], - "mutag": [ - "setuptools" - ], - "mutagen": [ - "setuptools" - ], - "mutatormath": [ - "setuptools" - ], - "mutesync": [ - "setuptools" - ], - "mutf8": [ - "setuptools" - ], - "mutmut": [ - "setuptools" - ], - "mwclient": [ - "setuptools" - ], - "mwdblib": [ - "setuptools" - ], - "mwoauth": [ - "setuptools" - ], - "mwparserfromhell": [ - "setuptools" - ], - "mxnet": [ - "setuptools" - ], - "myfitnesspal": [ - "setuptools" - ], - "mygpoclient": [ - "setuptools" - ], - "myhome": [ - "poetry-core", - "setuptools" - ], - "myjwt": [ - "setuptools" - ], - "mypy": [ - "setuptools" - ], - "mypy-boto3-batch": [ - "setuptools" - ], - "mypy-boto3-builder": [ - "poetry-core", - "setuptools" - ], - "mypy-boto3-cognito": [ - "setuptools" - ], - "mypy-boto3-cognito-idp": [ - "setuptools" - ], - "mypy-boto3-dynamodb": [ - "setuptools" - ], - "mypy-boto3-ec2": [ - "setuptools" - ], - "mypy-boto3-events": [ - "setuptools" - ], - "mypy-boto3-lambda": [ - "setuptools" - ], - "mypy-boto3-logs": [ - "setuptools" - ], - "mypy-boto3-rds": [ - "setuptools" - ], - "mypy-boto3-s3": [ - "setuptools" - ], - "mypy-boto3-s3control": [ - "setuptools" - ], - "mypy-boto3-secretsmanager": [ - "setuptools" - ], - "mypy-boto3-sns": [ - "setuptools" - ], - "mypy-boto3-sqs": [ - "setuptools" - ], - "mypy-boto3-ssm": [ - "setuptools" - ], - "mypy-boto3-stepfunctions": [ - "setuptools" - ], - "mypy-boto3-sts": [ - "setuptools" - ], - "mypy-extensions": [ - "setuptools" - ], - "mypy-protobuf": [ - "setuptools" - ], - "mysql-connector": [ - "setuptools" - ], - "mysqlclient": [ - "setuptools" - ], - "myst-docutils": [ - "flit-core", - "setuptools" - ], - "myst-nb": [ - "flit-core", - "setuptools" - ], - "myst-parser": [ - "flit-core", - "setuptools" - ], - "nad-receiver": [ - "setuptools" - ], - "nagiosplugin": [ - "setuptools" - ], - "name-that-hash": [ - "poetry-core", - "setuptools" - ], - "namedlist": [ - "setuptools" - ], - "nameparser": [ - "setuptools" - ], - "names": [ - "setuptools" - ], - "nampa": [ - "setuptools" - ], - "nanoid": [ - "setuptools" - ], - "nanoleaf": [ - "setuptools" - ], - "nanomsg-python": [ - "setuptools" - ], - "nanotime": [ - "setuptools" - ], - "napalm": [ - "setuptools" - ], - "napalm-hp-procurve": [ - "setuptools" - ], - "napari": [ - "setuptools", - "setuptools-scm" - ], - "napari-console": [ - "setuptools", - "setuptools-scm" - ], - "napari-npe2": [ - "setuptools", - "setuptools-scm" - ], - "napari-plugin-engine": [ - "setuptools", - "setuptools-scm" - ], - "napari-svg": [ - "setuptools", - "setuptools-scm" - ], - "nats-py": [ - "setuptools" - ], - "nats-python": [ - "poetry-core", - "setuptools" - ], - "natsort": [ - "setuptools" - ], - "naturalsort": [ - "setuptools" - ], - "nbclassic": [ - "jupyter-packaging", - "setuptools" - ], - "nbclient": [ - { - "buildSystem": "hatchling", - "from": "0.7.1" - }, - "setuptools" - ], - "nbconflux": [ - "setuptools" - ], - "nbconvert": [ - { - "buildSystem": "setuptools", - "until": "7.0.0" - }, - { - "buildSystem": "hatchling", - "from": "7.0.0" - } - ], - "nbdime": [ - "setuptools", - "setuptools-scm" - ], - "nbformat": [ - { - "buildSystem": "setuptools", - "until": "5.5.0" - }, - { - "buildSystem": "flit-core", - "from": "5.5.0", - "until": "5.6.0" - }, - { - "buildSystem": "hatchling", - "from": "5.6.0" - }, - { - "buildSystem": "hatch-nodejs-version", - "from": "5.6.0" - } - ], - "nbmerge": [ - "setuptools" - ], - "nbsmoke": [ - "setuptools" - ], - "nbsphinx": [ - "setuptools" - ], - "nbval": [ - "setuptools" - ], - "nbxmpp": [ - "setuptools" - ], - "ncclient": [ - "setuptools" - ], - "nclib": [ - "setuptools" - ], - "ndg-httpsclient": [ - "setuptools" - ], - "ndjson": [ - "setuptools" - ], - "ndms2-client": [ - "setuptools" - ], - "ndspy": [ - "setuptools" - ], - "ndtypes": [ - "setuptools" - ], - "nengo": [ - "setuptools" - ], - "neo": [ - "setuptools" - ], - "neo4j": [ - "setuptools" - ], - "nessclient": [ - "setuptools" - ], - "nest-asyncio": [ - "setuptools" - ], - "nested-lookup": [ - "setuptools" - ], - "nestedtext": [ - "setuptools" - ], - "net2grid": [ - "poetry-core", - "setuptools" - ], - "netaddr": [ - "setuptools" - ], - "netcdf4": [ - "cython", - "setuptools" - ], - "netdata": [ - "poetry-core", - "setuptools" - ], - "netdisco": [ - "setuptools" - ], - "netifaces": [ - "setuptools" - ], - "netio": [ - "setuptools" - ], - "netmap": [ - "setuptools" - ], - "netmiko": [ - "setuptools" - ], - "nettigo-air-monitor": [ - "setuptools" - ], - "netutils": [ - "poetry-core", - "setuptools" - ], - "networkx": [ - "setuptools" - ], - "newrelic": [ - "setuptools" - ], - "newversion": [ - "poetry-core", - "setuptools" - ], - "nexia": [ - "setuptools" - ], - "nextcloudmonitor": [ - "setuptools" - ], - "nextcord": [ - "setuptools" - ], - "nextdns": [ - "setuptools" - ], - "nghttp2": [ - "cython", - "setuptools" - ], - "niaaml": [ - "poetry-core" - ], - "niaarm": [ - "poetry-core", - "setuptools" - ], - "niapy": [ - "setuptools" - ], - "nibabel": [ - "setuptools" - ], - "nibe": [ - "setuptools" - ], - "nicegui": [ - "poetry-core" - ], - "niko-home-control": [ - "setuptools" - ], - "nikola": [ - "setuptools" - ], - "nilearn": [ - "setuptools" - ], - "niluclient": [ - "setuptools" - ], - "nimfa": [ - "setuptools" - ], - "nine": [ - "setuptools" - ], - "nipy": [ - "setuptools" - ], - "nitime": [ - "cython", - "setuptools" - ], - "nitransforms": [ - "setuptools", - "setuptools-scm" - ], - "nix-kernel": [ - "setuptools" - ], - "nix-prefetch-github": [ - "setuptools" - ], - "nixpkgs": [ - "pbr", - "setuptools" - ], - "nixpkgs-pytools": [ - "setuptools" - ], - "nkdfu": [ - "flit-core", - "setuptools" - ], - "nltk": [ - "setuptools" - ], - "nmapthon2": [ - "setuptools" - ], - "nocasedict": [ - "setuptools" - ], - "nocaselist": [ - "setuptools" - ], - "node-semver": [ - "setuptools" - ], - "nodeenv": [ - "setuptools" - ], - "nodepy-runtime": [ - "setuptools" - ], - "noise": [ - "setuptools" - ], - "noiseprotocol": [ - "setuptools" - ], - "nomadnet": [ - "setuptools" - ], - "normality": [ - "setuptools" - ], - "nose": [ - "setuptools" - ], - "nose-cov": [ - "setuptools" - ], - "nose-cprof": [ - "setuptools" - ], - "nose-exclude": [ - "setuptools" - ], - "nose-pattern-exclude": [ - "setuptools" - ], - "nose-randomly": [ - "setuptools" - ], - "nose-timer": [ - "setuptools" - ], - "nose-warnings-filters": [ - "setuptools" - ], - "nose2": [ - "setuptools" - ], - "nosejs": [ - "setuptools" - ], - "nosexcover": [ - "setuptools" - ], - "notebook": [ - "setuptools" - ], - "notebook-shim": [ - { - "buildSystem": "setuptools", - "until": "0.2.0" - }, - { - "buildSystem": "hatchling", - "from": "0.2.0" - }, - "jupyter-packaging" - ], - "notedown": [ - "setuptools" - ], - "notifications-python-client": [ - "setuptools" - ], - "notify-events": [ - "setuptools" - ], - "notify-py": [ - "poetry-core", - "setuptools" - ], - "notify2": [ - "setuptools" - ], - "notifymuch": [ - "setuptools" - ], - "notmuch": [ - "setuptools" - ], - "notmuch2": [ - "setuptools" - ], - "nototools": [ - "setuptools", - "setuptools-scm" - ], - "notus-scanner": [ - "poetry-core", - "setuptools" - ], - "nox": [ - "setuptools" - ], - "nplusone": [ - "setuptools" - ], - "npm": [ - "setuptools" - ], - "npyscreen": [ - "setuptools" - ], - "nr-io-lexer": [ - "poetry" - ], - "nr-python-environment": [ - "poetry" - ], - "nr-util": [ - "poetry" - ], - "nsapi": [ - "setuptools" - ], - "ntc-templates": [ - "poetry-core", - "setuptools" - ], - "ntlm-auth": [ - "setuptools" - ], - "ntplib": [ - "setuptools" - ], - "nuitka": [ - "setuptools" - ], - "nulltype": [ - "setuptools" - ], - "num2words": [ - "setuptools" - ], - "numba": [ - "setuptools" - ], - "numba-scipy": [ - "setuptools" - ], - "numbawithcuda": [ - "setuptools" - ], - "numcodecs": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "numdifftools": [ - "setuptools" - ], - "numericalunits": [ - "setuptools" - ], - "numexpr": [ - "setuptools" - ], - "numpy": [ - "cython", - "setuptools" - ], - "numpy-stl": [ - "cython", - "setuptools" - ], - "numpydoc": [ - "setuptools" - ], - "numpyro": [ - "setuptools" - ], - "nunavut": [ - "setuptools" - ], - "nutils": [ - "setuptools" - ], - "nvchecker": [ - "setuptools" - ], - "nvidia-ml-py3": [ - "setuptools", - "setuptools-scm" - ], - "nwdiag": [ - "setuptools" - ], - "nxt-python": [ - "setuptools" - ], - "oasatelematics": [ - "setuptools" - ], - "oath": [ - "setuptools" - ], - "oauth": [ - "setuptools" - ], - "oauth2": [ - "setuptools" - ], - "oauth2client": [ - "setuptools" - ], - "oauthenticator": [ - "setuptools" - ], - "oauthlib": [ - "setuptools" - ], - "objax": [ - "setuptools" - ], - "objgraph": [ - "setuptools" - ], - "obspy": [ - "setuptools" - ], - "oci": [ - "setuptools" - ], - "ocifs": [ - "setuptools" - ], - "ocrmypdf": [ - "setuptools", - "setuptools-scm" - ], - "od": [ - "setuptools" - ], - "odfpy": [ - "setuptools" - ], - "oemthermostat": [ - "setuptools", - "setuptools-scm" - ], - "offtrac": [ - "setuptools" - ], - "ofxclient": [ - "setuptools" - ], - "ofxhome": [ - "setuptools" - ], - "ofxparse": [ - "setuptools" - ], - "ofxtools": [ - "setuptools" - ], - "olefile": [ - "setuptools" - ], - "oletools": [ - "setuptools" - ], - "omegaconf": [ - "setuptools" - ], - "omnikinverter": [ - "poetry-core", - "setuptools" - ], - "omnilogic": [ - "setuptools" - ], - "ondilo": [ - "setuptools" - ], - "onetimepad": [ - "setuptools" - ], - "onetimepass": [ - "setuptools" - ], - "onkyo-eiscp": [ - "setuptools" - ], - "online-judge-api-client": [ - "setuptools" - ], - "online-judge-tools": [ - "setuptools" - ], - "onlykey-solo-python": [ - "setuptools" - ], - "onnx": [ - "setuptools" - ], - "onvif-zeep-async": [ - "setuptools" - ], - "oocsi": [ - "setuptools" - ], - "open-garage": [ - "setuptools" - ], - "open-meteo": [ - "poetry-core", - "setuptools" - ], - "openai": [ - "setuptools" - ], - "openant": [ - "setuptools" - ], - "openapi-codec": [ - "setuptools" - ], - "openapi-core": [ - "poetry-core", - "setuptools" - ], - "openapi-python-client": [ - "poetry-core" - ], - "openapi-schema-validator": [ - "poetry-core", - "setuptools" - ], - "openapi-spec-validator": [ - "poetry-core", - "setuptools" - ], - "openbabel-bindings": [ - "setuptools" - ], - "opencv4": [ - "setuptools" - ], - "openerz-api": [ - "setuptools" - ], - "openevsewifi": [ - "poetry-core", - "setuptools" - ], - "openhomedevice": [ - "setuptools" - ], - "openidc-client": [ - "setuptools" - ], - "openmm": [ - "cython" - ], - "openpaperwork-core": [ - "setuptools" - ], - "openpaperwork-gtk": [ - "setuptools" - ], - "openpyxl": [ - "setuptools" - ], - "openrazer": [ - "setuptools" - ], - "openrazer-daemon": [ - "setuptools" - ], - "openrouteservice": [ - "setuptools" - ], - "opensensemap-api": [ - "setuptools" - ], - "opensfm": [ - "setuptools" - ], - "openshift": [ - "setuptools" - ], - "opensimplex": [ - "setuptools" - ], - "openstackdocstheme": [ - "pbr", - "setuptools" - ], - "openstacksdk": [ - "pbr", - "setuptools" - ], - "openstep-plist": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "opentelemetry-api": [ - { - "buildSystem": "setuptools", - "until": "1.13.0" - }, - { - "buildSystem": "hatchling", - "from": "1.13.0" - } - ], - "opentelemetry-exporter-jaeger-proto-grpc": [ - { - "buildSystem": "setuptools", - "until": "1.13.0" - }, - { - "buildSystem": "hatchling", - "from": "1.13.0" - } - ], - "opentelemetry-exporter-jaeger-thrift": [ - { - "buildSystem": "setuptools", - "until": "1.13.0" - }, - { - "buildSystem": "hatchling", - "from": "1.13.0" - } - ], - "opentelemetry-exporter-otlp-proto-http": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-instrumentation": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-instrumentation-asgi": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-instrumentation-asyncpg": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-instrumentation-fastapi": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-instrumentation-httpx": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.34b0" - } - ], - "opentelemetry-proto": [ - { - "buildSystem": "setuptools", - "until": "1.13.0" - }, - { - "buildSystem": "hatchling", - "from": "1.13.0" - } - ], - "opentelemetry-sdk": [ - { - "buildSystem": "setuptools", - "until": "1.13.0" - }, - { - "buildSystem": "hatchling", - "from": "1.13.0" - } - ], - "opentelemetry-semantic-conventions": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.33b0" - } - ], - "opentelemetry-util-http": [ - { - "buildSystem": "setuptools", - "until": "0.34b0" - }, - { - "buildSystem": "hatchling", - "from": "0.33b0" - } - ], - "opentimestamps": [ - "setuptools" - ], - "opentracing": [ - "setuptools" - ], - "openvino": [ - "cython" - ], - "openwebifpy": [ - "setuptools" - ], - "openwrt-luci-rpc": [ - "setuptools" - ], - "openwrt-ubus-rpc": [ - "setuptools" - ], - "opsdroid-get-image-size": [ - "setuptools" - ], - "opt-einsum": [ - "setuptools" - ], - "optax": [ - "setuptools" - ], - "option": [ - "poetry-core" - ], - "optional-django": [ - "setuptools" - ], - "opuslib": [ - "setuptools" - ], - "oralb-ble": [ - "poetry-core" - ], - "ordered-set": [ - "flit-core", - "setuptools" - ], - "orderedmultidict": [ - "setuptools" - ], - "orjson": [ - "setuptools" - ], - "orm": [ - "setuptools" - ], - "ormar": [ - "poetry-core", - "setuptools" - ], - "ortools": [ - "setuptools" - ], - "orvibo": [ - "setuptools" - ], - "os-service-types": [ - "pbr", - "setuptools" - ], - "osc": [ - "setuptools" - ], - "osc-lib": [ - "pbr", - "setuptools" - ], - "oscpy": [ - "setuptools" - ], - "oscrypto": [ - "setuptools" - ], - "oset": [ - "setuptools" - ], - "oslo-concurrency": [ - "pbr", - "setuptools" - ], - "oslo-config": [ - "pbr", - "setuptools" - ], - "oslo-context": [ - "pbr", - "setuptools" - ], - "oslo-db": [ - "pbr", - "setuptools" - ], - "oslo-i18n": [ - "pbr", - "setuptools" - ], - "oslo-log": [ - "pbr", - "setuptools" - ], - "oslo-serialization": [ - "pbr", - "setuptools" - ], - "oslo-utils": [ - "pbr", - "setuptools" - ], - "oslotest": [ - "pbr", - "setuptools" - ], - "osmnx": [ - "setuptools" - ], - "osmpythontools": [ - "setuptools" - ], - "ospd": [ - "setuptools" - ], - "osqp": [ - "setuptools", - "setuptools-scm" - ], - "oss2": [ - "setuptools" - ], - "ossfs": [ - "setuptools" - ], - "outcome": [ - "setuptools" - ], - "overly": [ - "setuptools" - ], - "overrides": [ - "setuptools" - ], - "ovh": [ - "setuptools" - ], - "ovmfvartool": [ - "setuptools" - ], - "ovoenergy": [ - "setuptools" - ], - "owslib": [ - "setuptools" - ], - "oyaml": [ - "setuptools" - ], - "p1monitor": [ - "poetry-core", - "setuptools" - ], - "pa-ringbuffer": [ - "setuptools" - ], - "packageurl-python": [ - "setuptools" - ], - "packaging": [ - { - "buildSystem": "setuptools", - "until": "20.4" - }, - { - "buildSystem": "flit-core", - "from": "20.4", - "until": "20.8" - }, - { - "buildSystem": "setuptools", - "from": "20.8", - "until": "22.0" - }, - { - "buildSystem": "flit-core", - "from": "22.0" - } - ], - "packbits": [ - "setuptools" - ], - "packet-python": [ - "setuptools" - ], - "pad4pi": [ - "setuptools" - ], - "paddle-client": [ - "poetry" - ], - "pafy": [ - "setuptools" - ], - "pagelabels": [ - "setuptools" - ], - "paho-mqtt": [ - "setuptools" - ], - "palace": [ - "cython", - "setuptools" - ], - "palettable": [ - "setuptools" - ], - "pallets-sphinx-themes": [ - "setuptools" - ], - "pam": [ - "setuptools" - ], - "pamela": [ - "setuptools" - ], - "pamqp": [ - "setuptools" - ], - "panacotta": [ - "setuptools" - ], - "panasonic-viera": [ - "setuptools" - ], - "pandarrallel": [ - "setuptools" - ], - "pandas": [ - "cython", - "setuptools", - { - "buildSystem": "versioneer", - "from": "2.0.0" - } - ], - "pandas-datareader": [ - "setuptools" - ], - "pandas-stubs": [ - "poetry-core", - "setuptools" - ], - "pandoc-attributes": [ - "setuptools" - ], - "pandoc-xnos": [ - "setuptools" - ], - "pandocfilters": [ - "setuptools" - ], - "panel": [ - "setuptools" - ], - "panflute": [ - "setuptools" - ], - "pao": [ - "setuptools" - ], - "papermill": [ - "setuptools" - ], - "paperwork-backend": [ - "setuptools" - ], - "paperwork-shell": [ - "setuptools" - ], - "papis": [ - "setuptools" - ], - "papis-python-rofi": [ - "setuptools" - ], - "param": [ - "setuptools" - ], - "parameter-expansion-patched": [ - "setuptools", - "setuptools-scm" - ], - "parameterized": [ - "setuptools" - ], - "paramiko": [ - "setuptools" - ], - "paramz": [ - "setuptools" - ], - "paranoid-crypto": [ - "setuptools" - ], - "parfive": [ - "setuptools", - "setuptools-scm" - ], - "parquet": [ - "setuptools" - ], - "parse": [ - "setuptools" - ], - "parse-type": [ - "setuptools" - ], - "parsedatetime": [ - "setuptools" - ], - "parsedmarc": [ - "setuptools" - ], - "parsel": [ - "setuptools" - ], - "parsimonious": [ - "setuptools" - ], - "parsita": [ - "poetry" - ], - "parsley": [ - "setuptools" - ], - "parso": [ - "setuptools" - ], - "parsy": [ - "setuptools" - ], - "partd": [ - "setuptools" - ], - "particle": [ - "setuptools", - "setuptools-scm" - ], - "parts": [ - "setuptools" - ], - "parver": [ - "setuptools" - ], - "passlib": [ - "setuptools" - ], - "paste": [ - "setuptools" - ], - "pastedeploy": [ - "setuptools" - ], - "pastel": [ - "poetry-core", - "setuptools" - ], - "pastescript": [ - "setuptools" - ], - "patch": [ - "setuptools" - ], - "patch-ng": [ - "setuptools" - ], - "path": [ - "setuptools", - "setuptools-scm" - ], - "path-and-address": [ - "setuptools" - ], - "pathable": [ - "poetry-core", - "setuptools" - ], - "pathlib2": [ - "setuptools" - ], - "pathos": [ - "setuptools" - ], - "pathpy": [ - "setuptools", - "setuptools-scm" - ], - "pathspec": [ - { - "buildSystem": "setuptools", - "until": "0.11.0" - }, - { - "buildSystem": "flit-core", - "from": "0.11.0" - } - ], - "pathtools": [ - "setuptools" - ], - "pathvalidate": [ - "setuptools" - ], - "pathy": [ - "setuptools" - ], - "patiencediff": [ - "setuptools" - ], - "patool": [ - "setuptools" - ], - "patrowl4py": [ - "setuptools" - ], - "patsy": [ - "setuptools" - ], - "paver": [ - "setuptools" - ], - "paypalrestsdk": [ - "setuptools" - ], - "pbkdf2": [ - "setuptools" - ], - "pbr": [ - "setuptools" - ], - "pc-ble-driver-py": [ - "setuptools" - ], - "pcapy-ng": [ - "cython", - "setuptools" - ], - "pcodedmp": [ - "setuptools" - ], - "pcpp": [ - "setuptools" - ], - "pdb-tools": [ - "setuptools" - ], - "pdb2pqr": [ - "setuptools" - ], - "pdbpp": [ - "setuptools", - "setuptools-scm" - ], - "pdbtools": [ - "setuptools" - ], - "pdf2image": [ - "setuptools" - ], - "pdfkit": [ - "setuptools" - ], - "pdfminer": [ - "setuptools" - ], - "pdfminer-six": [ - "setuptools" - ], - "pdfposter": [ - "setuptools" - ], - "pdfrw": [ - "setuptools" - ], - "pdftotext": [ - "setuptools" - ], - "pdfx": [ - "setuptools" - ], - "pdm-pep517": [ - "setuptools" - ], - "pdoc": [ - "setuptools" - ], - "pdoc3": [ - "setuptools", - "setuptools-scm" - ], - "pdunehd": [ - "setuptools" - ], - "peaqevcore": [ - "setuptools" - ], - "pebble": [ - "setuptools" - ], - "pecan": [ - "setuptools" - ], - "peco": [ - "setuptools" - ], - "peewee": [ - "cython", - "setuptools" - ], - "pefile": [ - "setuptools", - "setuptools-scm" - ], - "peft": [ - "setuptools" - ], - "pelican": [ - "setuptools" - ], - "pem": [ - "setuptools" - ], - "pencompy": [ - "setuptools" - ], - "pendulum": [ - "poetry-core", - "setuptools" - ], - "pep257": [ - "setuptools" - ], - "pep440": [ - "flit-core", - "setuptools" - ], - "pep440-version-utils": [ - "poetry" - ], - "pep517": [ - "flit-core", - "setuptools" - ], - "pep8": [ - "setuptools" - ], - "pep8-naming": [ - "setuptools" - ], - "peppercorn": [ - "setuptools" - ], - "percol": [ - "setuptools" - ], - "periodictable": [ - "setuptools" - ], - "persim": [ - "setuptools" - ], - "persistent": [ - "setuptools" - ], - "persisting-theory": [ - "setuptools" - ], - "pescea": [ - "setuptools" - ], - "petname": [ - "setuptools" - ], - "pex": [ - "flit-core", - "setuptools" - ], - "pexif": [ - "setuptools" - ], - "pexpect": [ - "setuptools" - ], - "pg-activity": [ - "setuptools" - ], - "pg8000": [ - "setuptools" - ], - "pgcli": [ - "setuptools" - ], - "pglast": [ - "setuptools" - ], - "pgpdump": [ - "setuptools" - ], - "pgpy": [ - "setuptools" - ], - "pgsanity": [ - "setuptools" - ], - "pgspecial": [ - "setuptools" - ], - "phe": [ - "setuptools" - ], - "phik": [ - "setuptools" - ], - "phone-modem": [ - "setuptools" - ], - "phonemizer": [ - "setuptools" - ], - "phonenumbers": [ - "setuptools" - ], - "phonopy": [ - "setuptools" - ], - "phpserialize": [ - "setuptools" - ], - "phx-class-registry": [ - "setuptools" - ], - "pi1wire": [ - "setuptools" - ], - "piccata": [ - "setuptools" - ], - "piccolo-theme": [ - "setuptools" - ], - "pick": [ - "poetry-core", - "setuptools" - ], - "pickleshare": [ - "setuptools" - ], - "picobox": [ - "setuptools", - "setuptools-scm" - ], - "picos": [ - "setuptools" - ], - "pid": [ - "setuptools" - ], - "piexif": [ - "setuptools" - ], - "pijuice": [ - "setuptools" - ], - "pika": [ - "setuptools" - ], - "pika-pool": [ - "setuptools" - ], - "pikepdf": [ - "setuptools", - "setuptools-scm" - ], - "pilkit": [ - "setuptools" - ], - "pillow": [ - "setuptools" - ], - "pillow-simd": [ - "setuptools" - ], - "pillowfight": [ - "setuptools" - ], - "pims": [ - "setuptools" - ], - "pinboard": [ - "setuptools" - ], - "pint": [ - "setuptools", - "setuptools-scm" - ], - "pint-pandas": [ - "setuptools", - "setuptools-scm" - ], - "pip": [ - "setuptools" - ], - "pip-api": [ - "setuptools" - ], - "pip-licenses": [ - "setuptools", - "pytest-runner" - ], - "pip-requirements-parser": [ - "setuptools", - "setuptools-scm" - ], - "pip-tools": [ - "setuptools", - "setuptools-scm" - ], - "pipdate": [ - "setuptools" - ], - "pipdeptree": [ - "hatch-vcs", - "hatchling", - "setuptools" - ], - "pipenv-poetry-migrate": [ - "poetry-core", - "setuptools" - ], - "pipx": [ - "hatchling", - "setuptools" - ], - "pivy": [ - "setuptools" - ], - "pixcat": [ - "setuptools" - ], - "pixelmatch": [ - "poetry-core", - "setuptools" - ], - "pkce": [ - "setuptools" - ], - "pkgconfig": [ - "poetry-core", - "setuptools" - ], - "pkginfo": [ - "setuptools" - ], - "pkginfo2": [ - "setuptools" - ], - "pkgutil-resolve-name": [ - "flit-core" - ], - "pkutils": [ - "setuptools" - ], - "plac": [ - "setuptools" - ], - "plaid-python": [ - "setuptools" - ], - "plantuml": [ - "setuptools" - ], - "plantuml-markdown": [ - "setuptools" - ], - "plaster": [ - "setuptools" - ], - "plaster-pastedeploy": [ - "setuptools" - ], - "platformdirs": [ - "hatch-vcs", - "hatchling", - "setuptools", - "setuptools-scm" - ], - "playsound": [ - "setuptools" - ], - "playwright": [ - "setuptools-scm" - ], - "plexapi": [ - "setuptools" - ], - "plexauth": [ - "setuptools" - ], - "plexwebsocket": [ - "setuptools" - ], - "plone-testing": [ - "setuptools" - ], - "plotly": [ - "setuptools" - ], - "plotnine": [ - "setuptools" - ], - "pluggy": [ - "setuptools", - "setuptools-scm" - ], - "pluginbase": [ - "setuptools" - ], - "plugincode": [ - "setuptools", - "setuptools-scm" - ], - "plugnplay": [ - "setuptools" - ], - "plugwise": [ - "setuptools" - ], - "plum-py": [ - "setuptools" - ], - "plumbum": [ - { - "buildSystem": "setuptools", - "until": "1.8.1" - }, - { - "buildSystem": "setuptools-scm", - "until": "1.8.1" - }, - { - "buildSystem": "hatch-vcs", - "from": "1.8.1" - }, - { - "buildSystem": "hatchling", - "from": "1.8.1" - } - ], - "pluralizer": [ - "setuptools" - ], - "plux": [ - "pytest-runner", - "setuptools" - ], - "ply": [ - "setuptools" - ], - "plyer": [ - "setuptools" - ], - "plyfile": [ - "setuptools" - ], - "plyplus": [ - "setuptools" - ], - "plyvel": [ - "setuptools" - ], - "pmdarima": [ - "setuptools" - ], - "pmsensor": [ - "setuptools" - ], - "pmw": [ - "setuptools" - ], - "pocket": [ - "setuptools" - ], - "podcastparser": [ - "setuptools" - ], - "podcats": [ - "setuptools" - ], - "poetry-dynamic-versioning": [ - "poetry-core", - "setuptools" - ], - "poetry-plugin-export": [ - "poetry-core" - ], - "poetry-semver": [ - "setuptools" - ], - "poetry2conda": [ - "poetry", - "setuptools" - ], - "poezio": [ - "setuptools" - ], - "polarizationsolver": [ - "setuptools" - ], - "polib": [ - "setuptools" - ], - "policy-sentry": [ - "setuptools" - ], - "policyuniverse": [ - "setuptools" - ], - "polyline": [ - "setuptools" - ], - "pomegranate": [ - "cython", - "setuptools" - ], - "pontos": [ - "poetry-core", - "setuptools" - ], - "pony": [ - "setuptools" - ], - "ponywhoosh": [ - "setuptools" - ], - "pooch": [ - "setuptools", - "setuptools-scm" - ], - "pook": [ - "setuptools" - ], - "poolsense": [ - "setuptools" - ], - "poppler-qt5": [ - "setuptools" - ], - "portalocker": [ - "setuptools" - ], - "portend": [ - "setuptools", - "setuptools-scm" - ], - "portpicker": [ - "setuptools" - ], - "posix-ipc": [ - "setuptools" - ], - "pot": [ - "cython", - "setuptools" - ], - "potentials": [ - "setuptools" - ], - "potr": [ - "setuptools" - ], - "power": [ - "setuptools" - ], - "powerline": [ - "setuptools" - ], - "powerline-mem-segment": [ - "setuptools" - ], - "powerlinememsegment": [ - "setuptools" - ], - "pox": [ - "setuptools" - ], - "poyo": [ - "setuptools" - ], - "ppdeep": [ - "setuptools" - ], - "ppft": [ - "setuptools" - ], - "pplpy": [ - "cython", - "setuptools" - ], - "pprintpp": [ - "setuptools" - ], - "pproxy": [ - "setuptools" - ], - "ppscore": [ - "setuptools" - ], - "pq": [ - "setuptools" - ], - "prance": [ - "setuptools", - "setuptools-scm" - ], - "praw": [ - "setuptools" - ], - "prawcore": [ - "setuptools" - ], - "prayer-times-calculator": [ - "setuptools" - ], - "pre-commit": [ - "setuptools" - ], - "pre-commit-hooks": [ - "setuptools" - ], - "pre-commit-po-hooks": [ - "setuptools" - ], - "precis-i18n": [ - "setuptools" - ], - "prefixed": [ - "setuptools" - ], - "preggy": [ - "setuptools" - ], - "premailer": [ - "setuptools" - ], - "preprocess-cancellation": [ - "poetry-core", - "setuptools" - ], - "preshed": [ - "cython", - "setuptools" - ], - "pretend": [ - "setuptools" - ], - "prettytable": [ - { - "buildSystem": "setuptools", - "until": "3.5.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "3.5.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "3.5.0" - }, - { - "buildSystem": "hatchling", - "from": "3.5.0" - } - ], - "primecountpy": [ - "cython", - "setuptools" - ], - "primer3": [ - "cython", - "setuptools" - ], - "priority": [ - "setuptools" - ], - "prison": [ - "setuptools" - ], - "privacyidea-ldap-proxy": [ - "setuptools" - ], - "proboscis": [ - "setuptools" - ], - "process-tests": [ - "setuptools" - ], - "proglog": [ - "setuptools" - ], - "progress": [ - "setuptools" - ], - "progressbar": [ - "setuptools" - ], - "progressbar2": [ - "setuptools" - ], - "progressbar33": [ - "setuptools" - ], - "prometheus-client": [ - "setuptools" - ], - "prometheus-fastapi-instrumentator": [ - "poetry" - ], - "prometheus-flask-exporter": [ - "setuptools" - ], - "promise": [ - "setuptools" - ], - "prompt-toolkit": [ - "setuptools" - ], - "property-manager": [ - "setuptools" - ], - "propka": [ - "setuptools" - ], - "prospector": [ - "poetry-core" - ], - "protego": [ - "setuptools" - ], - "proto-plus": [ - "setuptools" - ], - "protobuf": [ - "setuptools" - ], - "protobuf3-to-dict": [ - "setuptools" - ], - "protoletariat": [ - "poetry-core" - ], - "proton-client": [ - "setuptools" - ], - "protonup": [ - "setuptools" - ], - "protonvpn-nm-lib": [ - "setuptools" - ], - "prov": [ - "setuptools" - ], - "prox-tv": [ - "setuptools" - ], - "proxmoxer": [ - "setuptools" - ], - "proxy-py": [ - "setuptools", - "setuptools-scm" - ], - "proxy-tools": [ - "setuptools" - ], - "psautohint": [ - "setuptools", - "setuptools-scm" - ], - "pscript": [ - "setuptools" - ], - "psd-tools": [ - "cython", - "setuptools" - ], - "psrpcore": [ - "setuptools" - ], - "psutil": [ - "setuptools" - ], - "psutil-home-assistant": [ - "setuptools" - ], - "psycopg": [ - "setuptools" - ], - "psycopg-pool": [ - "setuptools" - ], - "psycopg2": [ - "setuptools" - ], - "psycopg2-binary": [ - "setuptools" - ], - "psycopg2cffi": [ - "setuptools" - ], - "psygnal": [ - "setuptools", - "setuptools-scm" - ], - "ptable": [ - "setuptools" - ], - "ptest": [ - "setuptools" - ], - "ptpython": [ - "setuptools" - ], - "ptyprocess": [ - "flit-core", - "setuptools" - ], - "publication": [ - "flit" - ], - "publicsuffix": [ - "setuptools" - ], - "publicsuffix2": [ - "setuptools" - ], - "pubnub": [ - "setuptools" - ], - "pubnubsub-handler": [ - "setuptools" - ], - "pudb": [ - "setuptools" - ], - "pulp": [ - "setuptools" - ], - "pulsectl": [ - "setuptools" - ], - "pulumi": [ - "setuptools" - ], - "pulumi-aws": [ - "setuptools" - ], - "pulumi-azure-native": [ - "setuptools" - ], - "pure-cdb": [ - "setuptools" - ], - "pure-eval": [ - "setuptools", - "setuptools-scm" - ], - "pure-pcapy3": [ - "setuptools" - ], - "pure-python-adb": [ - "setuptools" - ], - "pure-python-adb-homeassistant": [ - "setuptools" - ], - "pure-sasl": [ - "setuptools" - ], - "puremagic": [ - "setuptools" - ], - "purepng": [ - "cython", - "setuptools" - ], - "purl": [ - "setuptools" - ], - "push-receiver": [ - "setuptools" - ], - "pushbullet": [ - "setuptools" - ], - "pushover-complete": [ - "setuptools" - ], - "pvlib": [ - "setuptools" - ], - "pvo": [ - "poetry-core", - "setuptools" - ], - "pweave": [ - "setuptools" - ], - "pwntools": [ - "setuptools" - ], - "py": [ - "setuptools", - "setuptools-scm" - ], - "py-air-control": [ - "setuptools" - ], - "py-air-control-exporter": [ - "setuptools" - ], - "py-canary": [ - "setuptools" - ], - "py-cid": [ - "setuptools" - ], - "py-cord": [ - "setuptools", - "setuptools-scm" - ], - "py-cpuinfo": [ - "setuptools" - ], - "py-deprecate": [ - "setuptools" - ], - "py-desmume": [ - "setuptools" - ], - "py-dmidecode": [ - "setuptools" - ], - "py-ecc": [ - "setuptools" - ], - "py-eth-sig-utils": [ - "setuptools" - ], - "py-libzfs": [ - "cython" - ], - "py-lru-cache": [ - "setuptools" - ], - "py-multiaddr": [ - "setuptools" - ], - "py-multibase": [ - "setuptools" - ], - "py-multicodec": [ - "setuptools" - ], - "py-multihash": [ - "pytest-runner", - "setuptools" - ], - "py-nextbusnext": [ - "setuptools" - ], - "py-nightscout": [ - "setuptools" - ], - "py-partiql-parser": [ - "setuptools" - ], - "py-scrypt": [ - "setuptools" - ], - "py-sneakers": [ - "setuptools" - ], - "py-sonic": [ - "setuptools" - ], - "py-stringmatching": [ - "setuptools" - ], - "py-synologydsm-api": [ - "poetry-core", - "setuptools" - ], - "py-tes": [ - "setuptools" - ], - "py-tree-sitter": [ - "setuptools" - ], - "py-ubjson": [ - "setuptools" - ], - "py-vapid": [ - "setuptools" - ], - "py-zabbix": [ - "setuptools" - ], - "py17track": [ - "poetry-core", - "setuptools" - ], - "py2bit": [ - "setuptools" - ], - "py3exiv2": [ - "setuptools" - ], - "py3rijndael": [ - "setuptools" - ], - "py3status": [ - "setuptools" - ], - "py3to2": [ - "setuptools" - ], - "py4j": [ - "setuptools" - ], - "pyacoustid": [ - "setuptools" - ], - "pyads": [ - "setuptools" - ], - "pyaehw4a1": [ - "setuptools" - ], - "pyaes": [ - "setuptools" - ], - "pyaftership": [ - "setuptools" - ], - "pyahocorasick": [ - "setuptools" - ], - "pyairnow": [ - "poetry-core", - "setuptools" - ], - "pyairtable": [ - "setuptools" - ], - "pyairvisual": [ - "poetry-core", - "setuptools" - ], - "pyalgotrade": [ - "setuptools" - ], - "pyalmond": [ - "setuptools" - ], - "pyamg": [ - "setuptools", - "setuptools-scm" - ], - "pyaml": [ - "setuptools" - ], - "pyannotate": [ - "setuptools" - ], - "pyarlo": [ - "setuptools" - ], - "pyarr": [ - "setuptools" - ], - "pyarrow": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "pyasn": [ - "setuptools" - ], - "pyasn1": [ - "setuptools" - ], - "pyasn1-modules": [ - "setuptools" - ], - "pyatag": [ - "setuptools" - ], - "pyathena": [ - "setuptools" - ], - "pyatmo": [ - "setuptools", - "setuptools-scm" - ], - "pyatome": [ - "setuptools" - ], - "pyatspi": [ - "setuptools" - ], - "pyatv": [ - "setuptools" - ], - "pyaudio": [ - "setuptools" - ], - "pyaussiebb": [ - "poetry-core", - "setuptools" - ], - "pyautogui": [ - "setuptools" - ], - "pyavm": [ - "setuptools" - ], - "pyaxmlparser": [ - "setuptools" - ], - "pybalboa": [ - "setuptools" - ], - "pybase64": [ - "setuptools" - ], - "pybigwig": [ - "setuptools" - ], - "pybind11": [ - "setuptools" - ], - "pybindgen": [ - "setuptools", - "setuptools-scm" - ], - "pyblackbird": [ - "setuptools" - ], - "pyblake2": [ - "setuptools" - ], - "pybluez": [ - "setuptools" - ], - "pybotvac": [ - "setuptools" - ], - "pybravia": [ - "poetry-core" - ], - "pybrowserid": [ - "setuptools" - ], - "pybtex": [ - "setuptools" - ], - "pybtex-docutils": [ - "setuptools" - ], - "pybullet": [ - "setuptools" - ], - "pycairo": [ - "setuptools" - ], - "pycangjie": [ - "cython", - "setuptools" - ], - "pycapnp": [ - "cython", - "setuptools" - ], - "pycaption": [ - "setuptools" - ], - "pycares": [ - "setuptools" - ], - "pycarwings2": [ - "setuptools" - ], - "pycategories": [ - "setuptools" - ], - "pycdio": [ - "setuptools" - ], - "pycec": [ - "setuptools" - ], - "pycep-parser": [ - "poetry-core", - "setuptools" - ], - "pycfdns": [ - "setuptools" - ], - "pycflow2dot": [ - "setuptools" - ], - "pycfmodel": [ - "setuptools" - ], - "pychannels": [ - "setuptools" - ], - "pychef": [ - "setuptools" - ], - "pychm": [ - "setuptools" - ], - "pychromecast": [ - "setuptools" - ], - "pycketcasts": [ - "setuptools" - ], - "pyclimacell": [ - "setuptools" - ], - "pyclip": [ - "setuptools" - ], - "pyclipper": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "pycm": [ - "setuptools" - ], - "pycmarkgfm": [ - "setuptools" - ], - "pycocotools": [ - "cython", - "setuptools" - ], - "pycodestyle": [ - "setuptools" - ], - "pycognito": [ - "setuptools" - ], - "pycoin": [ - "setuptools" - ], - "pycollada": [ - "setuptools" - ], - "pycomfoconnect": [ - "setuptools" - ], - "pycontracts": [ - "setuptools" - ], - "pycontrol4": [ - "setuptools" - ], - "pycoolmasternet-async": [ - "setuptools" - ], - "pycosat": [ - "setuptools" - ], - "pycountry": [ - "setuptools" - ], - "pycparser": [ - "setuptools" - ], - "pycrc": [ - "setuptools" - ], - "pycritty": [ - "setuptools" - ], - "pycron": [ - "setuptools" - ], - "pycrypto": [ - "setuptools" - ], - "pycryptodome": [ - "setuptools" - ], - "pycryptodomex": [ - "setuptools" - ], - "pycsdr": [ - "setuptools" - ], - "pyct": [ - "setuptools" - ], - "pyctr": [ - "setuptools" - ], - "pycuda": [ - "setuptools" - ], - "pycups": [ - "setuptools" - ], - "pycurl": [ - "setuptools" - ], - "pycxx": [ - "setuptools" - ], - "pydaikin": [ - "setuptools" - ], - "pydal": [ - "setuptools" - ], - "pydanfossair": [ - "setuptools" - ], - "pydantic": [ - "cython", - "setuptools" - ], - "pydantic-dydb": [ - "poetry-core" - ], - "pydash": [ - "setuptools" - ], - "pydata-sphinx-theme": [ - "setuptools" - ], - "pydbus": [ - "setuptools" - ], - "pydeck": [ - "setuptools" - ], - "pydeconz": [ - "setuptools" - ], - "pydelijn": [ - "setuptools" - ], - "pydenticon": [ - "setuptools" - ], - "pydeprecate": [ - "setuptools" - ], - "pydeps": [ - "setuptools" - ], - "pydes": [ - "setuptools" - ], - "pydevccu": [ - "setuptools" - ], - "pydevd": [ - "setuptools" - ], - "pydevd-odoo": [ - "setuptools" - ], - "pydexcom": [ - "setuptools" - ], - "pydicom": [ - "setuptools" - ], - "pydigiham": [ - "setuptools" - ], - "pydispatcher": [ - "setuptools" - ], - "pydmd": [ - "setuptools" - ], - "pydns": [ - "setuptools" - ], - "pydocstyle": [ - { - "buildSystem": "setuptools", - "until": "6.2.0" - }, - { - "buildSystem": "poetry-core", - "from": "6.2.0" - } - ], - "pydocumentdb": [ - "setuptools" - ], - "pydoods": [ - "setuptools" - ], - "pydot": [ - "setuptools" - ], - "pydpkg": [ - "poetry" - ], - "pydrive2": [ - "setuptools" - ], - "pydroid-ipcam": [ - "setuptools" - ], - "pydruid": [ - "setuptools" - ], - "pydsdl": [ - "setuptools" - ], - "pydub": [ - "setuptools" - ], - "pyduke-energy": [ - "setuptools" - ], - "pydy": [ - "cython", - "setuptools" - ], - "pydyf": [ - "flit-core", - "setuptools" - ], - "pyeapi": [ - "setuptools" - ], - "pyebus": [ - "poetry-core", - "setuptools" - ], - "pyeclib": [ - "setuptools" - ], - "pyeconet": [ - "setuptools" - ], - "pyecowitt": [ - "setuptools" - ], - "pyedimax": [ - "setuptools" - ], - "pyee": [ - "setuptools" - ], - "pyefergy": [ - "setuptools" - ], - "pyeight": [ - "setuptools" - ], - "pyelftools": [ - "setuptools" - ], - "pyemby": [ - "setuptools" - ], - "pyemd": [ - "cython", - "setuptools" - ], - "pyenchant": [ - "setuptools" - ], - "pyenvisalink": [ - "setuptools" - ], - "pyephember": [ - "setuptools" - ], - "pyepsg": [ - "setuptools" - ], - "pyerfa": [ - "setuptools", - "setuptools-scm" - ], - "pyeverlights": [ - "setuptools" - ], - "pyevilgenius": [ - "setuptools" - ], - "pyevmasm": [ - "setuptools" - ], - "pyexcel": [ - "setuptools" - ], - "pyexcel-io": [ - "setuptools" - ], - "pyexcel-ods": [ - "setuptools" - ], - "pyexcel-xls": [ - "setuptools" - ], - "pyext": [ - "setuptools" - ], - "pyezviz": [ - "setuptools" - ], - "pyface": [ - "setuptools" - ], - "pyfaidx": [ - "setuptools", - "setuptools-scm" - ], - "pyfakefs": [ - "setuptools" - ], - "pyfakewebcam": [ - "setuptools" - ], - "pyfantom": [ - "setuptools" - ], - "pyfcm": [ - "setuptools" - ], - "pyfftw": [ - "cython", - "setuptools" - ], - "pyfido": [ - "setuptools" - ], - "pyfiglet": [ - "setuptools" - ], - "pyfireservicerota": [ - "setuptools" - ], - "pyflakes": [ - "setuptools" - ], - "pyflexit": [ - "setuptools" - ], - "pyflic": [ - "setuptools" - ], - "pyflick": [ - "setuptools" - ], - "pyflume": [ - "setuptools" - ], - "pyflunearyou": [ - "poetry-core", - "setuptools" - ], - "pyfma": [ - "setuptools" - ], - "pyfnip": [ - "setuptools" - ], - "pyfreedompro": [ - "setuptools" - ], - "pyfribidi": [ - "setuptools" - ], - "pyfritzhome": [ - "setuptools" - ], - "pyfronius": [ - "setuptools" - ], - "pyftdi": [ - "setuptools" - ], - "pyftgl": [ - "setuptools" - ], - "pyftpdlib": [ - "setuptools" - ], - "pyfttt": [ - "setuptools" - ], - "pyfuse3": [ - "cython", - "setuptools" - ], - "pyfxa": [ - "setuptools" - ], - "pyfzf": [ - "setuptools" - ], - "pygal": [ - "setuptools" - ], - "pygame": [ - "setuptools" - ], - "pygame-gui": [ - "setuptools" - ], - "pygame-sdl2": [ - "cython", - "setuptools" - ], - "pygatt": [ - "setuptools" - ], - "pygccxml": [ - "setuptools" - ], - "pygdbmi": [ - "setuptools" - ], - "pygeoip": [ - "setuptools" - ], - "pygeos": [ - "cython", - "setuptools" - ], - "pygetwindow": [ - "setuptools" - ], - "pygit2": [ - "setuptools" - ], - "pygithub": [ - "setuptools" - ], - "pyglet": [ - "setuptools" - ], - "pygls": [ - "setuptools", - "setuptools-scm" - ], - "pygltflib": [ - "setuptools" - ], - "pygmars": [ - "setuptools", - "setuptools-scm" - ], - "pygments": [ - "setuptools" - ], - "pygments-better-html": [ - "setuptools" - ], - "pygments-markdown-lexer": [ - "setuptools" - ], - "pygmt": [ - "setuptools", - "setuptools-scm" - ], - "pygobject3": [ - "setuptools" - ], - "pygogo": [ - "setuptools" - ], - "pygpgme": [ - "setuptools" - ], - "pygraphviz": [ - "setuptools" - ], - "pygreat": [ - "setuptools" - ], - "pygrok": [ - "setuptools" - ], - "pygtail": [ - "setuptools" - ], - "pygtfs": [ - "setuptools", - "setuptools-scm" - ], - "pygti": [ - "setuptools", - "setuptools-scm" - ], - "pygtkspellcheck": [ - "setuptools" - ], - "pygtrie": [ - "setuptools" - ], - "pyhamcrest": [ - "hatch-vcs", - "hatchling", - "setuptools" - ], - "pyhanko": [ - "setuptools" - ], - "pyhanko-certvalidator": [ - "setuptools" - ], - "pyhaversion": [ - "setuptools" - ], - "pyhcl": [ - "setuptools" - ], - "pyheos": [ - "setuptools" - ], - "pyhiveapi": [ - "setuptools" - ], - "pyhocon": [ - "setuptools" - ], - "pyhomematic": [ - "setuptools" - ], - "pyhomepilot": [ - "setuptools" - ], - "pyhomeworks": [ - "setuptools" - ], - "pyhs100": [ - "setuptools" - ], - "pyhumps": [ - "poetry-core", - "setuptools" - ], - "pyi2cflash": [ - "setuptools" - ], - "pyialarm": [ - "setuptools" - ], - "pyicloud": [ - "setuptools" - ], - "pyicu": [ - "setuptools" - ], - "pyimpfuzzy": [ - "setuptools" - ], - "pyinfra": [ - "setuptools" - ], - "pyinotify": [ - "setuptools" - ], - "pyinputevent": [ - "setuptools" - ], - "pyinsteon": [ - "setuptools" - ], - "pyinstrument": [ - "setuptools" - ], - "pyintesishome": [ - "setuptools" - ], - "pyipma": [ - "setuptools" - ], - "pyipp": [ - "poetry-core", - "setuptools" - ], - "pyiqvia": [ - "poetry-core", - "setuptools" - ], - "pyisbn": [ - "setuptools" - ], - "pyisy": [ - "setuptools" - ], - "pyjet": [ - "cython", - "setuptools" - ], - "pyjks": [ - "setuptools" - ], - "pyjnius": [ - "cython", - "setuptools" - ], - "pyjsg": [ - "pbr" - ], - "pyjson5": [ - "setuptools" - ], - "pyjsparser": [ - "setuptools" - ], - "pyjwkest": [ - "setuptools" - ], - "pyjwt": [ - "setuptools" - ], - "pykakasi": [ - "setuptools", - "setuptools-scm" - ], - "pykdtree": [ - "setuptools" - ], - "pykeepass": [ - "setuptools" - ], - "pykerberos": [ - "setuptools" - ], - "pykeyatome": [ - "setuptools" - ], - "pykira": [ - "setuptools" - ], - "pykka": [ - "poetry-core", - "setuptools" - ], - "pykmtronic": [ - "setuptools" - ], - "pykodi": [ - "setuptools" - ], - "pykoplenti": [ - "setuptools" - ], - "pykostalpiko": [ - "setuptools" - ], - "pykrakenapi": [ - "setuptools" - ], - "pykube-ng": [ - "setuptools" - ], - "pykulersky": [ - "setuptools" - ], - "pykwalify": [ - "setuptools" - ], - "pykwb": [ - "setuptools" - ], - "pylacrosse": [ - "setuptools" - ], - "pylama": [ - "setuptools" - ], - "pylast": [ - "hatch-vcs", - "hatchling", - "setuptools", - "setuptools-scm" - ], - "pylatexenc": [ - "setuptools" - ], - "pylaunches": [ - "setuptools" - ], - "pyld": [ - "setuptools" - ], - "pylev": [ - "setuptools" - ], - "pylgnetcast": [ - "setuptools" - ], - "pylibacl": [ - "setuptools" - ], - "pylibconfig2": [ - "setuptools" - ], - "pylibdmtx": [ - "setuptools" - ], - "pylibftdi": [ - "setuptools" - ], - "pyliblo": [ - "cython", - "setuptools" - ], - "pylibmc": [ - "setuptools" - ], - "pylightning": [ - "setuptools" - ], - "pylink-square": [ - "setuptools" - ], - "pylint": [ - "setuptools" - ], - "pylint-celery": [ - "setuptools" - ], - "pylint-django": [ - "setuptools" - ], - "pylint-flask": [ - "setuptools" - ], - "pylint-plugin-utils": [ - "setuptools", - "poetry" - ], - "pylint-venv": [ - "poetry-core" - ], - "pylitterbot": [ - "poetry-core", - "setuptools" - ], - "pyln-bolt7": [ - "poetry" - ], - "pyln-client": [ - "poetry" - ], - "pyln-proto": [ - "poetry" - ], - "pylnk3": [ - "setuptools" - ], - "pylru": [ - "setuptools" - ], - "pyls-flake8": [ - "setuptools" - ], - "pyls-isort": [ - "setuptools" - ], - "pyls-spyder": [ - "setuptools" - ], - "pylsp-mypy": [ - "setuptools" - ], - "pylutron": [ - "setuptools" - ], - "pylutron-caseta": [ - "setuptools" - ], - "pylxd": [ - "setuptools" - ], - "pylyrics": [ - "setuptools" - ], - "pylzma": [ - "setuptools" - ], - "pymacaroons": [ - "setuptools" - ], - "pymaging": [ - "setuptools" - ], - "pymaging-png": [ - "setuptools" - ], - "pymailgunner": [ - "setuptools" - ], - "pymanopt": [ - "setuptools" - ], - "pymarkdown": [ - "setuptools" - ], - "pymarshal": [ - "setuptools" - ], - "pymata-express": [ - "setuptools" - ], - "pymatgen": [ - "cython", - "setuptools" - ], - "pymaven-patch": [ - "pbr", - "setuptools" - ], - "pymavlink": [ - "setuptools" - ], - "pymazda": [ - "setuptools" - ], - "pymbolic": [ - "setuptools" - ], - "pymc": [ - "setuptools" - ], - "pymc3": [ - "setuptools" - ], - "pymdown-extensions": [ - "hatchling", - "setuptools" - ], - "pymdstat": [ - "setuptools" - ], - "pymediainfo": [ - "setuptools", - "setuptools-scm" - ], - "pymediaroom": [ - "setuptools" - ], - "pymeeus": [ - "setuptools" - ], - "pymelcloud": [ - "setuptools" - ], - "pymemcache": [ - "setuptools" - ], - "pymemoize": [ - "setuptools" - ], - "pyment": [ - "setuptools" - ], - "pymetar": [ - "setuptools" - ], - "pymeteireann": [ - "setuptools" - ], - "pymeteoclimatic": [ - "setuptools" - ], - "pymetno": [ - "setuptools" - ], - "pymfy": [ - "poetry-core", - "setuptools" - ], - "pymicrobot": [ - "setuptools" - ], - "pymitv": [ - "setuptools" - ], - "pymodbus": [ - "setuptools" - ], - "pymongo": [ - "setuptools" - ], - "pymoo": [ - "cython", - "setuptools" - ], - "pymorphy2": [ - "setuptools" - ], - "pymorphy2-dicts-ru": [ - "setuptools" - ], - "pympler": [ - "setuptools" - ], - "pymsgbox": [ - "setuptools" - ], - "pymssql": [ - "cython", - "setuptools" - ], - "pymsteams": [ - "setuptools" - ], - "pymumble": [ - "setuptools" - ], - "pymunk": [ - "setuptools" - ], - "pymupdf": [ - "setuptools" - ], - "pymvglive": [ - "setuptools" - ], - "pymyq": [ - "setuptools" - ], - "pymysensors": [ - "setuptools" - ], - "pymysql": [ - "setuptools" - ], - "pymysqlsa": [ - "setuptools" - ], - "pymystem3": [ - "setuptools" - ], - "pynac": [ - "setuptools" - ], - "pynacl": [ - "setuptools" - ], - "pynamecheap": [ - "setuptools" - ], - "pynamodb": [ - "setuptools" - ], - "pynanoleaf": [ - "setuptools" - ], - "pynello": [ - "setuptools" - ], - "pynest2d": [ - "setuptools" - ], - "pynetbox": [ - "setuptools", - "setuptools-scm" - ], - "pynetdicom": [ - "setuptools" - ], - "pynetgear": [ - "setuptools" - ], - "pynina": [ - "setuptools" - ], - "pynisher": [ - "setuptools" - ], - "pynixutil": [ - "poetry" - ], - "pynmea2": [ - "setuptools" - ], - "pynndescent": [ - "setuptools" - ], - "pynobo": [ - "setuptools" - ], - "pynput": [ - "setuptools" - ], - "pynrrd": [ - "setuptools" - ], - "pynuki": [ - "poetry-core", - "setuptools" - ], - "pynut2": [ - "setuptools" - ], - "pynvim": [ - "setuptools" - ], - "pynvml": [ - "setuptools" - ], - "pynws": [ - "setuptools" - ], - "pynx584": [ - "setuptools" - ], - "pynzb": [ - "setuptools" - ], - "pyobihai": [ - "setuptools" - ], - "pyocr": [ - "setuptools" - ], - "pyoctoprintapi": [ - "setuptools" - ], - "pyodbc": [ - "setuptools" - ], - "pyogg": [ - "setuptools" - ], - "pyombi": [ - "setuptools" - ], - "pyomo": [ - "setuptools" - ], - "pyopencl": [ - "pybind11", - "setuptools" - ], - "pyopengl": [ - "setuptools" - ], - "pyopenssl": [ - "setuptools" - ], - "pyopenuv": [ - "poetry-core", - "setuptools" - ], - "pyopnsense": [ - "pbr", - "setuptools" - ], - "pyoppleio": [ - "setuptools" - ], - "pyosf": [ - "setuptools" - ], - "pyosmium": [ - "setuptools" - ], - "pyotgw": [ - "setuptools" - ], - "pyotp": [ - "setuptools" - ], - "pyoverkiz": [ - "poetry-core", - "setuptools" - ], - "pyowm": [ - "setuptools" - ], - "pyownet": [ - "setuptools" - ], - "pyp": [ - "setuptools" - ], - "pypandoc": [ - "setuptools" - ], - "pyparser": [ - "setuptools" - ], - "pyparsing": [ - "flit-core", - "setuptools" - ], - "pyparted": [ - "setuptools" - ], - "pypass": [ - "pbr", - "setuptools" - ], - "pypblib": [ - "setuptools" - ], - "pypca": [ - "setuptools" - ], - "pypcap": [ - "setuptools" - ], - "pypck": [ - "setuptools" - ], - "pypdf": [ - "flit" - ], - "pypdf2": [ - "setuptools" - ], - "pypdf3": [ - "setuptools" - ], - "pypeg2": [ - "setuptools" - ], - "pypemicro": [ - "setuptools" - ], - "pyperclip": [ - "setuptools" - ], - "pyperf": [ - "setuptools" - ], - "pypeul": [ - "poetry-core" - ], - "pyphen": [ - "flit", - "setuptools" - ], - "pyphotonfile": [ - "setuptools" - ], - "pypika-tortoise": [ - "poetry-core" - ], - "pypillowfight": [ - "setuptools" - ], - "pypinyin": [ - "setuptools" - ], - "pypiserver": [ - "setuptools" - ], - "pyplaato": [ - "setuptools" - ], - "pypng": [ - "setuptools" - ], - "pypoint": [ - "setuptools" - ], - "pypoolstation": [ - "poetry-core", - "setuptools" - ], - "pyppeteer": [ - "poetry-core", - "setuptools" - ], - "pyprecice": [ - "cython", - "setuptools" - ], - "pypresence": [ - "setuptools" - ], - "pyprind": [ - "setuptools" - ], - "pyprof2calltree": [ - "setuptools" - ], - "pyproj": [ - "cython", - "setuptools" - ], - "pyproject-flake8": [ - "flit-core" - ], - "pyproject-hooks": [ - "flit-core" - ], - "pyproject-metadata": [ - "setuptools" - ], - "pyprosegur": [ - "setuptools" - ], - "pyprusalink": [ - "setuptools" - ], - "pypsrp": [ - "poetry-core", - "setuptools" - ], - "pypubsub": [ - "setuptools" - ], - "pypugjs": [ - "setuptools" - ], - "pypykatz": [ - "setuptools" - ], - "pypytools": [ - "setuptools" - ], - "pyqldb": [ - "setuptools" - ], - "pyqrcode": [ - "setuptools" - ], - "pyqt-builder": [ - "setuptools" - ], - "pyqt4": [ - "setuptools" - ], - "pyqt5": [ - "setuptools" - ], - "pyqt5-sip": [ - "setuptools" - ], - "pyqt5-with-qtmultimedia": [ - "setuptools" - ], - "pyqt5-with-qtwebkit": [ - "setuptools" - ], - "pyqt6": [ - "setuptools" - ], - "pyqtgraph": [ - "setuptools" - ], - "pyqtwebengine": [ - "setuptools" - ], - "pyquaternion": [ - "setuptools" - ], - "pyquery": [ - "setuptools" - ], - "pyquil": [ - "poetry-core", - "setuptools" - ], - "pyqvrpro": [ - "setuptools" - ], - "pyrabbit2": [ - "setuptools" - ], - "pyrad": [ - "poetry-core", - "setuptools" - ], - "pyradios": [ - "setuptools" - ], - "pyrainbird": [ - "setuptools" - ], - "pyramid": [ - "setuptools" - ], - "pyramid-chameleon": [ - "setuptools" - ], - "pyramid-deferred-sqla": [ - "setuptools" - ], - "pyramid-exclog": [ - "setuptools" - ], - "pyramid-force-https": [ - "setuptools" - ], - "pyramid-hawkauth": [ - "setuptools" - ], - "pyramid-heroku": [ - "setuptools" - ], - "pyramid-jinja2": [ - "setuptools" - ], - "pyramid-jwt": [ - "setuptools" - ], - "pyramid-mako": [ - "setuptools" - ], - "pyramid-mixpanel": [ - "setuptools" - ], - "pyramid-multiauth": [ - "setuptools" - ], - "pyramid-openapi3": [ - "poetry" - ], - "pyramid-redirect": [ - "setuptools" - ], - "pyramid-redis": [ - "setuptools" - ], - "pyramid-retry": [ - "setuptools" - ], - "pyramid-splinter": [ - "setuptools" - ], - "pyramid-tm": [ - "setuptools" - ], - "pyreadability": [ - "setuptools" - ], - "pyreadstat": [ - "cython" - ], - "pyrect": [ - "setuptools" - ], - "pyregion": [ - "cython", - "setuptools" - ], - "pyrepl": [ - "setuptools" - ], - "pyrevolve": [ - "cython", - "setuptools" - ], - "pyrfc3339": [ - "setuptools" - ], - "pyrfxtrx": [ - "setuptools" - ], - "pyric": [ - "setuptools" - ], - "pyrisco": [ - "setuptools" - ], - "pyrituals": [ - "setuptools" - ], - "pyrmvtransport": [ - "flit", - "setuptools" - ], - "pyro-api": [ - "setuptools" - ], - "pyro-ppl": [ - "setuptools" - ], - "pyro4": [ - "setuptools" - ], - "pyro5": [ - "setuptools" - ], - "pyrogram": [ - "setuptools" - ], - "pyroma": [ - "setuptools" - ], - "pyroute2": [ - "setuptools" - ], - "pyrr": [ - "setuptools" - ], - "pyrsistent": [ - "setuptools" - ], - "pyrss2gen": [ - "setuptools" - ], - "pyruckus": [ - "setuptools" - ], - "pysabnzbd": [ - "setuptools" - ], - "pysaj": [ - "setuptools" - ], - "pysam": [ - "cython", - "setuptools" - ], - "pysaml2": [ - "setuptools" - ], - "pysatochip": [ - "setuptools" - ], - "pysbd": [ - "setuptools" - ], - "pyscard": [ - "setuptools" - ], - "pyscf": [ - "setuptools" - ], - "pyschedule": [ - "setuptools" - ], - "pyschemes": [ - "setuptools" - ], - "pyscreenshot": [ - "setuptools" - ], - "pyscreeze": [ - "setuptools" - ], - "pyscrypt": [ - "setuptools" - ], - "pyscss": [ - "setuptools" - ], - "pysdcp": [ - "setuptools" - ], - "pysdl2": [ - "setuptools" - ], - "pysecuritas": [ - "setuptools" - ], - "pysendfile": [ - "setuptools" - ], - "pysensibo": [ - "setuptools" - ], - "pysensors": [ - "setuptools" - ], - "pyserde": [ - "poetry", - "poetry-dynamic-versioning" - ], - "pyserial": [ - "setuptools" - ], - "pyserial-asyncio": [ - "setuptools" - ], - "pysftp": [ - "setuptools" - ], - "pysha3": [ - "setuptools" - ], - "pyshark": [ - "setuptools" - ], - "pyshex": [ - "pbr" - ], - "pyshexc": [ - "pbr" - ], - "pyshp": [ - "setuptools" - ], - "pysiaalarm": [ - "setuptools", - "setuptools-scm" - ], - "pyside": [ - "setuptools" - ], - "pyside2": [ - "setuptools" - ], - "pysideshiboken": [ - "setuptools" - ], - "pysidetools": [ - "setuptools" - ], - "pysigma": [ - "poetry-core", - "setuptools" - ], - "pysigma-backend-elasticsearch": [ - "poetry-core", - "setuptools" - ], - "pysigma-backend-insightidr": [ - "poetry-core", - "setuptools" - ], - "pysigma-backend-opensearch": [ - "poetry-core", - "setuptools" - ], - "pysigma-backend-qradar": [ - "poetry-core", - "setuptools" - ], - "pysigma-backend-splunk": [ - "poetry-core", - "setuptools" - ], - "pysigma-pipeline-crowdstrike": [ - "poetry-core", - "setuptools" - ], - "pysigma-pipeline-sysmon": [ - "poetry-core", - "setuptools" - ], - "pysigma-pipeline-windows": [ - "poetry-core", - "setuptools" - ], - "pysignalclirestapi": [ - "setuptools" - ], - "pysigset": [ - "setuptools" - ], - "pysimplegui": [ - "setuptools" - ], - "pysingleton": [ - "setuptools" - ], - "pyskyqhub": [ - "setuptools" - ], - "pyskyqremote": [ - "setuptools" - ], - "pyslurm": [ - "cython", - "setuptools" - ], - "pysma": [ - "setuptools" - ], - "pysmappee": [ - "setuptools" - ], - "pysmart": [ - "setuptools" - ], - "pysmart-smartx": [ - "setuptools" - ], - "pysmartapp": [ - "setuptools" - ], - "pysmartdl": [ - "setuptools" - ], - "pysmartthings": [ - "setuptools" - ], - "pysmb": [ - "setuptools" - ], - "pysmbc": [ - "setuptools" - ], - "pysmf": [ - "cython", - "setuptools" - ], - "pysmi": [ - "setuptools" - ], - "pysml": [ - "poetry-core", - "setuptools" - ], - "pysmt": [ - "setuptools" - ], - "pysnmp": [ - "setuptools" - ], - "pysnmp-pyasn1": [ - "poetry-core", - "setuptools" - ], - "pysnmp-pysmi": [ - "poetry-core", - "setuptools" - ], - "pysnmplib": [ - "poetry-core", - "setuptools" - ], - "pysnooper": [ - "setuptools" - ], - "pysnooz": [ - "poetry-core" - ], - "pysnow": [ - "poetry-core", - "setuptools" - ], - "pysocks": [ - "setuptools" - ], - "pysolcast": [ - "setuptools", - "setuptools-scm" - ], - "pysolr": [ - "setuptools", - "setuptools-scm" - ], - "pysoma": [ - "setuptools" - ], - "pysonos": [ - "setuptools" - ], - "pysoundfile": [ - "setuptools" - ], - "pyspark": [ - "setuptools" - ], - "pyspcwebgw": [ - "setuptools" - ], - "pyspf": [ - "setuptools" - ], - "pyspice": [ - "setuptools" - ], - "pyspiflash": [ - "setuptools" - ], - "pyspinel": [ - "setuptools" - ], - "pyspnego": [ - "setuptools" - ], - "pysptk": [ - "cython", - "setuptools" - ], - "pysqlite": [ - "setuptools" - ], - "pysqlitecipher": [ - "setuptools" - ], - "pysqueezebox": [ - "setuptools" - ], - "pysrim": [ - "setuptools" - ], - "pysrt": [ - "setuptools" - ], - "pyssim": [ - "setuptools" - ], - "pystac": [ - "setuptools" - ], - "pystache": [ - "setuptools" - ], - "pystemd": [ - "setuptools" - ], - "pystemmer": [ - "cython", - "setuptools" - ], - "pystray": [ - "setuptools" - ], - "pysvg-py3": [ - "setuptools" - ], - "pysvn": [ - "setuptools" - ], - "pyswitchbee": [ - "setuptools" - ], - "pyswitchbot": [ - "setuptools" - ], - "pysychonaut": [ - "setuptools" - ], - "pysyncobj": [ - "setuptools" - ], - "pysyncthru": [ - "setuptools" - ], - "pytabix": [ - "setuptools" - ], - "pytado": [ - "setuptools" - ], - "pytaglib": [ - "cython", - "setuptools" - ], - "pytankerkoenig": [ - "setuptools" - ], - "pytap2": [ - "setuptools" - ], - "pytautulli": [ - "setuptools" - ], - "pyte": [ - "setuptools" - ], - "pytelegrambotapi": [ - "setuptools" - ], - "pytenable": [ - "setuptools" - ], - "pytesseract": [ - "setuptools" - ], - "pytest": [ - "setuptools", - "setuptools-scm" - ], - "pytest-6": [ - "setuptools", - "setuptools-scm" - ], - "pytest-aio": [ - "setuptools" - ], - "pytest-aiohttp": [ - "setuptools", - "setuptools-scm" - ], - "pytest-annotate": [ - "setuptools" - ], - "pytest-arraydiff": [ - "setuptools", - "setuptools-scm" - ], - "pytest-astropy": [ - "setuptools", - "setuptools-scm" - ], - "pytest-astropy-header": [ - "setuptools", - "setuptools-scm" - ], - "pytest-asyncio": [ - "setuptools", - "setuptools-scm" - ], - "pytest-bdd": [ - "setuptools", - "poetry-core" - ], - "pytest-benchmark": [ - "setuptools" - ], - "pytest-black": [ - "setuptools", - "setuptools-scm" - ], - "pytest-cache": [ - "setuptools" - ], - "pytest-cases": [ - "setuptools", - "setuptools-scm" - ], - "pytest-catchlog": [ - "setuptools" - ], - "pytest-celery": [ - "flit-core", - "setuptools" - ], - "pytest-check": [ - "flit-core", - "setuptools" - ], - "pytest-cid": [ - "flit-core", - "setuptools" - ], - "pytest-clarity": [ - "setuptools" - ], - "pytest-click": [ - "setuptools" - ], - "pytest-console-scripts": [ - "setuptools", - "setuptools-scm" - ], - "pytest-cov": [ - "setuptools" - ], - "pytest-cram": [ - "setuptools" - ], - "pytest-datadir": [ - "setuptools", - "setuptools-scm" - ], - "pytest-datafiles": [ - "setuptools" - ], - "pytest-dependency": [ - "setuptools" - ], - "pytest-describe": [ - "setuptools" - ], - "pytest-django": [ - "setuptools", - "setuptools-scm" - ], - "pytest-docker": [ - "setuptools" - ], - "pytest-doctestplus": [ - "setuptools", - "setuptools-scm" - ], - "pytest-dotenv": [ - "setuptools" - ], - "pytest-env": [ - "setuptools" - ], - "pytest-error-for-skips": [ - "setuptools" - ], - "pytest-expect": [ - "setuptools" - ], - "pytest-factoryboy": [ - "setuptools" - ], - "pytest-filter-subpackage": [ - "setuptools", - "setuptools-scm" - ], - "pytest-fixture-config": [ - "setuptools" - ], - "pytest-flake8": [ - "setuptools" - ], - "pytest-flakes": [ - "setuptools" - ], - "pytest-flask": [ - "setuptools", - "setuptools-scm" - ], - "pytest-forked": [ - "setuptools", - "setuptools-scm" - ], - "pytest-freezegun": [ - "setuptools" - ], - "pytest-golden": [ - "poetry-core" - ], - "pytest-helpers-namespace": [ - "setuptools", - "setuptools-scm" - ], - "pytest-html": [ - "setuptools", - "setuptools-scm" - ], - "pytest-httpbin": [ - "setuptools" - ], - "pytest-httpserver": [ - "poetry-core", - "setuptools" - ], - "pytest-httpx": [ - "setuptools" - ], - "pytest-instafail": [ - "setuptools" - ], - "pytest-isort": [ - "poetry-core", - "setuptools" - ], - "pytest-json-report": [ - "setuptools" - ], - "pytest-lazy-fixture": [ - "setuptools" - ], - "pytest-localserver": [ - "setuptools" - ], - "pytest-logdog": [ - "setuptools", - "setuptools-scm" - ], - "pytest-metadata": [ - "setuptools", - "setuptools-scm" - ], - "pytest-mock": [ - "setuptools", - "setuptools-scm" - ], - "pytest-mockservers": [ - "poetry-core", - "setuptools" - ], - "pytest-mpl": [ - "setuptools", - "setuptools-scm" - ], - "pytest-mypy": [ - "setuptools", - "setuptools-scm" - ], - "pytest-mypy-plugins": [ - "setuptools" - ], - "pytest-openfiles": [ - "setuptools", - "setuptools-scm" - ], - "pytest-order": [ - "setuptools" - ], - "pytest-ordering": [ - "setuptools" - ], - "pytest-param-files": [ - "flit-core", - "setuptools" - ], - "pytest-profiling": [ - "setuptools", - "setuptools-git" - ], - "pytest-pylint": [ - "setuptools" - ], - "pytest-qt": [ - "setuptools", - "setuptools-scm" - ], - "pytest-raises": [ - "setuptools" - ], - "pytest-raisesregexp": [ - "setuptools" - ], - "pytest-raisin": [ - "flit-core", - "setuptools" - ], - "pytest-random-order": [ - "setuptools" - ], - "pytest-randomly": [ - "setuptools" - ], - "pytest-regressions": [ - "setuptools", - "setuptools-scm" - ], - "pytest-remotedata": [ - "setuptools", - "setuptools-scm" - ], - "pytest-repeat": [ - "setuptools", - "setuptools-scm" - ], - "pytest-rerunfailures": [ - "setuptools" - ], - "pytest-resource-path": [ - "setuptools" - ], - "pytest-runner": [ - "setuptools", - "setuptools-scm" - ], - "pytest-server-fixtures": [ - "setuptools" - ], - "pytest-services": [ - "setuptools", - "setuptools-scm" - ], - "pytest-shutil": [ - "setuptools" - ], - "pytest-skip-slow": [ - "setuptools" - ], - "pytest-snapshot": [ - "setuptools", - "setuptools-scm" - ], - "pytest-socket": [ - "poetry-core", - "setuptools" - ], - "pytest-splinter": [ - "setuptools" - ], - "pytest-splinter4": [ - "setuptools" - ], - "pytest-subprocess": [ - "setuptools" - ], - "pytest-subtesthack": [ - "setuptools" - ], - "pytest-subtests": [ - "setuptools", - "setuptools-scm" - ], - "pytest-sugar": [ - "setuptools" - ], - "pytest-test-utils": [ - "setuptools" - ], - "pytest-testmon": [ - "setuptools" - ], - "pytest-timeout": [ - "setuptools" - ], - "pytest-tornado": [ - "setuptools" - ], - "pytest-tornasync": [ - "setuptools" - ], - "pytest-trio": [ - "setuptools" - ], - "pytest-twisted": [ - "setuptools" - ], - "pytest-unordered": [ - "setuptools" - ], - "pytest-vcr": [ - "setuptools" - ], - "pytest-virtualenv": [ - "setuptools" - ], - "pytest-warnings": [ - "setuptools" - ], - "pytest-watch": [ - "setuptools" - ], - "pytest-xdist": [ - "setuptools", - "setuptools-scm" - ], - "pytest-xprocess": [ - "setuptools", - "setuptools-scm" - ], - "pytest-xvfb": [ - "setuptools" - ], - "pytestcache": [ - "setuptools" - ], - "pytestcov": [ - "setuptools" - ], - "pytestrunner": [ - "setuptools", - "setuptools-scm" - ], - "python-awair": [ - "poetry-core", - "setuptools" - ], - "python-axolotl": [ - "setuptools" - ], - "python-axolotl-curve25519": [ - "setuptools" - ], - "python-barcode": [ - "setuptools", - "setuptools-scm" - ], - "python-baseconv": [ - "setuptools" - ], - "python-benedict": [ - "setuptools" - ], - "python-bidi": [ - "setuptools" - ], - "python-binance": [ - "setuptools" - ], - "python-bitcoinlib": [ - "setuptools" - ], - "python-box": [ - "setuptools" - ], - "python-bsblan": [ - "poetry-core" - ], - "python-cinderclient": [ - "pbr", - "setuptools" - ], - "python-codon-tables": [ - "setuptools" - ], - "python-constraint": [ - "setuptools" - ], - "python-crfsuite": [ - "setuptools" - ], - "python-crontab": [ - "setuptools" - ], - "python-csxcad": [ - "cython", - "setuptools" - ], - "python-ctags3": [ - "setuptools" - ], - "python-daemon": [ - "setuptools" - ], - "python-datemath": [ - "setuptools" - ], - "python-dateutil": [ - "setuptools", - "setuptools-scm" - ], - "python-dbusmock": [ - "setuptools", - "setuptools-scm" - ], - "python-didl-lite": [ - "setuptools" - ], - "python-digitalocean": [ - "setuptools" - ], - "python-docx": [ - "setuptools" - ], - "python-doi": [ - "setuptools" - ], - "python-dotenv": [ - "setuptools" - ], - "python-dxf": [ - "setuptools" - ], - "python-ecobee-api": [ - "setuptools" - ], - "python-editor": [ - "setuptools" - ], - "python-engineio": [ - "setuptools" - ], - "python-etcd": [ - "setuptools" - ], - "python-ethtool": [ - "setuptools" - ], - "python-family-hub-local": [ - "setuptools" - ], - "python-fedora": [ - "setuptools" - ], - "python-flirt": [ - "setuptools" - ], - "python-fontconfig": [ - "cython", - "setuptools" - ], - "python-forecastio": [ - "setuptools" - ], - "python-frontmatter": [ - "setuptools" - ], - "python-fsutil": [ - "setuptools" - ], - "python-gammu": [ - "setuptools" - ], - "python-gitlab": [ - "setuptools" - ], - "python-glanceclient": [ - "pbr", - "setuptools" - ], - "python-gnupg": [ - "setuptools" - ], - "python-google-nest": [ - "setuptools" - ], - "python-gvm": [ - "poetry-core", - "setuptools" - ], - "python-hcl2": [ - "setuptools" - ], - "python-heatclient": [ - "pbr", - "setuptools" - ], - "python-hglib": [ - "setuptools" - ], - "python-homewizard-energy": [ - "poetry-core", - "setuptools" - ], - "python-hosts": [ - "setuptools" - ], - "python-hpilo": [ - "setuptools" - ], - "python-http-client": [ - "setuptools" - ], - "python-i18n": [ - "setuptools" - ], - "python-igraph": [ - "setuptools" - ], - "python-ipmi": [ - "setuptools" - ], - "python-ironicclient": [ - "pbr", - "setuptools" - ], - "python-izone": [ - "setuptools", - "setuptools-scm" - ], - "python-jenkins": [ - "pbr", - "setuptools" - ], - "python-jose": [ - "setuptools" - ], - "python-json-logger": [ - "setuptools" - ], - "python-jsonrpc-server": [ - "setuptools" - ], - "python-juicenet": [ - "setuptools" - ], - "python-kasa": [ - "poetry-core", - "setuptools" - ], - "python-keycloak": [ - "poetry-core", - "setuptools" - ], - "python-keyczar": [ - "setuptools" - ], - "python-keystoneclient": [ - "pbr", - "setuptools" - ], - "python-language-server": [ - "setuptools" - ], - "python-ldap": [ - "setuptools" - ], - "python-ldap-test": [ - "setuptools" - ], - "python-levenshtein": [ - "setuptools" - ], - "python-linux-procfs": [ - "setuptools" - ], - "python-logstash": [ - "setuptools" - ], - "python-louvain": [ - "setuptools" - ], - "python-lsp-black": [ - "setuptools" - ], - "python-lsp-jsonrpc": [ - "setuptools" - ], - "python-lsp-server": [ - "setuptools", - "setuptools-scm" - ], - "python-ly": [ - "setuptools" - ], - "python-lz4": [ - "setuptools", - "setuptools-scm" - ], - "python-lzf": [ - "setuptools" - ], - "python-lzo": [ - "setuptools" - ], - "python-magic": [ - "setuptools" - ], - "python-manilaclient": [ - "pbr", - "setuptools" - ], - "python-mapnik": [ - "setuptools" - ], - "python-markdown-math": [ - "setuptools" - ], - "python-memcached": [ - "setuptools" - ], - "python-miio": [ - "poetry-core", - "setuptools" - ], - "python-mimeparse": [ - "setuptools" - ], - "python-mnist": [ - "setuptools" - ], - "python-monkey-business": [ - "setuptools" - ], - "python-mpv-jsonipc": [ - "setuptools" - ], - "python-multipart": [ - "setuptools", - "hatchling" - ], - "python-mystrom": [ - "setuptools" - ], - "python-nest": [ - "setuptools" - ], - "python-nmap": [ - "setuptools" - ], - "python-nomad": [ - "setuptools" - ], - "python-novaclient": [ - "pbr", - "setuptools" - ], - "python-nvd3": [ - "setuptools" - ], - "python-oauth2": [ - "setuptools" - ], - "python-olm": [ - "setuptools" - ], - "python-opendata-transport": [ - "setuptools" - ], - "python-openems": [ - "cython", - "setuptools" - ], - "python-openstackclient": [ - "pbr", - "setuptools" - ], - "python-openzwave": [ - "cython", - "setuptools" - ], - "python-openzwave-mqtt": [ - "setuptools" - ], - "python-osc": [ - "setuptools" - ], - "python-owasp-zap-v2-4": [ - "setuptools" - ], - "python-packer": [ - "setuptools" - ], - "python-pae": [ - "poetry-core", - "setuptools" - ], - "python-pam": [ - "setuptools" - ], - "python-periphery": [ - "setuptools" - ], - "python-picnic-api": [ - "setuptools" - ], - "python-pidfile": [ - "setuptools" - ], - "python-pipedrive": [ - "setuptools" - ], - "python-pkcs11": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "python-prctl": [ - "setuptools" - ], - "python-ptrace": [ - "setuptools" - ], - "python-rabbitair": [ - "setuptools" - ], - "python-rapidjson": [ - "setuptools" - ], - "python-redis-lock": [ - "setuptools" - ], - "python-registry": [ - "setuptools" - ], - "python-rtmidi": [ - "setuptools" - ], - "python-sat": [ - "setuptools" - ], - "python-schema-registry-client": [ - "setuptools" - ], - "python-simple-hipchat": [ - "setuptools" - ], - "python-slugify": [ - "setuptools" - ], - "python-smarttub": [ - "setuptools" - ], - "python-snap7": [ - "setuptools" - ], - "python-snappy": [ - "setuptools" - ], - "python-socketio": [ - "setuptools" - ], - "python-socks": [ - "setuptools" - ], - "python-songpal": [ - "poetry-core", - "setuptools" - ], - "python-sql": [ - "setuptools" - ], - "python-status": [ - "setuptools" - ], - "python-stdnum": [ - "setuptools" - ], - "python-string-utils": [ - "setuptools" - ], - "python-subunit": [ - "setuptools" - ], - "python-swiftclient": [ - "pbr", - "setuptools" - ], - "python-tado": [ - "setuptools" - ], - "python-telegram": [ - "setuptools" - ], - "python-telegram-bot": [ - "setuptools" - ], - "python-toolbox": [ - "setuptools" - ], - "python-trovo": [ - "poetry", - "setuptools" - ], - "python-twitch-client": [ - "setuptools" - ], - "python-twitter": [ - "setuptools" - ], - "python-u2flib-host": [ - "setuptools" - ], - "python-uinput": [ - "setuptools" - ], - "python-ulid": [ - "setuptools", - "setuptools-scm" - ], - "python-unshare": [ - "setuptools" - ], - "python-utils": [ - "setuptools" - ], - "python-vagrant": [ - "setuptools" - ], - "python-velbus": [ - "setuptools" - ], - "python-vipaccess": [ - "setuptools" - ], - "python-vlc": [ - "setuptools" - ], - "python-whois": [ - "setuptools" - ], - "python-wink": [ - "setuptools" - ], - "python-xmp-toolkit": [ - "setuptools" - ], - "python-zbar": [ - "setuptools" - ], - "python3-application": [ - "setuptools" - ], - "python3-eventlib": [ - "setuptools" - ], - "python3-gnutls": [ - "setuptools" - ], - "python3-openid": [ - "setuptools" - ], - "python3-saml": [ - "setuptools" - ], - "pythoncatchconflictshook": [ - "setuptools" - ], - "pythondialog": [ - "setuptools" - ], - "pythonefl": [ - "setuptools" - ], - "pythonegardia": [ - "setuptools" - ], - "pythonfinder": [ - "setuptools" - ], - "pythonix": [ - "setuptools" - ], - "pythonnet": [ - "setuptools" - ], - "pythonping": [ - "setuptools" - ], - "pythran": [ - "setuptools" - ], - "pytibber": [ - "setuptools" - ], - "pytile": [ - "poetry-core", - "setuptools" - ], - "pytimeparse": [ - "setuptools" - ], - "pytkdocs": [ - "pdm-pep517" - ], - "pytm": [ - "setuptools" - ], - "pytmx": [ - "setuptools" - ], - "pytoml": [ - "setuptools" - ], - "pytomlpp": [ - "setuptools" - ], - "pytomorrowio": [ - "setuptools" - ], - "pytoolconfig": [ - "pdm-pep517" - ], - "pytools": [ - "setuptools" - ], - "pytorch": [ - "setuptools" - ], - "pytorch-bin": [ - "setuptools" - ], - "pytorch-lightning": [ - "setuptools" - ], - "pytorch-metric-learning": [ - "setuptools" - ], - "pytorch-pfn-extras": [ - "setuptools" - ], - "pytorchwithcuda": [ - "setuptools" - ], - "pytorchwithoutcuda": [ - "setuptools" - ], - "pytraccar": [ - "poetry-core", - "setuptools" - ], - "pytradfri": [ - "setuptools" - ], - "pytrafikverket": [ - "setuptools" - ], - "pytransportnsw": [ - "setuptools" - ], - "pytransportnswv2": [ - "setuptools" - ], - "pytrends": [ - "setuptools" - ], - "pytricia": [ - "setuptools" - ], - "pyttsx3": [ - "setuptools" - ], - "pytube": [ - "setuptools" - ], - "pytun": [ - "setuptools" - ], - "pyturbojpeg": [ - "setuptools" - ], - "pytweening": [ - "setuptools" - ], - "pytwitchapi": [ - "setuptools" - ], - "pytz": [ - "setuptools" - ], - "pytz-deprecation-shim": [ - "setuptools" - ], - "pytzdata": [ - "poetry", - "setuptools" - ], - "pyu2f": [ - "setuptools" - ], - "pyuavcan": [ - "setuptools" - ], - "pyudev": [ - "setuptools" - ], - "pyunifi": [ - "setuptools" - ], - "pyunifiprotect": [ - "setuptools" - ], - "pyupdate": [ - "setuptools" - ], - "pyupgrade": [ - "setuptools" - ], - "pyuptimerobot": [ - "setuptools" - ], - "pyusb": [ - "setuptools", - "setuptools-scm" - ], - "pyuseragents": [ - "setuptools" - ], - "pyutil": [ - "setuptools" - ], - "pyutilib": [ - "setuptools" - ], - "pyuv": [ - "setuptools" - ], - "pyvcd": [ - "setuptools", - "setuptools-scm" - ], - "pyvera": [ - "poetry-core", - "setuptools" - ], - "pyverilog": [ - "setuptools" - ], - "pyversasense": [ - "setuptools" - ], - "pyvesync": [ - "setuptools" - ], - "pyvex": [ - "setuptools" - ], - "pyvicare": [ - "setuptools" - ], - "pyvips": [ - "setuptools" - ], - "pyvis": [ - "setuptools" - ], - "pyvisa": [ - "setuptools", - "setuptools-scm" - ], - "pyvisa-py": [ - "setuptools", - "setuptools-scm" - ], - "pyviz-comms": [ - "setuptools" - ], - "pyvizio": [ - "setuptools" - ], - "pyvlx": [ - "setuptools" - ], - "pyvmomi": [ - "setuptools" - ], - "pyvo": [ - "setuptools", - "setuptools-scm" - ], - "pyvolumio": [ - "setuptools" - ], - "pyvoro": [ - "setuptools" - ], - "pywal": [ - "setuptools" - ], - "pywatchman": [ - "setuptools" - ], - "pywavelets": [ - "cython", - "setuptools" - ], - "pywayland": [ - "setuptools" - ], - "pywbem": [ - "pbr", - "setuptools" - ], - "pyweatherflowrest": [ - "setuptools" - ], - "pywebpush": [ - "setuptools" - ], - "pywebview": [ - "setuptools" - ], - "pywemo": [ - "poetry-core", - "setuptools" - ], - "pywerview": [ - "setuptools" - ], - "pywilight": [ - "setuptools" - ], - "pywinrm": [ - "setuptools" - ], - "pywizlight": [ - "setuptools" - ], - "pywlroots": [ - "setuptools" - ], - "pyworld": [ - "cython", - "setuptools" - ], - "pyws66i": [ - "setuptools" - ], - "pyx": [ - "setuptools" - ], - "pyxattr": [ - "setuptools" - ], - "pyxb": [ - "setuptools" - ], - "pyxbe": [ - "setuptools" - ], - "pyxdg": [ - "setuptools" - ], - "pyxeoma": [ - "setuptools" - ], - "pyxiaomigateway": [ - "setuptools" - ], - "pyxl3": [ - "setuptools" - ], - "pyxnat": [ - "setuptools" - ], - "pyyaml": [ - "cython", - "setuptools" - ], - "pyyaml-env-tag": [ - "flit-core", - "setuptools" - ], - "pyyaml-include": [ - "setuptools", - "setuptools-scm" - ], - "pyzbar": [ - "setuptools" - ], - "pyzerproc": [ - "setuptools" - ], - "pyzmq": [ - "packaging", - "setuptools" - ], - "pyzufall": [ - "setuptools" - ], - "qcelemental": [ - "setuptools" - ], - "qcengine": [ - "setuptools" - ], - "qcs-api-client": [ - "poetry-core", - "setuptools" - ], - "qdarkstyle": [ - "setuptools" - ], - "qdldl": [ - "setuptools" - ], - "qdx": [ - "poetry" - ], - "qiling": [ - "setuptools" - ], - "qimage2ndarray": [ - "setuptools" - ], - "qingping-ble": [ - "poetry-core", - "setuptools" - ], - "qiskit": [ - "setuptools" - ], - "qiskit-aer": [ - "cython", - "setuptools" - ], - "qiskit-finance": [ - "setuptools" - ], - "qiskit-ibmq-provider": [ - "setuptools" - ], - "qiskit-ignis": [ - "setuptools" - ], - "qiskit-machine-learning": [ - "setuptools" - ], - "qiskit-nature": [ - "setuptools" - ], - "qiskit-optimization": [ - "setuptools" - ], - "qiskit-terra": [ - "cython", - "setuptools" - ], - "qmk-dotty-dict": [ - "setuptools", - "setuptools-scm" - ], - "qnap-qsw": [ - "setuptools" - ], - "qnapstats": [ - "setuptools" - ], - "qrcode": [ - "setuptools" - ], - "qreactor": [ - "setuptools" - ], - "qscintilla": [ - "setuptools" - ], - "qscintilla-qt4": [ - "setuptools" - ], - "qscintilla-qt5": [ - "setuptools" - ], - "qstylizer": [ - "pbr", - "setuptools" - ], - "qt5reactor": [ - "setuptools" - ], - "qtawesome": [ - "setuptools" - ], - "qtconsole": [ - "setuptools" - ], - "qtpy": [ - "setuptools" - ], - "qualysclient": [ - "setuptools" - ], - "quamash": [ - "setuptools" - ], - "quandl": [ - "setuptools" - ], - "quantities": [ - "setuptools" - ], - "quantum-gateway": [ - "setuptools" - ], - "querystring-parser": [ - "setuptools" - ], - "questionary": [ - "poetry-core", - "setuptools" - ], - "queuelib": [ - "setuptools" - ], - "qutip": [ - "cython", - "setuptools" - ], - "r2pipe": [ - "setuptools" - ], - "rachiopy": [ - "setuptools" - ], - "radicale-infcloud": [ - "setuptools" - ], - "radio-beam": [ - "setuptools", - "setuptools-scm" - ], - "radios": [ - "poetry-core", - "setuptools" - ], - "radiotherm": [ - "setuptools" - ], - "radish-bdd": [ - "setuptools" - ], - "railroad-diagrams": [ - "setuptools" - ], - "rainbowstream": [ - "setuptools" - ], - "raincloudy": [ - "setuptools" - ], - "ramlfications": [ - "setuptools" - ], - "random2": [ - "setuptools" - ], - "rangehttpserver": [ - "setuptools" - ], - "rapidfuzz": [ - "packaging", - "scikit-build", - "setuptools" - ], - "rapidfuzz-capi": [ - "setuptools" - ], - "rarfile": [ - "setuptools" - ], - "rasterio": [ - "cython", - "setuptools" - ], - "ratelim": [ - "setuptools" - ], - "ratelimit": [ - "setuptools" - ], - "ratelimiter": [ - "setuptools" - ], - "raven": [ - "setuptools" - ], - "rawkit": [ - "setuptools" - ], - "ray": [ - "cython" - ], - "rbtools": [ - "setuptools" - ], - "rcssmin": [ - "setuptools" - ], - "rdbms-subsetter": [ - "setuptools" - ], - "rdflib": [ - { - "buildSystem": "setuptools", - "until": "6.3.0" - }, - { - "buildSystem": "poetry", - "from": "6.3.0" - } - ], - "rdkit": [ - "setuptools" - ], - "re-assert": [ - "setuptools" - ], - "reactivex": [ - "poetry-core" - ], - "readability-lxml": [ - "setuptools" - ], - "readchar": [ - "setuptools" - ], - "readlike": [ - "setuptools" - ], - "readme": [ - "setuptools" - ], - "readme-renderer": [ - "setuptools" - ], - "readstats": [ - "cython" - ], - "readthedocs-sphinx-ext": [ - "setuptools" - ], - "rebulk": [ - "setuptools" - ], - "recoll": [ - "setuptools" - ], - "recommonmark": [ - "setuptools" - ], - "recordlinkage": [ - "setuptools" - ], - "redbaron": [ - "setuptools" - ], - "redis": [ - "setuptools" - ], - "rednose": [ - "setuptools" - ], - "reedsolo": [ - "cython", - "setuptools" - ], - "reflink": [ - "setuptools" - ], - "regenmaschine": [ - "poetry-core", - "setuptools" - ], - "regex": [ - "setuptools" - ], - "regional": [ - "setuptools" - ], - "reikna": [ - "setuptools" - ], - "related": [ - "setuptools" - ], - "relatorio": [ - "setuptools" - ], - "releases": [ - "setuptools" - ], - "remarshal": [ - "poetry-core", - "setuptools" - ], - "remi": [ - "setuptools" - ], - "renault-api": [ - "poetry-core", - "setuptools" - ], - "rencode": [ - "cython", - "setuptools" - ], - "reolink": [ - "setuptools" - ], - "reorder-python-imports": [ - "setuptools" - ], - "reparser": [ - "setuptools" - ], - "repath": [ - "setuptools" - ], - "repeated-test": [ - "setuptools-scm" - ], - "repocheck": [ - "setuptools" - ], - "reportengine": [ - "flit", - "setuptools" - ], - "reportlab": [ - "setuptools" - ], - "repoze-lru": [ - "setuptools" - ], - "repoze-sphinx-autointerface": [ - "setuptools" - ], - "repoze-who": [ - "setuptools" - ], - "represent": [ - "setuptools" - ], - "reproject": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "reqif": [ - "poetry-core", - "setuptools" - ], - "requests": [ - "setuptools" - ], - "requests-aws4auth": [ - "setuptools" - ], - "requests-cache": [ - "poetry-core", - "setuptools" - ], - "requests-credssp": [ - "setuptools" - ], - "requests-download": [ - "setuptools" - ], - "requests-file": [ - "setuptools" - ], - "requests-futures": [ - "setuptools" - ], - "requests-hawk": [ - "setuptools" - ], - "requests-http-signature": [ - "setuptools", - "setuptools-scm" - ], - "requests-kerberos": [ - "setuptools" - ], - "requests-mock": [ - "pbr", - "setuptools" - ], - "requests-ntlm": [ - "setuptools" - ], - "requests-oauthlib": [ - "setuptools" - ], - "requests-pkcs12": [ - "setuptools" - ], - "requests-toolbelt": [ - "setuptools" - ], - "requests-unixsocket": [ - "pbr", - "setuptools" - ], - "requestsexceptions": [ - "pbr", - "setuptools" - ], - "requirements-detector": [ - "poetry-core", - "setuptools" - ], - "requirements-parser": [ - "poetry-core", - "setuptools" - ], - "resampy": [ - "cython", - "setuptools" - ], - "reserved": [ - "setuptools" - ], - "resolvelib": [ - "setuptools" - ], - "responses": [ - "setuptools" - ], - "respx": [ - "setuptools" - ], - "resteasy": [ - "setuptools" - ], - "restfly": [ - "setuptools" - ], - "restrictedpython": [ - "setuptools" - ], - "restructuredtext-lint": [ - "setuptools" - ], - "restview": [ - "setuptools" - ], - "result": [ - "setuptools" - ], - "rethinkdb": [ - "setuptools" - ], - "retry": [ - "pbr", - "setuptools" - ], - "retry-decorator": [ - "setuptools" - ], - "retrying": [ - "setuptools" - ], - "returns": [ - "poetry" - ], - "retworkx": [ - "setuptools" - ], - "rfc3339": [ - "setuptools" - ], - "rfc3339-validator": [ - "setuptools" - ], - "rfc3986": [ - "setuptools" - ], - "rfc3986-validator": [ - "pytest-runner", - "setuptools" - ], - "rfc3987": [ - "setuptools" - ], - "rfc6555": [ - "setuptools" - ], - "rfc7464": [ - "setuptools" - ], - "rfcat": [ - "setuptools" - ], - "rflink": [ - "setuptools" - ], - "rich": [ - "poetry-core", - "setuptools" - ], - "rich-argparse-plus": [ - "flit" - ], - "rich-rst": [ - "setuptools" - ], - "ring-doorbell": [ - "setuptools" - ], - "rio-tiler": [ - { - "buildSystem": "flit-core", - "until": "4.0.0" - }, - { - "buildSystem": "hatchling", - "from": "4.0.0" - } - ], - "ripe-atlas-cousteau": [ - "setuptools" - ], - "ripe-atlas-sagan": [ - "setuptools" - ], - "riprova": [ - "setuptools" - ], - "ripser": [ - "cython", - "setuptools" - ], - "rising": [ - "setuptools" - ], - "ritassist": [ - "setuptools" - ], - "rjpl": [ - "setuptools" - ], - "rjsmin": [ - "setuptools" - ], - "rki-covid-parser": [ - "setuptools" - ], - "rlax": [ - "setuptools" - ], - "rlp": [ - "setuptools" - ], - "rmcl": [ - "poetry-core", - "setuptools" - ], - "rmfuse": [ - "poetry-core" - ], - "rmrl": [ - "poetry-core", - "setuptools" - ], - "rnc2rng": [ - "setuptools" - ], - "rnginline": [ - "setuptools" - ], - "rns": [ - "setuptools" - ], - "robot-detection": [ - "setuptools" - ], - "robotframework": [ - "setuptools" - ], - "robotframework-databaselibrary": [ - "setuptools" - ], - "robotframework-requests": [ - "setuptools" - ], - "robotframework-selenium2library": [ - "setuptools" - ], - "robotframework-seleniumlibrary": [ - "setuptools" - ], - "robotframework-sshlibrary": [ - "setuptools" - ], - "robotstatuschecker": [ - "setuptools" - ], - "robotsuite": [ - "setuptools" - ], - "rocket-errbot": [ - "setuptools" - ], - "roku": [ - "setuptools" - ], - "rokuecp": [ - "poetry-core", - "setuptools" - ], - "rollbar": [ - "setuptools" - ], - "roman": [ - "setuptools" - ], - "ronin": [ - "setuptools" - ], - "roombapy": [ - "poetry-core", - "setuptools" - ], - "roonapi": [ - "poetry-core", - "setuptools" - ], - "rope": [ - "setuptools" - ], - "ropgadget": [ - "setuptools" - ], - "ropper": [ - "setuptools" - ], - "roundrobin": [ - "setuptools" - ], - "routes": [ - "setuptools" - ], - "rova": [ - "setuptools" - ], - "rpcq": [ - "setuptools" - ], - "rpdb": [ - "setuptools" - ], - "rpi-bad-power": [ - "setuptools" - ], - "rpi-gpio": [ - "setuptools" - ], - "rpi-gpio2": [ - "setuptools" - ], - "rplcd": [ - "setuptools" - ], - "rply": [ - "setuptools" - ], - "rpmfile": [ - "setuptools", - "setuptools-scm" - ], - "rpmfluff": [ - "setuptools" - ], - "rpy2": [ - "setuptools" - ], - "rpyc": [ - "hatchling", - "setuptools" - ], - "rq": [ - "setuptools" - ], - "rsa": [ - "poetry-core", - "setuptools" - ], - "rsskey": [ - "flit-core", - "setuptools" - ], - "rst2ansi": [ - "setuptools" - ], - "rst2pdf": [ - "setuptools" - ], - "rstcheck": [ - "poetry-core", - "setuptools" - ], - "rstcheck-core": [ - "poetry-core", - "setuptools" - ], - "rtmidi-python": [ - "cython", - "setuptools" - ], - "rtmixer": [ - "cython", - "setuptools" - ], - "rtoml": [ - "setuptools" - ], - "rtree": [ - "setuptools" - ], - "rtslib": [ - "setuptools" - ], - "rtsp-to-webrtc": [ - "setuptools" - ], - "ruamel-base": [ - "setuptools" - ], - "ruamel-yaml": [ - "setuptools" - ], - "ruamel-yaml-clib": [ - "setuptools" - ], - "rubymarshal": [ - "setuptools" - ], - "ruffus": [ - "setuptools" - ], - "runway-python": [ - "setuptools" - ], - "ruuvitag-ble": [ - "hatchling" - ], - "ruyaml": [ - "setuptools", - "setuptools-scm" - ], - "rx": [ - "setuptools" - ], - "rxv": [ - "setuptools", - "setuptools-scm" - ], - "rzpipe": [ - "setuptools" - ], - "s2clientprotocol": [ - "setuptools" - ], - "s3-credentials": [ - "setuptools" - ], - "s3cmd": [ - "setuptools" - ], - "s3fs": [ - "setuptools" - ], - "s3transfer": [ - "setuptools" - ], - "sabyenc": [ - "setuptools" - ], - "sabyenc3": [ - "setuptools" - ], - "sacn": [ - "setuptools" - ], - "sacred": [ - "setuptools" - ], - "sacremoses": [ - "setuptools" - ], - "safe": [ - "setuptools" - ], - "safeeyes": [ - "setuptools" - ], - "safeio": [ - "setuptools" - ], - "safety": [ - "setuptools" - ], - "sagemaker": [ - "setuptools" - ], - "salmon-mail": [ - "setuptools" - ], - "salt-pepper": [ - "setuptools", - "setuptools-scm" - ], - "sampledata": [ - "setuptools" - ], - "samplerate": [ - "setuptools" - ], - "samsungctl": [ - "setuptools" - ], - "samsungtvws": [ - "setuptools" - ], - "sane": [ - "setuptools" - ], - "sane-python": [ - "poetry-core" - ], - "saneyaml": [ - "setuptools", - "setuptools-scm" - ], - "sanic": [ - "poetry-core", - "setuptools" - ], - "sanic-auth": [ - "setuptools" - ], - "sanic-routing": [ - "setuptools" - ], - "sanic-testing": [ - "setuptools" - ], - "sansio-multipart": [ - "setuptools" - ], - "sapi-python-client": [ - "setuptools", - "setuptools-scm" - ], - "sarge": [ - "setuptools" - ], - "sarif-om": [ - "pbr", - "setuptools" - ], - "sasmodels": [ - "setuptools" - ], - "sat-search": [ - "pytest-runner", - "setuptools" - ], - "sat-stac": [ - "setuptools" - ], - "scales": [ - "setuptools" - ], - "scancode-toolkit": [ - "setuptools" - ], - "scandir": [ - "setuptools" - ], - "scapy": [ - "setuptools" - ], - "schedule": [ - "setuptools" - ], - "schema": [ - "setuptools" - ], - "schema-salad": [ - "setuptools" - ], - "schemainspect": [ - "setuptools" - ], - "schiene": [ - "setuptools" - ], - "schwifty": [ - "setuptools" - ], - "scikit-bio": [ - "cython", - "setuptools" - ], - "scikit-build": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "scikit-fmm": [ - "setuptools" - ], - "scikit-fuzzy": [ - "setuptools" - ], - "scikit-hep-testdata": [ - "setuptools", - "setuptools-scm" - ], - "scikit-image": [ - "cython", - "setuptools" - ], - "scikit-learn": [ - "cython", - "setuptools" - ], - "scikit-learn-extra": [ - "cython", - "setuptools" - ], - "scikit-misc": [ - "cython", - "setuptools" - ], - "scikit-optimize": [ - "setuptools" - ], - "scikit-spatial": [ - "poetry" - ], - "scikit-survival": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "scikit-tda": [ - "cython", - "setuptools" - ], - "scikitimage": [ - "cython", - "setuptools" - ], - "scikitlearn": [ - "cython", - "setuptools" - ], - "scikits-odes": [ - "cython", - "setuptools" - ], - "scipy": [ - "cython", - "setuptools" - ], - "scmrepo": [ - "setuptools" - ], - "scooby": [ - "setuptools" - ], - "scour": [ - "setuptools" - ], - "scp": [ - "setuptools" - ], - "scramp": [ - "setuptools" - ], - "scrap-engine": [ - "setuptools", - "setuptools-scm" - ], - "scrapy": [ - "setuptools" - ], - "scrapy-deltafetch": [ - "setuptools" - ], - "scrapy-fake-useragent": [ - "setuptools" - ], - "scrapy-splash": [ - "setuptools" - ], - "screeninfo": [ - "poetry-core", - "setuptools" - ], - "screenlogicpy": [ - "setuptools" - ], - "scripttest": [ - "setuptools" - ], - "scs": [ - "setuptools" - ], - "sdds": [ - "setuptools" - ], - "sdnotify": [ - "setuptools" - ], - "seaborn": [ - { - "buildSystem": "setuptools", - "until": "0.12.0" - }, - { - "buildSystem": "flit-core", - "from": "0.12.0" - } - ], - "seabreeze": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "seatconnect": [ - "setuptools", - "setuptools-scm" - ], - "seccomp": [ - "cython", - "setuptools" - ], - "secp256k1": [ - "setuptools" - ], - "secretstorage": [ - "setuptools" - ], - "secure": [ - "setuptools" - ], - "securetar": [ - "setuptools" - ], - "seekpath": [ - "setuptools" - ], - "segments": [ - "setuptools" - ], - "segno": [ - "setuptools" - ], - "selectors2": [ - "setuptools" - ], - "selinux": [ - "setuptools" - ], - "semantic-version": [ - "setuptools" - ], - "semver": [ - "setuptools" - ], - "send2trash": [ - "setuptools" - ], - "sendgrid": [ - "setuptools" - ], - "sense-energy": [ - "setuptools" - ], - "sensor-state-data": [ - "poetry-core", - "setuptools" - ], - "sensorpro-ble": [ - "poetry-core", - "setuptools" - ], - "sensorpush-ble": [ - "poetry-core", - "setuptools" - ], - "sentencepiece": [ - "setuptools" - ], - "sentinel": [ - "poetry-core", - "setuptools" - ], - "sentinels": [ - "setuptools" - ], - "sentry-sdk": [ - "setuptools" - ], - "sepaxml": [ - "setuptools" - ], - "seqdiag": [ - "setuptools" - ], - "seqeval": [ - "setuptools" - ], - "sequoia": [ - "setuptools" - ], - "serpent": [ - "setuptools" - ], - "serpy": [ - "setuptools" - ], - "servefile": [ - "setuptools" - ], - "serverlessrepo": [ - "setuptools" - ], - "service-identity": [ - "setuptools" - ], - "setproctitle": [ - "setuptools" - ], - "setupmeta": [ - "setuptools", - "setuptools-scm" - ], - "setuptools-declarative-requirements": [ - "setuptools", - "setuptools-scm" - ], - "setuptools-git": [ - "setuptools" - ], - "setuptools-lint": [ - "setuptools" - ], - "setuptools-rust": [ - "setuptools", - "setuptools-scm" - ], - "setuptools-scm": [ - "setuptools" - ], - "setuptools-scm-git-archive": [ - "setuptools", - "setuptools-scm" - ], - "setuptoolsbuildhook": [ - "setuptools" - ], - "setuptoolscheckhook": [ - "setuptools" - ], - "setuptoolstrial": [ - "setuptools" - ], - "seventeentrack": [ - "poetry-core", - "setuptools" - ], - "sexpdata": [ - "setuptools" - ], - "sfepy": [ - "cython", - "setuptools" - ], - "sgmllib3k": [ - "setuptools" - ], - "sgp4": [ - "setuptools" - ], - "sh": [ - "setuptools" - ], - "shamir-mnemonic": [ - "setuptools" - ], - "shap": [ - "setuptools" - ], - "shapely": [ - "cython", - "setuptools" - ], - "sharedmem": [ - "setuptools" - ], - "sharkiq": [ - "setuptools" - ], - "sharkiqpy": [ - "setuptools" - ], - "shellcheck-py": [ - "setuptools" - ], - "shellescape": [ - "setuptools" - ], - "shellingham": [ - "setuptools" - ], - "shexjsg": [ - "pbr" - ], - "shiboken2": [ - "setuptools" - ], - "shippai": [ - "setuptools" - ], - "shiv": [ - "setuptools" - ], - "shodan": [ - "setuptools" - ], - "shortuuid": [ - "poetry", - "setuptools" - ], - "should-dsl": [ - "setuptools" - ], - "showit": [ - "setuptools" - ], - "shtab": [ - "setuptools", - "setuptools-scm" - ], - "shutilwhich": [ - "setuptools" - ], - "sievelib": [ - "setuptools", - "setuptools-scm" - ], - "signedjson": [ - "setuptools", - "setuptools-scm" - ], - "signify": [ - "setuptools" - ], - "sigrok": [ - "setuptools" - ], - "sigtools": [ - "setuptools", - "setuptools-scm" - ], - "simanneal": [ - "setuptools" - ], - "simber": [ - "setuptools" - ], - "simple-di": [ - "setuptools" - ], - "simple-rest-client": [ - "setuptools" - ], - "simple-rlp": [ - "setuptools" - ], - "simple-salesforce": [ - "setuptools" - ], - "simple-term-menu": [ - "setuptools" - ], - "simple-websocket-server": [ - "setuptools" - ], - "simpleaudio": [ - "setuptools" - ], - "simplebayes": [ - "setuptools" - ], - "simpleeval": [ - "setuptools" - ], - "simplefix": [ - "setuptools" - ], - "simplegeneric": [ - "setuptools" - ], - "simplehound": [ - "setuptools" - ], - "simplejson": [ - "setuptools" - ], - "simplekml": [ - "setuptools" - ], - "simplenote": [ - "setuptools" - ], - "simplisafe-python": [ - "poetry-core", - "setuptools" - ], - "simpy": [ - "setuptools", - "setuptools-scm" - ], - "single-source": [ - "poetry-core" - ], - "single-version": [ - "poetry-core", - "setuptools" - ], - "singledispatch": [ - "setuptools" - ], - "siobrultech-protocols": [ - "setuptools" - ], - "siosocks": [ - "setuptools" - ], - "sip": [ - "setuptools" - ], - "sip-4": [ - "setuptools" - ], - "six": [ - "setuptools" - ], - "sjcl": [ - "setuptools" - ], - "skein": [ - "setuptools" - ], - "skia-pathops": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "skidl": [ - "setuptools" - ], - "skodaconnect": [ - "setuptools", - "setuptools-scm" - ], - "skybellpy": [ - "setuptools" - ], - "skyfield": [ - "setuptools" - ], - "skytemple-dtef": [ - "setuptools" - ], - "skytemple-eventserver": [ - "setuptools" - ], - "skytemple-files": [ - "setuptools" - ], - "skytemple-icons": [ - "setuptools" - ], - "skytemple-rust": [ - "setuptools" - ], - "skytemple-ssb-debugger": [ - "setuptools" - ], - "slack-bolt": [ - "setuptools" - ], - "slack-sdk": [ - "setuptools" - ], - "slackclient": [ - "setuptools" - ], - "sleepyq": [ - "setuptools" - ], - "slicedimage": [ - "setuptools" - ], - "slicer": [ - "setuptools" - ], - "slicerator": [ - "setuptools" - ], - "slither-analyzer": [ - "setuptools" - ], - "slixmpp": [ - "setuptools" - ], - "slob": [ - "setuptools" - ], - "slowapi": [ - "poetry-core", - "setuptools" - ], - "slugid": [ - "setuptools" - ], - "slumber": [ - "setuptools" - ], - "sly": [ - "setuptools" - ], - "smart-meter-texas": [ - "setuptools" - ], - "smart-open": [ - "setuptools" - ], - "smarthab": [ - "setuptools" - ], - "smartypants": [ - "setuptools" - ], - "smbprotocol": [ - "setuptools" - ], - "smbus-cffi": [ - "setuptools" - ], - "smbus2": [ - "setuptools" - ], - "smdebug-rulesconfig": [ - "setuptools" - ], - "smhi-pkg": [ - "setuptools" - ], - "smmap": [ - "setuptools" - ], - "smpplib": [ - "setuptools" - ], - "snakebite": [ - "setuptools" - ], - "snakeviz": [ - "setuptools" - ], - "snapcast": [ - "setuptools" - ], - "snapshottest": [ - "setuptools" - ], - "sniffio": [ - "setuptools" - ], - "snitun": [ - "setuptools" - ], - "snowballstemmer": [ - "setuptools" - ], - "snowflake-connector-python": [ - "setuptools" - ], - "snowflake-sqlalchemy": [ - "setuptools" - ], - "snscrape": [ - "setuptools", - "setuptools-scm" - ], - "snuggs": [ - "setuptools" - ], - "social-auth-app-django": [ - "setuptools" - ], - "social-auth-core": [ - "setuptools" - ], - "socialscan": [ - "setuptools" - ], - "socid-extractor": [ - "setuptools" - ], - "socketio-client": [ - "setuptools" - ], - "sockjs": [ - "setuptools" - ], - "sockjs-tornado": [ - "setuptools" - ], - "socksio": [ - "flit-core", - "setuptools" - ], - "socksipy-branch": [ - "setuptools" - ], - "soco": [ - "setuptools" - ], - "softlayer": [ - "setuptools" - ], - "solaredge": [ - "setuptools" - ], - "solax": [ - "setuptools", - "setuptools-scm" - ], - "solc-select": [ - "setuptools" - ], - "solo-python": [ - "flit-core", - "setuptools" - ], - "somajo": [ - "setuptools" - ], - "somecomfort": [ - "setuptools" - ], - "somfy-mylink-synergy": [ - "setuptools" - ], - "sonarr": [ - "setuptools" - ], - "sonora": [ - "poetry-core" - ], - "sopel": [ - "setuptools" - ], - "sorl-thumbnail": [ - "setuptools", - "setuptools-scm" - ], - "sortedcollections": [ - "setuptools" - ], - "sortedcontainers": [ - "setuptools" - ], - "soundcloud-v2": [ - "setuptools" - ], - "sounddevice": [ - "setuptools" - ], - "soundfile": [ - "setuptools" - ], - "soupsieve": [ - "hatchling", - "setuptools" - ], - "spacy": [ - "setuptools" - ], - "spacy-alignments": [ - "setuptools" - ], - "spacy-legacy": [ - "setuptools" - ], - "spacy-loggers": [ - "setuptools" - ], - "spacy-pkuseg": [ - "cython", - "setuptools" - ], - "spacy-transformers": [ - "setuptools" - ], - "spake2": [ - "setuptools" - ], - "spark-parser": [ - "setuptools" - ], - "sparklines": [ - "setuptools" - ], - "sparqlslurper": [ - "pbr" - ], - "sparse": [ - "setuptools" - ], - "spdx-tools": [ - "setuptools" - ], - "speaklater": [ - "setuptools" - ], - "speaklater3": [ - "setuptools" - ], - "spectral-cube": [ - "setuptools", - "setuptools-scm" - ], - "speedtest-cli": [ - "setuptools" - ], - "spglib": [ - "setuptools" - ], - "sphfile": [ - "setuptools" - ], - "sphinx": [ - "cython", - "flit-core", - "setuptools" - ], - "sphinx-argparse": [ - "setuptools" - ], - "sphinx-autobuild": [ - "setuptools" - ], - "sphinx-autodoc-typehints": [ - "setuptools" - ], - "sphinx-automodapi": [ - "cython" - ], - "sphinx-basic-ng": [ - "setuptools" - ], - "sphinx-better-theme": [ - "setuptools" - ], - "sphinx-book-theme": [ - "setuptools" - ], - "sphinx-comments": [ - "setuptools" - ], - "sphinx-copybutton": [ - "setuptools" - ], - "sphinx-design": [ - "flit-core", - "setuptools" - ], - "sphinx-external-toc": [ - "flit-core", - "setuptools" - ], - "sphinx-fortran": [ - "setuptools" - ], - "sphinx-inline-tabs": [ - "flit-core", - "setuptools" - ], - "sphinx-jinja": [ - "pbr", - "setuptools" - ], - "sphinx-jupyterbook-latex": [ - "setuptools" - ], - "sphinx-markdown-parser": [ - "setuptools" - ], - "sphinx-material": [ - "setuptools" - ], - "sphinx-mdinclude": [ - "flit-core", - "setuptools" - ], - "sphinx-multitoc-numbering": [ - "setuptools" - ], - "sphinx-pypi-upload": [ - "setuptools" - ], - "sphinx-pytest": [ - "flit-core", - "setuptools" - ], - "sphinx-rtd-theme": [ - "setuptools" - ], - "sphinx-serve": [ - "setuptools" - ], - "sphinx-testing": [ - "setuptools" - ], - "sphinx-thebe": [ - "setuptools" - ], - "sphinx-togglebutton": [ - "setuptools" - ], - "sphinxcontrib-actdiag": [ - "setuptools" - ], - "sphinxcontrib-apidoc": [ - "pbr", - "setuptools" - ], - "sphinxcontrib-applehelp": [ - "setuptools" - ], - "sphinxcontrib-autoapi": [ - "setuptools" - ], - "sphinxcontrib-bibtex": [ - "setuptools" - ], - "sphinxcontrib-blockdiag": [ - "setuptools" - ], - "sphinxcontrib-confluencebuilder": [ - "setuptools" - ], - "sphinxcontrib-devhelp": [ - "setuptools" - ], - "sphinxcontrib-excel-table": [ - "setuptools" - ], - "sphinxcontrib-fulltoc": [ - "pbr", - "setuptools" - ], - "sphinxcontrib-htmlhelp": [ - "setuptools" - ], - "sphinxcontrib-httpdomain": [ - "setuptools" - ], - "sphinxcontrib-jsmath": [ - "setuptools" - ], - "sphinxcontrib-katex": [ - "setuptools" - ], - "sphinxcontrib-newsfeed": [ - "setuptools" - ], - "sphinxcontrib-nwdiag": [ - "setuptools" - ], - "sphinxcontrib-openapi": [ - "setuptools", - "setuptools-scm" - ], - "sphinxcontrib-plantuml": [ - "setuptools" - ], - "sphinxcontrib-programoutput": [ - "setuptools" - ], - "sphinxcontrib-qthelp": [ - "setuptools" - ], - "sphinxcontrib-seqdiag": [ - "setuptools" - ], - "sphinxcontrib-serializinghtml": [ - "setuptools" - ], - "sphinxcontrib-spelling": [ - "pbr", - "setuptools" - ], - "sphinxcontrib-tikz": [ - "setuptools" - ], - "sphinxcontrib-websupport": [ - "setuptools" - ], - "sphinxext-opengraph": [ - "setuptools", - "setuptools-scm" - ], - "spiderpy": [ - "poetry-core", - "setuptools" - ], - "spidev": [ - "setuptools" - ], - "spinners": [ - "setuptools" - ], - "splinter": [ - "setuptools" - ], - "spotipy": [ - "setuptools" - ], - "spsdk": [ - "setuptools" - ], - "spur": [ - "setuptools" - ], - "spyder": [ - "setuptools" - ], - "spyder-kernels": [ - "setuptools" - ], - "spyse-python": [ - "setuptools" - ], - "sqlalchemy": [ - "cython", - "setuptools" - ], - "sqlalchemy-aio": [ - "setuptools" - ], - "sqlalchemy-citext": [ - "setuptools" - ], - "sqlalchemy-continuum": [ - "setuptools" - ], - "sqlalchemy-i18n": [ - "setuptools" - ], - "sqlalchemy-jsonfield": [ - "setuptools", - "setuptools-scm" - ], - "sqlalchemy-migrate": [ - "pbr", - "setuptools" - ], - "sqlalchemy-mixins": [ - "setuptools" - ], - "sqlalchemy-utils": [ - "setuptools" - ], - "sqlalchemy2-stubs": [ - "setuptools" - ], - "sqlbag": [ - "setuptools" - ], - "sqlglot": [ - "setuptools" - ], - "sqlite-fts4": [ - "setuptools" - ], - "sqlite-utils": [ - "setuptools" - ], - "sqlitedict": [ - "setuptools" - ], - "sqlmap": [ - "setuptools" - ], - "sqlmodel": [ - "poetry-core" - ], - "sqlobject": [ - "setuptools" - ], - "sqlparse": [ - { - "buildSystem": "setuptools", - "until": "0.4.4" - }, - { - "buildSystem": "flit-core", - "from": "0.4.4" - } - ], - "srp": [ - "setuptools" - ], - "srpenergy": [ - "setuptools" - ], - "srptools": [ - "setuptools" - ], - "srsly": [ - "cython", - "setuptools" - ], - "srt": [ - "setuptools" - ], - "srvlookup": [ - "setuptools" - ], - "ssdeep": [ - "setuptools" - ], - "ssdp": [ - "pbr", - "setuptools", - "setuptools-scm" - ], - "sse-starlette": [ - "setuptools" - ], - "sseclient": [ - "setuptools" - ], - "sseclient-py": [ - "setuptools" - ], - "ssh-mitm": [ - "setuptools" - ], - "sshpubkeys": [ - "setuptools" - ], - "sshtunnel": [ - "setuptools" - ], - "sslib": [ - "setuptools" - ], - "stack-data": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "stanza": [ - "setuptools" - ], - "starkbank-ecdsa": [ - "setuptools" - ], - "starlette": [ - "hatchling", - "setuptools" - ], - "starline": [ - "setuptools" - ], - "starsessions": [ - "poetry" - ], - "stashy": [ - "setuptools" - ], - "staticjinja": [ - "poetry-core", - "setuptools" - ], - "statistics": [ - "setuptools" - ], - "statmake": [ - "poetry-core", - "setuptools" - ], - "statsd": [ - "setuptools" - ], - "statsforecast": [ - "setuptools" - ], - "statsmodels": [ - "cython", - "setuptools" - ], - "statuscake": [ - "setuptools" - ], - "stdiomask": [ - "setuptools" - ], - "stdlib-list": [ - "setuptools" - ], - "steamodd": [ - "setuptools" - ], - "stem": [ - "setuptools" - ], - "stestr": [ - "pbr", - "setuptools" - ], - "stevedore": [ - "pbr", - "setuptools" - ], - "stickytape": [ - "setuptools" - ], - "stim": [ - "setuptools" - ], - "stm32loader": [ - "setuptools" - ], - "stone": [ - "setuptools" - ], - "stookalert": [ - "setuptools" - ], - "stopit": [ - "setuptools" - ], - "strategies": [ - "setuptools" - ], - "stravalib": [ - "setuptools" - ], - "strawberry-graphql": [ - "poetry", - "setuptools" - ], - "streamdeck": [ - "setuptools" - ], - "streaming-form-data": [ - "cython", - "setuptools" - ], - "streamlabswater": [ - "setuptools" - ], - "streamlink": [ - "setuptools" - ], - "streamz": [ - "setuptools" - ], - "strenum": [ - "setuptools" - ], - "strict-rfc3339": [ - "setuptools" - ], - "strictyaml": [ - "setuptools" - ], - "stringcase": [ - "setuptools" - ], - "stringly": [ - "setuptools" - ], - "stripe": [ - "setuptools" - ], - "striprtf": [ - "setuptools" - ], - "structlog": [ - "flit-core", - "hatch-fancy-pypi-readme", - "hatch-vcs", - "hatchling", - "setuptools" - ], - "structlog-sentry": [ - "poetry-core" - ], - "stumpy": [ - "setuptools" - ], - "stups-cli-support": [ - "setuptools" - ], - "stups-fullstop": [ - "setuptools" - ], - "stups-pierone": [ - "setuptools" - ], - "stups-tokens": [ - "setuptools" - ], - "stups-zign": [ - "setuptools" - ], - "stytra": [ - "setuptools" - ], - "subarulink": [ - "setuptools" - ], - "subliminal": [ - "setuptools" - ], - "subprocess-tee": [ - "setuptools", - "setuptools-scm" - ], - "subprocess32": [ - "setuptools", - "setuptools-scm" - ], - "subunit": [ - "setuptools" - ], - "subunit2sql": [ - "pbr", - "setuptools" - ], - "subzerod": [ - "setuptools" - ], - "suds-community": [ - "setuptools" - ], - "sumo": [ - "cython", - "setuptools" - ], - "sumtypes": [ - "setuptools" - ], - "sunpy": [ - "setuptools", - "setuptools-scm" - ], - "sunwatcher": [ - "setuptools" - ], - "superqt": [ - "setuptools", - "setuptools-scm" - ], - "supervise-api": [ - "setuptools" - ], - "supervisor": [ - "setuptools" - ], - "sure": [ - "setuptools" - ], - "surepy": [ - "poetry-core", - "setuptools" - ], - "surt": [ - "setuptools" - ], - "survey": [ - "setuptools" - ], - "svg-path": [ - "setuptools" - ], - "svglib": [ - "setuptools" - ], - "svgwrite": [ - "setuptools" - ], - "svix-ksuid": [ - "setuptools" - ], - "swagger-spec-validator": [ - "setuptools" - ], - "swagger-ui-bundle": [ - "setuptools" - ], - "swift": [ - "pbr", - "setuptools" - ], - "swisshydrodata": [ - "setuptools" - ], - "swspotify": [ - "poetry-core", - "setuptools" - ], - "sybil": [ - "setuptools" - ], - "symengine": [ - "cython", - "setuptools" - ], - "sympy": [ - "setuptools" - ], - "syncer": [ - "setuptools" - ], - "synergy": [ - "setuptools" - ], - "synologydsm-api": [ - "poetry-core", - "setuptools" - ], - "syslog-rfc5424-formatter": [ - "setuptools" - ], - "systembridge": [ - "setuptools" - ], - "systemd": [ - "setuptools" - ], - "sysv-ipc": [ - "setuptools" - ], - "tableaudocumentapi": [ - "setuptools" - ], - "tables": [ - "cython", - "setuptools" - ], - "tablib": [ - "setuptools", - "setuptools-scm" - ], - "tabula-py": [ - "setuptools", - "setuptools-scm" - ], - "tabulate": [ - { - "buildSystem": "setuptools-scm", - "from": "0.9.0" - }, - "setuptools" - ], - "tabview": [ - "setuptools" - ], - "tacacs-plus": [ - "setuptools", - "pytest-runner" - ], - "tadasets": [ - "setuptools" - ], - "tag-expressions": [ - "setuptools" - ], - "tago": [ - "setuptools" - ], - "tahoma-api": [ - "setuptools" - ], - "tailer": [ - "setuptools" - ], - "tailscale": [ - "poetry-core", - "setuptools" - ], - "tan": [ - { - "buildSystem": "setuptools", - "until": "22.12.0" - }, - { - "buildSystem": "setuptools-scm", - "until": "22.12.0" - }, - { - "buildSystem": "hatchling", - "from": "22.12.0" - }, - { - "buildSystem": "hatch-vcs", - "from": "22.12.0" - }, - { - "buildSystem": "hatch-fancy-pypi-readme", - "from": "22.12.0" - } - ], - "tank-utility": [ - "setuptools" - ], - "tappy": [ - "setuptools" - ], - "tarsafe": [ - "poetry" - ], - "tasklib": [ - "setuptools" - ], - "taskw": [ - "setuptools" - ], - "tatsu": [ - "setuptools" - ], - "taxi": [ - "setuptools" - ], - "tba-api-v3client": [ - "setuptools" - ], - "tbats": [ - "setuptools" - ], - "tblib": [ - "setuptools" - ], - "tbm-utils": [ - "setuptools" - ], - "tcxparser": [ - "setuptools" - ], - "tcxreader": [ - "setuptools" - ], - "teamcity-messages": [ - "setuptools" - ], - "telegram": [ - "setuptools" - ], - "telegraph": [ - "setuptools" - ], - "telepath": [ - "setuptools" - ], - "telethon": [ - "setuptools" - ], - "telethon-session-sqlalchemy": [ - "setuptools" - ], - "teletype": [ - "setuptools" - ], - "telfhash": [ - "setuptools" - ], - "tellduslive": [ - "setuptools" - ], - "temescal": [ - "setuptools" - ], - "tempest": [ - "pbr", - "setuptools" - ], - "tempita": [ - "setuptools" - ], - "tempora": [ - "setuptools", - "setuptools-scm" - ], - "tenacity": [ - "pbr", - "setuptools", - "setuptools-scm" - ], - "tensorboard": [ - "setuptools" - ], - "tensorboard-data-server": [ - "setuptools" - ], - "tensorboard-plugin-profile": [ - "setuptools" - ], - "tensorboard-plugin-wit": [ - "setuptools" - ], - "tensorboardx": [ - "setuptools" - ], - "tensorflow": [ - "setuptools" - ], - "tensorflow-bin": [ - "setuptools" - ], - "tensorflow-bin-2": [ - "setuptools" - ], - "tensorflow-build": [ - "setuptools" - ], - "tensorflow-build-2": [ - "setuptools" - ], - "tensorflow-datasets": [ - "setuptools" - ], - "tensorflow-estimator": [ - "setuptools" - ], - "tensorflow-estimator-2": [ - "setuptools" - ], - "tensorflow-metadata": [ - "setuptools" - ], - "tensorflow-probability": [ - "setuptools" - ], - "tensorflow-tensorboard": [ - "setuptools" - ], - "tensorflow-tensorboard-2": [ - "setuptools" - ], - "tensorflowwithcuda": [ - "setuptools" - ], - "tensorflowwithoutcuda": [ - "setuptools" - ], - "tensorly": [ - "setuptools" - ], - "tensorrt": [ - "setuptools" - ], - "termcolor": [ - "hatch-vcs", - "hatchling", - "setuptools" - ], - "terminado": [ - "hatchling", - "setuptools" - ], - "terminaltables": [ - "poetry", - "setuptools" - ], - "termplotlib": [ - "setuptools" - ], - "termstyle": [ - "setuptools" - ], - "tern": [ - "pbr", - "setuptools" - ], - "tesla-powerwall": [ - "setuptools" - ], - "tesla-wall-connector": [ - "poetry-core", - "setuptools" - ], - "teslajsonpy": [ - "poetry-core", - "setuptools" - ], - "tess": [ - "cython", - "setuptools" - ], - "tesserocr": [ - "cython", - "setuptools" - ], - "test-tube": [ - "setuptools" - ], - "testcontainers": [ - "setuptools" - ], - "testfixtures": [ - "setuptools" - ], - "testing-common-database": [ - "setuptools" - ], - "testing-postgresql": [ - "setuptools" - ], - "testpath": [ - "flit", - "flit-core", - "setuptools" - ], - "testrepository": [ - "pbr", - "setuptools" - ], - "testresources": [ - "pbr", - "setuptools" - ], - "testscenarios": [ - "setuptools" - ], - "testtools": [ - "pbr", - "setuptools" - ], - "text-unidecode": [ - "setuptools" - ], - "textacy": [ - "setuptools" - ], - "textdistance": [ - "setuptools" - ], - "textfsm": [ - "setuptools" - ], - "textile": [ - "setuptools" - ], - "texttable": [ - "setuptools" - ], - "textual": [ - "poetry-core", - "setuptools" - ], - "textwrap3": [ - "setuptools" - ], - "textx": [ - "setuptools" - ], - "tflearn": [ - "setuptools" - ], - "tgcrypto": [ - "setuptools" - ], - "theano": [ - "setuptools" - ], - "theano-pymc": [ - "setuptools" - ], - "theanowithcuda": [ - "setuptools" - ], - "theanowithoutcuda": [ - "setuptools" - ], - "thermobeacon-ble": [ - "poetry-core", - "setuptools" - ], - "thermopro-ble": [ - "poetry-core", - "setuptools" - ], - "thespian": [ - "setuptools" - ], - "thinc": [ - "cython", - "setuptools" - ], - "threadloop": [ - "setuptools" - ], - "threadpool": [ - "setuptools" - ], - "threadpoolctl": [ - "flit-core", - "setuptools" - ], - "threat9-test-bed": [ - "setuptools", - "setuptools-scm" - ], - "three-merge": [ - "setuptools" - ], - "thrift": [ - "setuptools" - ], - "thrift-sasl": [ - "setuptools" - ], - "thriftpy2": [ - "cython", - "setuptools" - ], - "tidylib": [ - "setuptools" - ], - "tifffile": [ - "setuptools" - ], - "tika": [ - "setuptools" - ], - "tikzplotlib": [ - "flit-core", - "setuptools" - ], - "tilequant": [ - "setuptools" - ], - "tiler": [ - "setuptools" - ], - "tilt-ble": [ - "poetry-core", - "setuptools" - ], - "time-machine": [ - "setuptools" - ], - "timeago": [ - "setuptools" - ], - "timecop": [ - "setuptools" - ], - "timelib": [ - "setuptools" - ], - "timeout-decorator": [ - "setuptools" - ], - "timetagger": [ - "setuptools" - ], - "timezonefinder": [ - "poetry-core", - "setuptools" - ], - "tinycss": [ - "cython", - "setuptools" - ], - "tinycss2": [ - "flit-core", - "setuptools" - ], - "tinydb": [ - "poetry-core", - "setuptools" - ], - "tinyobjloader-py": [ - "setuptools" - ], - "tissue": [ - "setuptools" - ], - "titlecase": [ - "setuptools", - "setuptools-scm" - ], - "tkcalendar": [ - "setuptools" - ], - "tkinter": [ - "setuptools" - ], - "tld": [ - "setuptools" - ], - "tldextract": [ - "setuptools", - "setuptools-scm" - ], - "tls-parser": [ - "setuptools" - ], - "tlsh": [ - "setuptools" - ], - "tlslite-ng": [ - "setuptools" - ], - "tmb": [ - "setuptools" - ], - "todoist": [ - "setuptools" - ], - "toggl-cli": [ - "pbr", - "setuptools" - ], - "token-bucket": [ - "setuptools" - ], - "tokenize-rt": [ - "setuptools" - ], - "tokenizers": [ - "setuptools" - ], - "tokenlib": [ - "setuptools" - ], - "tololib": [ - "setuptools", - "setuptools-scm" - ], - "toml": [ - "setuptools" - ], - "toml-adapt": [ - "poetry-core", - "setuptools" - ], - "toml-cli": [ - "poetry" - ], - "toml-sort": [ - "poetry" - ], - "tomlcheck": [ - "poetry" - ], - "tomli": [ - { - "buildSystem": "poetry-core", - "until": "1.0.2" - }, - { - "buildSystem": "flit-core", - "from": "1.0.2" - } - ], - "tomli-w": [ - "flit-core", - "setuptools" - ], - "tomlkit": [ - "poetry-core", - "setuptools" - ], - "toolz": [ - "setuptools" - ], - "toonapi": [ - "setuptools" - ], - "toposort": [ - "setuptools" - ], - "torch": [ - "setuptools" - ], - "torch-bin": [ - "setuptools" - ], - "torch-tb-profiler": [ - "setuptools" - ], - "torchaudio-bin": [ - "setuptools" - ], - "torchfile": [ - "setuptools" - ], - "torchgpipe": [ - "setuptools" - ], - "torchinfo": [ - "setuptools" - ], - "torchmetrics": [ - "setuptools" - ], - "torchvision": [ - "setuptools" - ], - "torchvision-bin": [ - "setuptools" - ], - "torchwithcuda": [ - "setuptools" - ], - "torchwithoutcuda": [ - "setuptools" - ], - "tornado": [ - "setuptools" - ], - "tornado-utils": [ - "setuptools" - ], - "torpy": [ - "setuptools" - ], - "torrequest": [ - "setuptools" - ], - "tortoise-orm": [ - "poetry-core" - ], - "total-connect-client": [ - "setuptools" - ], - "towncrier": [ - "setuptools" - ], - "tox": [ - "setuptools", - "setuptools-scm" - ], - "tplink-omada-client": [ - "hatchling" - ], - "tpm2-pytss": [ - "setuptools", - "setuptools-scm" - ], - "tqdm": [ - "setuptools", - "setuptools-scm" - ], - "traceback2": [ - "pbr", - "setuptools" - ], - "tracing": [ - "setuptools" - ], - "trackpy": [ - "setuptools" - ], - "traitlets": [ - { - "buildSystem": "flit-core", - "until": "5.2.1" - }, - { - "buildSystem": "hatchling", - "from": "5.2.1" - }, - "setuptools" - ], - "traits": [ - "setuptools" - ], - "traitsui": [ - "setuptools" - ], - "traittypes": [ - "setuptools" - ], - "transaction": [ - "setuptools" - ], - "transformers": [ - "setuptools" - ], - "transforms3d": [ - "setuptools" - ], - "transitions": [ - "setuptools" - ], - "translatepy": [ - "setuptools" - ], - "translationstring": [ - "setuptools" - ], - "transliterate": [ - "setuptools" - ], - "transmission-rpc": [ - "poetry-core", - "setuptools" - ], - "transmissionrpc": [ - "setuptools" - ], - "trectools": [ - "setuptools" - ], - "treelog": [ - "setuptools" - ], - "treeo": [ - "poetry-core", - "setuptools" - ], - "treex": [ - "poetry-core", - "setuptools" - ], - "treq": [ - "setuptools" - ], - "trezor": [ - "setuptools" - ], - "trezor-agent": [ - "setuptools" - ], - "trfl": [ - "setuptools" - ], - "trimesh": [ - "setuptools" - ], - "trino": [ - "setuptools" - ], - "trio": [ - "setuptools" - ], - "trio-asyncio": [ - "setuptools" - ], - "trio-websocket": [ - "setuptools" - ], - "troposphere": [ - "setuptools" - ], - "trove-classifiers": [ - "calver", - "setuptools" - ], - "trueskill": [ - "setuptools" - ], - "trustme": [ - "setuptools" - ], - "trytond": [ - "setuptools" - ], - "ttls": [ - "poetry-core", - "setuptools" - ], - "ttp": [ - "poetry-core", - "setuptools" - ], - "ttp-templates": [ - "poetry-core", - "setuptools" - ], - "tubes": [ - "setuptools" - ], - "tubeup": [ - "setuptools" - ], - "tumpa": [ - "setuptools" - ], - "tunigo": [ - "setuptools" - ], - "turnt": [ - "flit-core", - "setuptools" - ], - "tusker": [ - "poetry" - ], - "tuya-iot-py-sdk": [ - "setuptools" - ], - "tuyaha": [ - "setuptools" - ], - "tweedledum": [ - "setuptools" - ], - "tweepy": [ - "setuptools" - ], - "twentemilieu": [ - "poetry-core", - "setuptools" - ], - "twiggy": [ - "setuptools" - ], - "twilio": [ - "setuptools" - ], - "twill": [ - "setuptools" - ], - "twine": [ - "setuptools", - "setuptools-scm" - ], - "twinkly-client": [ - "setuptools" - ], - "twisted": [ - "setuptools" - ], - "twitch-python": [ - "setuptools" - ], - "twitchapi": [ - "setuptools" - ], - "twitter": [ - "setuptools", - "setuptools-scm" - ], - "twitter-common-collections": [ - "setuptools" - ], - "twitter-common-confluence": [ - "setuptools" - ], - "twitter-common-dirutil": [ - "setuptools" - ], - "twitter-common-lang": [ - "setuptools" - ], - "twitter-common-log": [ - "setuptools" - ], - "twitter-common-options": [ - "setuptools" - ], - "twitterapi": [ - "setuptools" - ], - "twofish": [ - "setuptools" - ], - "txaio": [ - "setuptools" - ], - "txamqp": [ - "setuptools" - ], - "txdbus": [ - "setuptools" - ], - "txgithub": [ - "setuptools" - ], - "txredisapi": [ - "setuptools" - ], - "txrequests": [ - "setuptools" - ], - "txtorcon": [ - "setuptools" - ], - "txzmq": [ - "setuptools" - ], - "typeapi": [ - "poetry" - ], - "typecode": [ - "setuptools", - "setuptools-scm" - ], - "typecode-libmagic": [ - "setuptools" - ], - "typecov": [ - "setuptools" - ], - "typed-argument-parser": [ - "setuptools" - ], - "typed-ast": [ - "setuptools" - ], - "typed-settings": [ - "setuptools" - ], - "typeguard": [ - "setuptools", - "setuptools-scm" - ], - "typer": [ - "flit-core", - "setuptools" - ], - "types-aioboto3": [ - "setuptools" - ], - "types-aiobotocore": [ - "setuptools" - ], - "types-aiobotocore-cloudformation": [ - "setuptools" - ], - "types-aiobotocore-ec2": [ - "setuptools" - ], - "types-aiobotocore-elbv2": [ - "setuptools" - ], - "types-aiobotocore-lambda": [ - "setuptools" - ], - "types-aiobotocore-organizations": [ - "setuptools" - ], - "types-aiobotocore-resourcegroupstaggingapi": [ - "setuptools" - ], - "types-aiobotocore-secretsmanager": [ - "setuptools" - ], - "types-aiobotocore-ssm": [ - "setuptools" - ], - "types-aiobotocore-stepfunctions": [ - "setuptools" - ], - "types-aiobotocore-sts": [ - "setuptools" - ], - "types-awscrt": [ - "poetry-core" - ], - "types-backports": [ - "setuptools" - ], - "types-beautifulsoup4": [ - "setuptools" - ], - "types-cachetools": [ - "setuptools" - ], - "types-click": [ - "setuptools" - ], - "types-colorama": [ - "setuptools" - ], - "types-cryptography": [ - "setuptools" - ], - "types-dataclasses": [ - "setuptools" - ], - "types-dateutil": [ - "setuptools" - ], - "types-decorator": [ - "setuptools" - ], - "types-docutils": [ - "setuptools" - ], - "types-enum34": [ - "setuptools" - ], - "types-freezegun": [ - "setuptools" - ], - "types-futures": [ - "setuptools" - ], - "types-html5lib": [ - "setuptools" - ], - "types-ipaddress": [ - "setuptools" - ], - "types-jsonschema": [ - "setuptools" - ], - "types-markdown": [ - "setuptools" - ], - "types-orjson": [ - "setuptools" - ], - "types-paramiko": [ - "setuptools" - ], - "types-pillow": [ - "setuptools" - ], - "types-pkg-resources": [ - "setuptools" - ], - "types-protobuf": [ - "setuptools" - ], - "types-psutil": [ - "setuptools" - ], - "types-psycopg2": [ - "setuptools" - ], - "types-pygments": [ - "setuptools" - ], - "types-pyopenssl": [ - "setuptools" - ], - "types-python-dateutil": [ - "setuptools" - ], - "types-pytz": [ - "setuptools" - ], - "types-pyyaml": [ - "setuptools" - ], - "types-redis": [ - "setuptools" - ], - "types-requests": [ - "setuptools" - ], - "types-s3transfer": [ - "poetry-core" - ], - "types-setuptools": [ - "setuptools" - ], - "types-six": [ - "setuptools" - ], - "types-tabulate": [ - "setuptools" - ], - "types-termcolor": [ - "setuptools" - ], - "types-toml": [ - "setuptools" - ], - "types-typed-ast": [ - "setuptools" - ], - "types-urllib3": [ - "setuptools" - ], - "typesentry": [ - "setuptools" - ], - "typesystem": [ - "setuptools" - ], - "typical": [ - "poetry-core", - "setuptools" - ], - "typing": [ - "setuptools" - ], - "typing-extensions": [ - "flit-core", - "setuptools" - ], - "typing-inspect": [ - "setuptools" - ], - "typish": [ - "setuptools" - ], - "typogrify": [ - "setuptools" - ], - "tzdata": [ - "setuptools" - ], - "tzlocal": [ - "setuptools" - ], - "u-msgpack-python": [ - "setuptools" - ], - "ua-parser": [ - "setuptools" - ], - "uamqp": [ - "setuptools" - ], - "uarray": [ - "setuptools" - ], - "uasiren": [ - "setuptools", - "setuptools-scm" - ], - "ubersmith": [ - "setuptools" - ], - "uc-micro-py": [ - "setuptools" - ], - "udatetime": [ - "setuptools" - ], - "ueagle": [ - "setuptools" - ], - "ueberzug": [ - "setuptools" - ], - "ufo2ft": [ - "setuptools", - "setuptools-scm" - ], - "ufolib2": [ - "setuptools", - "setuptools-scm" - ], - "ufonormalizer": [ - "setuptools", - "setuptools-scm" - ], - "ufoprocessor": [ - "setuptools", - "setuptools-scm" - ], - "uharfbuzz": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "ujson": [ - "setuptools", - "setuptools-scm" - ], - "ukkonen": [ - "setuptools" - ], - "ukpostcodeparser": [ - "setuptools" - ], - "ukrainealarm": [ - "setuptools", - "setuptools-scm" - ], - "ultraheat-api": [ - "setuptools" - ], - "umalqurra": [ - "setuptools" - ], - "umap-learn": [ - "setuptools" - ], - "unasync": [ - "setuptools" - ], - "uncertainties": [ - "setuptools" - ], - "unicode-slugify": [ - "setuptools" - ], - "unicodecsv": [ - "setuptools" - ], - "unicodedata2": [ - "setuptools" - ], - "unicorn": [ - "setuptools" - ], - "unicrypto": [ - "setuptools" - ], - "unidecode": [ - "setuptools" - ], - "unidic-lite": [ - "setuptools" - ], - "unidiff": [ - "setuptools" - ], - "unifi": [ - "setuptools" - ], - "unifi-discovery": [ - "poetry-core", - "setuptools" - ], - "unifiled": [ - "setuptools" - ], - "unify": [ - "setuptools" - ], - "unipath": [ - "setuptools" - ], - "units": [ - "setuptools" - ], - "unittest-data-provider": [ - "setuptools" - ], - "unittest-xml-reporting": [ - "setuptools" - ], - "unittest2": [ - "setuptools" - ], - "univers": [ - "setuptools", - "setuptools-scm" - ], - "unpaddedbase64": [ - "poetry-core", - "setuptools" - ], - "unrardll": [ - "setuptools" - ], - "untangle": [ - "setuptools" - ], - "untokenize": [ - "setuptools" - ], - "uonet-request-signer-hebe": [ - "setuptools" - ], - "upass": [ - "setuptools" - ], - "upb-lib": [ - "setuptools" - ], - "upcloud-api": [ - "setuptools" - ], - "update-checker": [ - "setuptools" - ], - "update-copyright": [ - "setuptools" - ], - "update-dotdee": [ - "setuptools" - ], - "upnpy": [ - "setuptools" - ], - "uproot": [ - "setuptools" - ], - "uproot3": [ - "setuptools" - ], - "uproot3-methods": [ - "setuptools" - ], - "uptime": [ - "setuptools" - ], - "uptime-kuma-monitor": [ - "setuptools" - ], - "uranium": [ - "setuptools" - ], - "uri-template": [ - "setuptools" - ], - "uritemplate": [ - "setuptools" - ], - "uritools": [ - "setuptools" - ], - "url-normalize": [ - "poetry", - "setuptools" - ], - "urlextract": [ - "setuptools" - ], - "urlgrabber": [ - "setuptools" - ], - "urllib3": [ - { - "buildSystem": "flit-core", - "until": "2.0.2" - }, - { - "buildSystem": "hatchling", - "from": "2.0.2" - }, - "setuptools" - ], - "urlpy": [ - "setuptools" - ], - "urwid": [ - "setuptools" - ], - "urwid-readline": [ - "setuptools" - ], - "urwidtrees": [ - "setuptools" - ], - "us": [ - "setuptools" - ], - "usb-devices": [ - "poetry-core" - ], - "usbrelay-py": [ - "setuptools" - ], - "usbtmc": [ - "setuptools" - ], - "user-agents": [ - "setuptools" - ], - "userpath": [ - "setuptools" - ], - "ush": [ - "setuptools" - ], - "utils": [ - "setuptools" - ], - "uuid": [ - "setuptools" - ], - "uvcclient": [ - "setuptools" - ], - "uvicorn": [ - "hatchling", - "setuptools" - ], - "uvloop": [ - "cython", - "setuptools" - ], - "uwsgidecorators": [ - "setuptools" - ], - "vaa": [ - "flit-core", - "setuptools" - ], - "validate-email": [ - "setuptools" - ], - "validators": [ - "setuptools" - ], - "validobj": [ - "flit", - "setuptools" - ], - "validphys2": [ - "setuptools" - ], - "vallox-websocket-api": [ - "setuptools" - ], - "vapoursynth": [ - "cython", - "setuptools" - ], - "variants": [ - "setuptools", - "setuptools-scm" - ], - "varint": [ - "setuptools" - ], - "vcrpy": [ - "setuptools" - ], - "vcver": [ - "setuptools" - ], - "vcversioner": [ - "setuptools" - ], - "vdf": [ - "setuptools" - ], - "vdirsyncer": [ - "setuptools", - "setuptools-scm" - ], - "vector": [ - "hatch-vcs", - "hatchling" - ], - "vega": [ - "setuptools" - ], - "vega-datasets": [ - "setuptools" - ], - "vehicle": [ - "poetry-core", - "setuptools" - ], - "velbus-aio": [ - "setuptools" - ], - "venstarcolortouch": [ - "setuptools" - ], - "venusian": [ - "setuptools" - ], - "verboselogs": [ - "setuptools" - ], - "versioneer": [ - "setuptools" - ], - "versionfinder": [ - "setuptools" - ], - "versioningit": [ - "setuptools" - ], - "versiontag": [ - "setuptools" - ], - "versiontools": [ - "setuptools" - ], - "verspec": [ - "setuptools" - ], - "vertica-python": [ - "setuptools" - ], - "veryprettytable": [ - "setuptools" - ], - "videocr": [ - "setuptools" - ], - "vidstab": [ - "setuptools" - ], - "viewstate": [ - "setuptools" - ], - "vilfo-api-client": [ - "setuptools", - "setuptools-scm" - ], - "vincenty": [ - "setuptools" - ], - "vine": [ - "setuptools" - ], - "virtkey": [ - "setuptools" - ], - "virtual-display": [ - "setuptools" - ], - "virtualenv": [ - { - "buildSystem": "setuptools-scm", - "until": " 20.18" - }, - { - "buildSystem": "hatch-vcs", - "from": " 20.18" - }, - "cython" - ], - "virtualenv-clone": [ - "setuptools" - ], - "virtualenvwrapper": [ - "pbr", - "setuptools" - ], - "visitor": [ - "setuptools" - ], - "vispy": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "viv-utils": [ - "setuptools" - ], - "vivisect": [ - "setuptools" - ], - "vmprof": [ - "setuptools" - ], - "vncdo": [ - "setuptools" - ], - "vobject": [ - "setuptools" - ], - "volkszaehler": [ - "setuptools" - ], - "voluptuous": [ - "setuptools" - ], - "voluptuous-serialize": [ - "setuptools" - ], - "volvooncall": [ - "setuptools" - ], - "vonage": [ - "setuptools" - ], - "vowpalwabbit": [ - "setuptools" - ], - "vpk": [ - "setuptools" - ], - "vqgan-jax": [ - "setuptools" - ], - "vsts": [ - "setuptools" - ], - "vsts-cd-manager": [ - "setuptools" - ], - "vsure": [ - "setuptools" - ], - "vt-py": [ - "setuptools" - ], - "vulcan-api": [ - "setuptools" - ], - "vultr": [ - "setuptools" - ], - "vulture": [ - "setuptools" - ], - "vxi11": [ - "setuptools" - ], - "vyper": [ - "setuptools", - "setuptools-scm" - ], - "w3lib": [ - "setuptools" - ], - "wadllib": [ - "setuptools" - ], - "wagtail": [ - "setuptools" - ], - "waitress": [ - "setuptools" - ], - "waitress-django": [ - "setuptools" - ], - "wakeonlan": [ - "poetry-core", - "setuptools" - ], - "wallbox": [ - "setuptools" - ], - "wand": [ - "setuptools" - ], - "wandb": [ - "setuptools" - ], - "waqiasync": [ - "setuptools" - ], - "warcio": [ - "setuptools" - ], - "warlock": [ - "poetry-core", - "setuptools" - ], - "warrant": [ - "setuptools" - ], - "warrant-lite": [ - "setuptools" - ], - "wasabi": [ - "setuptools" - ], - "wasmer": [ - "setuptools" - ], - "wasmer-compiler-cranelift": [ - "setuptools" - ], - "wasmer-compiler-llvm": [ - "setuptools" - ], - "wasmer-compiler-singlepass": [ - "setuptools" - ], - "wasmerpackages-wasmer": [ - "setuptools" - ], - "wasmerpackages-wasmer-compiler-cranelift": [ - "setuptools" - ], - "wasmerpackages-wasmer-compiler-llvm": [ - "setuptools" - ], - "wasmerpackages-wasmer-compiler-singlepass": [ - "setuptools" - ], - "watchdog": [ - "setuptools" - ], - "watchfiles": [ - "setuptools" - ], - "watchgod": [ - "setuptools" - ], - "waterfurnace": [ - "setuptools" - ], - "watermark": [ - "setuptools" - ], - "wavedrom": [ - "setuptools", - "setuptools-scm" - ], - "wavefile": [ - "setuptools" - ], - "wavinsentio": [ - "setuptools" - ], - "wazeroutecalculator": [ - "setuptools" - ], - "wcag-contrast-ratio": [ - "setuptools" - ], - "wcmatch": [ - "hatchling", - "setuptools" - ], - "wcwidth": [ - "setuptools" - ], - "weasyprint": [ - "flit-core", - "setuptools" - ], - "web": [ - "setuptools" - ], - "web-cache": [ - "setuptools" - ], - "web3": [ - "setuptools" - ], - "webargs": [ - "setuptools" - ], - "webassets": [ - "setuptools" - ], - "webauthn": [ - "setuptools" - ], - "webcolors": [ - "setuptools" - ], - "webdav4": [ - "hatch-vcs", - "hatchling", - "setuptools", - "setuptools-scm" - ], - "webdavclient3": [ - "setuptools" - ], - "webencodings": [ - "setuptools" - ], - "webexteamssdk": [ - "setuptools" - ], - "webhelpers": [ - "setuptools" - ], - "webob": [ - "setuptools" - ], - "weboob": [ - "setuptools" - ], - "webrtcvad": [ - "setuptools" - ], - "websocket-client": [ - "setuptools" - ], - "websockets": [ - "setuptools" - ], - "websockify": [ - "setuptools" - ], - "webssh": [ - "setuptools" - ], - "webtest": [ - "setuptools" - ], - "webtest-aiohttp": [ - "setuptools" - ], - "webthing": [ - "setuptools" - ], - "weconnect": [ - "setuptools" - ], - "weconnect-mqtt": [ - "setuptools" - ], - "werkzeug": [ - "setuptools" - ], - "west": [ - "setuptools" - ], - "wfuzz": [ - "setuptools" - ], - "wget": [ - "setuptools" - ], - "whatthepatch": [ - "setuptools" - ], - "wheel": [ - { - "buildSystem": "setuptools", - "until": "0.40.0" - }, - { - "buildSystem": "flit-core", - "from": "0.40.0" - } - ], - "wheel-filename": [ - "setuptools" - ], - "wheel-inspect": [ - "setuptools" - ], - "whichcraft": [ - "setuptools" - ], - "whirlpool-sixth-sense": [ - "setuptools" - ], - "whisper": [ - "setuptools" - ], - "whispers": [ - "setuptools" - ], - "whitenoise": [ - "setuptools" - ], - "whodap": [ - "setuptools" - ], - "whois": [ - "setuptools" - ], - "whoosh": [ - "setuptools" - ], - "widgetsnbextension": [ - "jupyter-packaging", - "setuptools" - ], - "widlparser": [ - "setuptools" - ], - "wiffi": [ - "setuptools" - ], - "wifi": [ - "setuptools" - ], - "wikitextparser": [ - "setuptools" - ], - "willow": [ - "setuptools" - ], - "winacl": [ - "setuptools" - ], - "winsspi": [ - "setuptools" - ], - "withings-api": [ - "poetry-core" - ], - "wktutils": [ - "setuptools" - ], - "wled": [ - "poetry-core", - "setuptools" - ], - "wmctrl": [ - "setuptools" - ], - "woob": [ - "setuptools" - ], - "woodblock": [ - "setuptools" - ], - "word2vec": [ - "cython", - "setuptools", - "setuptools-scm" - ], - "wordcloud": [ - "cython", - "setuptools" - ], - "wordfreq": [ - "setuptools" - ], - "wrapio": [ - "setuptools" - ], - "wrapt": [ - "setuptools" - ], - "wrf-python": [ - "setuptools" - ], - "ws4py": [ - "setuptools" - ], - "wsdiscovery": [ - "setuptools" - ], - "wsgi-intercept": [ - "setuptools" - ], - "wsgidav": [ - "setuptools" - ], - "wsgiprox": [ - "setuptools" - ], - "wsgiproxy2": [ - "setuptools" - ], - "wsgitools": [ - "setuptools" - ], - "wslink": [ - "setuptools" - ], - "wsnsimpy": [ - "setuptools" - ], - "wsproto": [ - "setuptools" - ], - "wtf-peewee": [ - "setuptools" - ], - "wtforms": [ - "setuptools" - ], - "wurlitzer": [ - "setuptools" - ], - "www-authenticate": [ - "setuptools" - ], - "wxpython-4-0": [ - "setuptools" - ], - "wxpython-4-1": [ - "setuptools" - ], - "wxpython-4-2": [ - "setuptools" - ], - "x11-hash": [ - "setuptools" - ], - "x256": [ - "setuptools" - ], - "xapian": [ - "setuptools" - ], - "xapp": [ - "setuptools" - ], - "xarray": [ - "setuptools", - "setuptools-scm" - ], - "xarray-einstats": [ - "flit-core", - "setuptools" - ], - "xattr": [ - "setuptools" - ], - "xbox-webapi": [ - "setuptools" - ], - "xboxapi": [ - "setuptools" - ], - "xcffib": [ - "setuptools" - ], - "xdg": [ - "poetry-core", - "setuptools" - ], - "xdis": [ - "setuptools" - ], - "xdot": [ - "setuptools" - ], - "xhtml2pdf": [ - "setuptools" - ], - "xiaomi-ble": [ - "poetry-core", - "setuptools" - ], - "xkbcommon": [ - "setuptools" - ], - "xkcdpass": [ - "setuptools" - ], - "xknx": [ - "setuptools" - ], - "xlib": [ - "setuptools", - "setuptools-scm" - ], - "xlrd": [ - "setuptools" - ], - "xlsx2csv": [ - "setuptools" - ], - "xlsxwriter": [ - "setuptools" - ], - "xlwt": [ - "setuptools" - ], - "xmind": [ - "setuptools" - ], - "xml-marshaller": [ - "setuptools" - ], - "xml2rfc": [ - "setuptools" - ], - "xmldiff": [ - "setuptools" - ], - "xmljson": [ - "setuptools" - ], - "xmlschema": [ - "setuptools" - ], - "xmlsec": [ - "setuptools", - "setuptools-scm" - ], - "xmltodict": [ - "setuptools" - ], - "xmodem": [ - "setuptools" - ], - "xnd": [ - "setuptools" - ], - "xpath-expressions": [ - "poetry-core", - "setuptools" - ], - "xpybutil": [ - "setuptools" - ], - "xsdata": [ - "setuptools" - ], - "xstatic": [ - "setuptools" - ], - "xstatic-bootbox": [ - "setuptools" - ], - "xstatic-bootstrap": [ - "setuptools" - ], - "xstatic-jquery": [ - "setuptools" - ], - "xstatic-jquery-file-upload": [ - "setuptools" - ], - "xstatic-jquery-ui": [ - "setuptools" - ], - "xstatic-pygments": [ - "setuptools" - ], - "xtensor-python": [ - "setuptools" - ], - "xvfbwrapper": [ - "setuptools" - ], - "xxh": [ - "setuptools" - ], - "xxhash": [ - "setuptools", - "setuptools-scm" - ], - "yabadaba": [ - "setuptools" - ], - "yacs": [ - "setuptools" - ], - "yahooweather": [ - "setuptools" - ], - "yalesmartalarmclient": [ - "setuptools" - ], - "yalexs": [ - "setuptools" - ], - "yalexs-ble": [ - "poetry-core", - "setuptools" - ], - "yamale": [ - "setuptools" - ], - "yamlfix": [ - "setuptools" - ], - "yamllint": [ - "setuptools" - ], - "yamlloader": [ - "setuptools" - ], - "yamlordereddictloader": [ - "setuptools" - ], - "yanc": [ - "setuptools" - ], - "yangson": [ - "setuptools", - "setuptools-scm" - ], - "yapf": [ - "setuptools" - ], - "yappi": [ - "setuptools" - ], - "yapsy": [ - "setuptools" - ], - "yara-python": [ - "setuptools" - ], - "yaralyzer": [ - "poetry" - ], - "yarg": [ - "setuptools" - ], - "yarl": [ - "setuptools" - ], - "yaspin": [ - "poetry-core", - "setuptools" - ], - "yaswfp": [ - "setuptools" - ], - "yattag": [ - "setuptools" - ], - "ydiff": [ - "setuptools" - ], - "yeelight": [ - "setuptools" - ], - "yfinance": [ - "setuptools" - ], - "yoda": [ - "cython" - ], - "yolink-api": [ - "setuptools" - ], - "youless-api": [ - "setuptools" - ], - "youtube-dl": [ - "setuptools" - ], - "youtube-dl-light": [ - "setuptools" - ], - "youtube-search": [ - "setuptools" - ], - "youtube-search-python": [ - "setuptools" - ], - "youtube-transcript-api": [ - "setuptools" - ], - "yowsup": [ - "setuptools" - ], - "yoyo-migrations": [ - "setuptools" - ], - "ypy-websocket": [ - "hatchling" - ], - "yq": [ - "setuptools", - "setuptools-scm" - ], - "yt-dlp": [ - "setuptools" - ], - "yt-dlp-light": [ - "setuptools" - ], - "yte": [ - "poetry-core", - "setuptools" - ], - "ytmusicapi": [ - "setuptools", - "setuptools-scm" - ], - "yubico-client": [ - "setuptools" - ], - "yubikey-manager": [ - "poetry-core" - ], - "yutto": [ - "poetry-core", - "setuptools" - ], - "z3": [ - "setuptools" - ], - "z3c-checkversions": [ - "setuptools" - ], - "zadnegoale": [ - "setuptools" - ], - "zamg": [ - "poetry-core" - ], - "zarr": [ - "setuptools", - "setuptools-scm" - ], - "zc-buildout": [ - "setuptools" - ], - "zc-buildout221": [ - "setuptools" - ], - "zc-lockfile": [ - "setuptools" - ], - "zconfig": [ - "setuptools" - ], - "zcs": [ - "setuptools" - ], - "zdaemon": [ - "setuptools" - ], - "zeep": [ - "setuptools" - ], - "zeroc-ice": [ - "setuptools" - ], - "zeroconf": [ - "setuptools" - ], - "zerorpc": [ - "setuptools" - ], - "zeversolarlocal": [ - "flit-core", - "setuptools" - ], - "zfec": [ - "setuptools" - ], - "zha-quirks": [ - "setuptools" - ], - "zict": [ - "setuptools" - ], - "zigpy": [ - "setuptools" - ], - "zigpy-cc": [ - "setuptools" - ], - "zigpy-deconz": [ - "setuptools" - ], - "zigpy-xbee": [ - "setuptools" - ], - "zigpy-zigate": [ - "setuptools" - ], - "zigpy-znp": [ - "setuptools" - ], - "zimports": [ - "setuptools" - ], - "zipp": [ - "setuptools", - "setuptools-scm" - ], - "zipseeker": [ - "setuptools" - ], - "zipstream": [ - "setuptools" - ], - "zipstream-new": [ - "setuptools" - ], - "zipstream-ng": [ - "setuptools" - ], - "zk": [ - "setuptools" - ], - "zm-py": [ - "setuptools" - ], - "zodb": [ - "setuptools" - ], - "zodbpickle": [ - "setuptools" - ], - "zope-broken": [ - "setuptools" - ], - "zope-cachedescriptors": [ - "setuptools" - ], - "zope-component": [ - "setuptools" - ], - "zope-configuration": [ - "setuptools" - ], - "zope-contenttype": [ - "setuptools" - ], - "zope-copy": [ - "setuptools" - ], - "zope-deferredimport": [ - "setuptools" - ], - "zope-deprecation": [ - "setuptools" - ], - "zope-dottedname": [ - "setuptools" - ], - "zope-event": [ - "setuptools" - ], - "zope-exceptions": [ - "setuptools" - ], - "zope-filerepresentation": [ - "setuptools" - ], - "zope-hookable": [ - "setuptools" - ], - "zope-i18nmessageid": [ - "setuptools" - ], - "zope-interface": [ - "setuptools" - ], - "zope-lifecycleevent": [ - "setuptools" - ], - "zope-location": [ - "setuptools" - ], - "zope-proxy": [ - "setuptools" - ], - "zope-schema": [ - "setuptools" - ], - "zope-size": [ - "setuptools" - ], - "zope-sqlalchemy": [ - "setuptools" - ], - "zope-testbrowser": [ - "setuptools" - ], - "zope-testing": [ - "setuptools" - ], - "zope-testrunner": [ - "setuptools" - ], - "zopfli": [ - "setuptools", - "setuptools-scm" - ], - "zstandard": [ - "setuptools" - ], - "zstd": [ - "setuptools" - ], - "zulip": [ - "setuptools" - ], - "zwave-js-server-python": [ - "setuptools" - ], - "zwave-me-ws": [ - "poetry-core", - "setuptools" - ], - "zxcvbn": [ - "setuptools" - ] -} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix deleted file mode 100644 index d96d920c70940..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ /dev/null @@ -1,3026 +0,0 @@ -{ pkgs ? import <nixpkgs> { } -, lib ? pkgs.lib -}: - -let - addBuildSystem = - { self - , drv - , attr - , extraAttrs ? [ ] - }: - let - buildSystem = - if builtins.isAttrs attr then - let - fromIsValid = - if builtins.hasAttr "from" attr then - lib.versionAtLeast drv.version attr.from - else - true; - untilIsValid = - if builtins.hasAttr "until" attr then - lib.versionOlder drv.version attr.until - else - true; - intendedBuildSystem = - if attr.buildSystem == "cython" then - self.python.pythonForBuild.pkgs.cython - else - self.${attr.buildSystem}; - in - if fromIsValid && untilIsValid then intendedBuildSystem else null - else - if attr == "cython" then self.python.pythonForBuild.pkgs.cython else self.${attr}; - in - ( - # Flit only works on Python3 - if (attr == "flit-core" || attr == "flit" || attr == "hatchling") && !self.isPy3k then drv - else if drv == null then null - else if drv ? overridePythonAttrs == false then drv - else - drv.overridePythonAttrs ( - old: - # We do not need the build system for wheels. - if old ? format && old.format == "wheel" then - { } - else - { - nativeBuildInputs = - (old.nativeBuildInputs or [ ]) - ++ lib.optionals (!(builtins.isNull buildSystem)) [ buildSystem ] - ++ map (a: self.${a}) extraAttrs; - } - ) - ); - - -in -lib.composeManyExtensions [ - # NixOps - (self: super: - lib.mapAttrs (_: v: addBuildSystem { inherit self; drv = v; attr = "poetry"; }) (lib.filterAttrs (n: _: lib.strings.hasPrefix "nixops" n) super) - // { - # NixOps >=2 dependency - nixos-modules-contrib = addBuildSystem { inherit self; drv = super.nixos-modules-contrib; attr = "poetry"; }; - } - ) - - # Add build systems - (self: super: - let - buildSystems = lib.importJSON ./build-systems.json; - in - lib.mapAttrs - (attr: systems: builtins.foldl' - (drv: attr: addBuildSystem { - inherit drv self attr; - }) - (super.${attr} or null) - systems) - buildSystems) - - # Build fixes - (self: super: - let - inherit (self.python) stdenv; - inherit (pkgs.buildPackages) pkg-config; - pyBuildPackages = self.python.pythonForBuild.pkgs; - - selectQt5 = version: - let - selector = builtins.concatStringsSep "" (lib.take 2 (builtins.splitVersion version)); - in - pkgs."qt${selector}" or pkgs.qt5; - - in - - { - automat = super.automat.overridePythonAttrs ( - old: lib.optionalAttrs (lib.versionOlder old.version "22.10.0") { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.m2r ]; - } - ); - - aiohttp-swagger3 = super.aiohttp-swagger3.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - ansible = super.ansible.overridePythonAttrs ( - old: { - # Inputs copied from nixpkgs as ansible doesn't specify it's dependencies - # in a correct manner. - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.pycrypto - self.paramiko - self.jinja2 - self.pyyaml - self.httplib2 - self.six - self.netaddr - self.dnspython - self.jmespath - self.dopy - self.ncclient - ]; - } - ); - - ansible-base = super.ansible-base.overridePythonAttrs ( - old: - { - prePatch = ''sed -i "s/\[python, /[/" lib/ansible/executor/task_executor.py''; - postInstall = '' - for m in docs/man/man1/*; do - install -vD $m -t $out/share/man/man1 - done - ''; - } - // lib.optionalAttrs (lib.versionOlder old.version "2.4") { - prePatch = ''sed -i "s,/usr/,$out," lib/ansible/constants.py''; - } - ); - - ansible-lint = super.ansible-lint.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; - preBuild = '' - export HOME=$(mktemp -d) - ''; - } - ); - - argcomplete = super.argcomplete.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.importlib-metadata ]; - } - ); - - arpeggio = super.arpeggio.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - astroid = super.astroid.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - av = super.av.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkg-config - ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.ffmpeg_4 ]; - } - ); - - argon2-cffi = - if (lib.versionAtLeast super.argon2-cffi.version "21.2.0") then - addBuildSystem - { - inherit self; - drv = super.argon2-cffi; - attr = "flit-core"; - } else super.argon2-cffi; - - awscrt = super.awscrt.overridePythonAttrs ( - old: { - nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs; - dontUseCmakeConfigure = true; - } - ); - bcrypt = - let - getCargoHash = version: { - "4.0.0" = "sha256-HvfRLyUhlXVuvxWrtSDKx3rMKJbjvuiMcDY6g+pYFS0="; - "4.0.1" = "sha256-lDWX69YENZFMu7pyBmavUZaalGvFqbHSHfkwkzmDQaY="; - }.${version} or ( - lib.warn "Unknown bcrypt version: '${version}'. Please update getCargoHash." lib.fakeHash - ); - in - super.bcrypt.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) - ++ [ pkgs.libffi ] - ++ lib.optionals (lib.versionAtLeast old.version "4" && stdenv.isDarwin) - [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.libiconv ]; - nativeBuildInputs = with pkgs; - (old.nativeBuildInputs or [ ]) - ++ lib.optionals (lib.versionAtLeast old.version "4") [ rustc cargo pkgs.rustPlatform.cargoSetupHook self.setuptools-rust ]; - } // lib.optionalAttrs (lib.versionAtLeast old.version "4") { - cargoDeps = - pkgs.rustPlatform.fetchCargoTarball - { - src = old.src; - sourceRoot = "${old.pname}-${old.version}/src/_bcrypt"; - name = "${old.pname}-${old.version}"; - sha256 = getCargoHash old.version; - }; - cargoRoot = "src/_bcrypt"; - } - ); - bjoern = super.bjoern.overridePythonAttrs ( - old: { - buildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.libev ]; - } - ); - - borgbackup = super.borgbackup.overridePythonAttrs ( - old: { - BORG_OPENSSL_PREFIX = pkgs.openssl.dev; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl pkgs.acl ]; - } - ); - - cairocffi = super.cairocffi.overridePythonAttrs ( - old: { - inherit (pkgs.python3.pkgs.cairocffi) patches; - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - cairosvg = super.cairosvg.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - cattrs = - let - drv = super.cattrs; - in - if drv.version == "1.10.0" then - drv.overridePythonAttrs - (old: { - # 1.10.0 contains a pyproject.toml that requires a pre-release Poetry - # We can avoid using Poetry and use the generated setup.py - preConfigure = old.preConfigure or "" + '' - rm pyproject.toml - ''; - }) else drv; - - ccxt = super.ccxt.overridePythonAttrs (old: { - preBuild = '' - ln -s README.{rst,md} - ''; - }); - - celery = super.celery.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - cerberus = super.cerberus.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - cssselect2 = super.cssselect2.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - cffi = - # cffi is bundled with pypy - if self.python.implementation == "pypy" then null else - ( - super.cffi.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkg-config ]; - buildInputs = old.buildInputs or [ ] ++ [ pkgs.libffi ]; - prePatch = (old.prePatch or "") + lib.optionalString (!(old.src.isWheel or false) && stdenv.isDarwin) '' - # Remove setup.py impurities - substituteInPlace setup.py --replace "'-iwithsysroot/usr/include/ffi'" "" - substituteInPlace setup.py --replace "'/usr/include/ffi'," "" - substituteInPlace setup.py --replace '/usr/include/libffi' '${lib.getDev pkgs.libffi}/include' - ''; - - } - ) - ); - - cmdstanpy = super.cmdstanpy.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan ]; - patchPhase = '' - substituteInPlace cmdstanpy/model.py \ - --replace 'cmd = [make]' \ - 'cmd = ["${pkgs.cmdstan}/bin/stan"]' - ''; - CMDSTAN = "${pkgs.cmdstan}"; - } - ); - - contourpy = super.contourpy.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pybind11 ]; - } - ); - - cloudflare = super.cloudflare.overridePythonAttrs ( - old: { - postPatch = '' - rm -rf examples/* - ''; - } - ); - - colour = super.colour.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ]; - } - ); - - coincurve = super.coincurve.overridePythonAttrs ( - old: { - # package setup logic - LIB_DIR = "${lib.getLib pkgs.secp256k1}/lib"; - - # for actual C toolchain build - NIX_CFLAGS_COMPILE = "-I ${lib.getDev pkgs.secp256k1}/include"; - NIX_LDFLAGS = "-L ${lib.getLib pkgs.secp256k1}/lib"; - } - ); - - configparser = super.configparser.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - confluent-kafka = super.confluent-kafka.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.rdkafka - ]; - } - ); - - copier = super.copier.overrideAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.git ]; - }); - - cryptography = - let - getCargoHash = version: { - "35.0.0" = "sha256-tQoQfo+TAoqAea86YFxyj/LNQCiViu5ij/3wj7ZnYLI="; - "36.0.0" = "sha256-Y6TuW7AryVgSvZ6G8WNoDIvi+0tvx8ZlEYF5qB0jfNk="; - "36.0.1" = "sha256-kozYXkqt1Wpqyo9GYCwN08J+zV92ZWFJY/f+rulxmeQ="; - "36.0.2" = "1a0ni1a3dbv2dvh6gx2i54z8v5j9m6asqg97kkv7gqb1ivihsbp8"; - "37.0.2" = "sha256-qvrxvneoBXjP96AnUPyrtfmCnZo+IriHR5HbtWQ5Gk8="; - "37.0.4" = "sha256-f8r6QclTwkgK20CNe9i65ZOqvSUeDc4Emv6BFBhh1hI"; - "38.0.1" = "sha256-o8l13fnfEUvUdDasq3LxSPArozRHKVsZfQg9DNR6M6Q="; - "38.0.3" = "sha256-lzHLW1N4hZj+nn08NZiPVM/X+SEcIsuZDjEOy0OOkSc="; - "38.0.4" = "sha256-BN0kOblUwgHj5QBf52RY2Jx0nBn03lwoN1O5PEohbwY="; - "39.0.0" = "sha256-clorC0NtGukpE3DnZ84MSdGhJN+qC89DZPITZFuL01Q="; - "39.0.2" = "sha256-Admz48/GS2t8diz611Ciin1HKQEyMDEwHxTpJ5tZ1ZA="; - "40.0.0" = "sha256-/TBANavYria9YrBpMgjtFyqg5feBcloETcYJ8fdBgkI="; - "40.0.1" = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; - "40.0.2" = "sha256-cV4GTfbVYanElXOVmynvrru2wJuWvnT1Z1tQKXdkbg0="; - "41.0.1" = "sha256-38q81vRf8QHR8lFRM2KbH7Ng5nY7nmtWRMoPWS9VO/U="; - }.${version} or ( - lib.warn "Unknown cryptography version: '${version}'. Please update getCargoHash." lib.fakeHash - ); - sha256 = getCargoHash super.cryptography.version; - isWheel = lib.hasSuffix ".whl" super.cryptography.src; - scrypto = - if isWheel then - ( - super.cryptography.overridePythonAttrs { preferWheel = true; } - ) else super.cryptography; - in - scrypto.overridePythonAttrs - ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] - ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi - ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel) [ pkgs.rustPlatform.cargoSetupHook pkgs.cargo pkgs.rustc ] - ++ [ pkg-config ] - ; - buildInputs = (old.buildInputs or [ ]) - ++ [ pkgs.libxcrypt ] - ++ [ (if lib.versionAtLeast old.version "37" then pkgs.openssl_3 else pkgs.openssl_1_1) ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.libiconv ]; - propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.cffi ]; - } // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") { - CRYPTOGRAPHY_DONT_BUILD_RUST = "1"; - } // lib.optionalAttrs (lib.versionAtLeast old.version "3.5" && !isWheel) rec { - cargoDeps = - pkgs.rustPlatform.fetchCargoTarball { - src = old.src; - sourceRoot = "${old.pname}-${old.version}/${cargoRoot}"; - name = "${old.pname}-${old.version}"; - inherit sha256; - }; - cargoRoot = "src/rust"; - } - ); - - cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - postPatch = '' - substituteInPlace setup.py --replace 'setuptools>=50.3.2,<51.0.0' 'setuptools' - ''; - }); - - cysystemd = super.cysystemd.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.systemd ]; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; - }); - - daphne = super.daphne.overridePythonAttrs (old: { - postPatch = '' - substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"],' "" - ''; - }); - - darts = super.darts.override { - preferWheel = true; - }; - - datadog-lambda = super.datadog-lambda.overridePythonAttrs (old: { - postPatch = '' - substituteInPlace setup.py --replace "setuptools==" "setuptools>=" - ''; - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; - }); - - databricks-connect = super.databricks-connect.overridePythonAttrs (old: { - sourceRoot = "."; - }); - - dbt-extractor = super.dbt-extractor.overridePythonAttrs - ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cargo pkgs.rustc pkgs.maturin ]; - } - ); - - dbus-python = super.dbus-python.overridePythonAttrs (old: { - outputs = [ "out" "dev" ]; - - postPatch = old.postPatch or "" + '' - substituteInPlace ./configure --replace /usr/bin/file ${pkgs.file}/bin/file - substituteInPlace ./dbus-python.pc.in --replace 'Cflags: -I''${includedir}' 'Cflags: -I''${includedir}/dbus-1.0' - ''; - - configureFlags = (old.configureFlags or [ ]) ++ [ - "PYTHON_VERSION=${lib.versions.major self.python.version}" - ]; - - preConfigure = lib.concatStringsSep "\n" [ - (old.preConfigure or "") - (if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' - MACOSX_DEPLOYMENT_TARGET=10.16 - '' else "") - ]; - - preBuild = old.preBuild or "" + '' - make distclean - ''; - - nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkg-config ]; - buildInputs = old.buildInputs or [ ] ++ [ pkgs.dbus pkgs.dbus-glib ] - # My guess why it's sometimes trying to -lncurses. - # It seems not to retain the dependency anyway. - ++ lib.optional (! self.python ? modules) pkgs.ncurses; - }); - - dcli = super.dcli.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - ddtrace = super.ddtrace.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ - (lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]); - }); - - dictdiffer = super.dictdiffer.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - django = ( - super.django.overridePythonAttrs ( - old: { - propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) - ++ [ pkgs.gettext self.pytest-runner ]; - } - ) - ); - - django-bakery = super.django-bakery.overridePythonAttrs ( - old: { - configurePhase = '' - if ! test -e LICENSE; then - touch LICENSE - fi - '' + (old.configurePhase or ""); - } - ); - - django-cors-headers = super.django-cors-headers.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - django-hijack = super.django-hijack.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - django-prometheus = super.django-prometheus.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - django-rosetta = super.django-rosetta.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - django-stubs-ext = super.django-stubs-ext.overridePythonAttrs ( - old: { - prePatch = (old.prePatch or "") + "touch ../LICENSE.txt"; - } - ); - - dlib = super.dlib.overridePythonAttrs ( - old: { - # Parallel building enabled - inherit (pkgs.python.pkgs.dlib) patches; - - enableParallelBuilding = true; - dontUseCmakeConfigure = true; - - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ pkgs.dlib.nativeBuildInputs; - buildInputs = (old.buildInputs or [ ]) ++ pkgs.dlib.buildInputs; - } - ); - - # Setuptools >= 60 broke build_py_2to3 - docutils = - if lib.versionOlder super.docutils.version "0.16" && lib.versionAtLeast super.setuptools.version "60" then - ( - super.docutils.overridePythonAttrs ( - old: { - SETUPTOOLS_USE_DISTUTILS = "stdlib"; - } - ) - ) else super.docutils; - - duckdb = super.duckdb.overridePythonAttrs (old: { - postPatch = lib.optionalString (!(old.src.isWheel or false)) '' - cd tools/pythonpkg - - substituteInPlace setup.py \ - --replace 'multiprocessing.cpu_count()' "$NIX_BUILD_CORES" \ - --replace 'setuptools_scm<7.0.0' 'setuptools_scm' - ''; - }); - - # Environment markers are not always included (depending on how a dep was defined) - enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; - - eth-hash = super.eth-hash.overridePythonAttrs { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - }; - - eth-keyfile = super.eth-keyfile.overridePythonAttrs (old: { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - eth-keys = super.eth-keys.overridePythonAttrs { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - }; - - # FIXME: this is a workaround for https://github.com/nix-community/poetry2nix/issues/1161 - eth-utils = super.eth-utils.override { preferWheel = true; }; - - evdev = super.evdev.overridePythonAttrs (old: { - preConfigure = '' - substituteInPlace setup.py --replace /usr/include/linux ${pkgs.linuxHeaders}/include/linux - ''; - }); - - faker = super.faker.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - doCheck = false; - } - ); - - fancycompleter = super.fancycompleter.overridePythonAttrs ( - old: { - postPatch = lib.optionalString (!(old.src.isWheel or false)) '' - substituteInPlace setup.py \ - --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ - --replace 'versioning="devcommit"' 'version="${old.version}"' - ''; - } - ); - - fastecdsa = super.fastecdsa.overridePythonAttrs (old: { - buildInputs = old.buildInputs ++ [ pkgs.gmp.dev ]; - }); - - fastparquet = super.fastparquet.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - file-magic = super.file-magic.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace magic.py --replace "find_library('magic')" "'${pkgs.file}/lib/libmagic${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - } - ); - - fiona = super.fiona.overridePythonAttrs ( - old: { - format = lib.optionalString (!(old.src.isWheel or false)) "setuptools"; - buildInputs = old.buildInputs or [ ] ++ [ pkgs.gdal ]; - nativeBuildInputs = old.nativeBuildInputs or [ ] - ++ lib.optionals ((old.src.isWheel or false) && (!pkgs.stdenv.isDarwin)) [ pkgs.autoPatchelfHook ] - # for gdal-config - ++ [ pkgs.gdal ]; - } - ); - - flatbuffers = super.flatbuffers.overrideAttrs (old: { - VERSION = old.version; - }); - - gdal = - let - # Build gdal without python bindings to prevent version mixing - # We're only interested in the native libraries, not the python ones - # as we build that separately. - gdal = pkgs.gdal.overrideAttrs (old: { - doInstallCheck = false; - doCheck = false; - cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - "-DBUILD_PYTHON_BINDINGS=OFF" - ]; - }); - in - super.gdal.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ gdal ]; - preBuild = (old.preBuild or "") + '' - substituteInPlace setup.cfg \ - --replace "../../apps/gdal-config" '${gdal}/bin/gdal-config' - ''; - } - ); - - grandalf = super.grandalf.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - doCheck = false; - } - ); - - granian = - let - getRepoHash = version: { - "0.2.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; - "0.2.2" = "sha256-KWwefJ3CfOUGCgAm7AhFlIxRF9qxNEo3npGOxVJ23FY="; - "0.2.3" = "sha256-2JnyO0wxkV49R/0wzDb/PnUWWHi3ckwK4nVe7dWeH1k="; - "0.2.4" = "sha256-GdQJvVPsWgC1z7La9h11x2pRAP+L998yImhTFrFT5l8="; - "0.2.5" = "sha256-vMXMxss77rmXSjoB53eE8XN2jXyIEf03WoQiDfvhDmw="; - "0.2.6" = "sha256-l9W9+KDg/43mc0toEz1n1pqw+oQdiHdAxGlS+KLIGhw="; - "0.3.0" = "sha256-icBjtW8fZjT3mLo43nKWdirMz6GZIy/RghEO95pHJEU="; - "0.3.1" = "sha256-EKK+RxkJ//fY43EjvN1Fry7mn2ZLIaNlTyKPJRxyKZs="; - }.${version}; - sha256 = getRepoHash super.granian.version; - in - super.granian.overridePythonAttrs (old: rec { - src = pkgs.fetchFromGitHub { - owner = "emmett-framework"; - repo = "granian"; - rev = "v${old.version}"; - inherit sha256; - }; - cargoDeps = pkgs.rustPlatform.importCargoLock { - lockFile = "${src.out}/Cargo.lock"; - }; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.rustPlatform.cargoSetupHook - pkgs.rustPlatform.maturinBuildHook - ]; - }); - - gitpython = super.gitpython.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.typing-extensions ]; - } - ); - - grpcio = super.grpcio.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.c-ares pkgs.openssl pkgs.zlib ]; - - outputs = [ "out" "dev" ]; - - GRPC_BUILD_WITH_BORING_SSL_ASM = ""; - GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1; - GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1; - GRPC_PYTHON_BUILD_SYSTEM_CARES = 1; - DISABLE_LIBC_COMPATIBILITY = 1; - }); - - grpcio-tools = super.grpcio-tools.overridePythonAttrs (old: { - outputs = [ "out" "dev" ]; - }); - - gunicorn = super.gunicorn.overridePythonAttrs (old: { - # actually needs setuptools as a runtime dependency - propagatedBuildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; - }); - - h3 = super.h3.overridePythonAttrs ( - old: { - preBuild = (old.preBuild or "") + '' - substituteInPlace h3/h3.py \ - --replace "'{}/{}'.format(_dirname, libh3_path)" '"${pkgs.h3}/lib/libh3${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}"' - ''; - } - ); - - h5py = super.h5py.overridePythonAttrs ( - old: - if old.format != "wheel" then - ( - let - mpi = pkgs.hdf5.mpi; - mpiSupport = pkgs.hdf5.mpiSupport; - in - { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = - (old.buildInputs or [ ]) - ++ [ pkgs.hdf5 self.pkgconfig ] - ++ lib.optional mpiSupport mpi - ; - propagatedBuildInputs = - (old.propagatedBuildInputs or [ ]) - ++ lib.optionals mpiSupport [ self.mpi4py pkgs.openssh ] - ; - preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; - HDF5_DIR = "${pkgs.hdf5}"; - HDF5_MPI = if mpiSupport then "ON" else "OFF"; - # avoid strict pinning of numpy - postPatch = '' - substituteInPlace setup.py \ - --replace "numpy ==" "numpy >=" - ''; - pythonImportsCheck = [ "h5py" ]; - } - ) else old - ); - - hid = super.hid.overridePythonAttrs ( - old: { - postPatch = '' - found= - for name in libhidapi-hidraw libhidapi-libusb libhidapi-iohidmanager libhidapi; do - full_path=${pkgs.hidapi.out}/lib/$name${pkgs.stdenv.hostPlatform.extensions.sharedLibrary} - if test -f $full_path; then - found=t - sed -i -e "s|'$name\..*'|'$full_path'|" hid/__init__.py - fi - done - test -n "$found" || { echo "ERROR: No known libraries found in ${pkgs.hidapi.out}/lib, please update/fix this build expression."; exit 1; } - ''; - } - ); - - hikari = super.hikari.overrideAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - hikari-lightbulb = super.hikari-lightbulb.overrideAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - horovod = super.horovod.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.mpi ]; - } - ); - - httplib2 = super.httplib2.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pyparsing ]; - }); - - icecream = super.icecream.overridePythonAttrs (old: { - # # ERROR: Could not find a version that satisfies the requirement executing>=0.3.1 (from icecream) (from versions: none) - postPatch = '' - substituteInPlace setup.py --replace 'executing>=0.3.1' 'executing' - ''; - }); - - igraph = super.igraph.overridePythonAttrs ( - old: { - nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs; - dontUseCmakeConfigure = true; - } - ); - - imagecodecs = super.imagecodecs.overridePythonAttrs ( - old: { - patchPhase = '' - substituteInPlace setup.py \ - --replace "/usr/include/openjpeg-2.3" \ - "${pkgs.openjpeg.dev}/include/${pkgs.openjpeg.dev.incDir} - substituteInPlace setup.py \ - --replace "/usr/include/jxrlib" \ - "$out/include/libjxr" - substituteInPlace imagecodecs/_zopfli.c \ - --replace '"zopfli/zopfli.h"' \ - '<zopfli.h>' - substituteInPlace imagecodecs/_zopfli.c \ - --replace '"zopfli/zlib_container.h"' \ - '<zlib_container.h>' - substituteInPlace imagecodecs/_zopfli.c \ - --replace '"zopfli/gzip_container.h"' \ - '<gzip_container.h>' - ''; - - preBuild = '' - mkdir -p $out/include/libjxr - ln -s ${pkgs.jxrlib}/include/libjxr/**/* $out/include/libjxr - - ''; - - buildInputs = (old.buildInputs or [ ]) ++ [ - # Commented out packages are declared required, but not actually - # needed to build. They are not yet packaged for nixpkgs. - # bitshuffle - pkgs.brotli - # brunsli - pkgs.bzip2 - pkgs.c-blosc - # charls - pkgs.giflib - pkgs.jxrlib - pkgs.lcms - pkgs.libaec - pkgs.libaec - pkgs.libjpeg_turbo - # liblzf - # liblzma - pkgs.libpng - pkgs.libtiff - pkgs.libwebp - pkgs.lz4 - pkgs.openjpeg - pkgs.snappy - # zfp - pkgs.zopfli - pkgs.zstd - pkgs.zlib - ]; - } - ); - - # importlib-metadata has an incomplete dependency specification - importlib-metadata = super.importlib-metadata.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ lib.optional self.python.isPy2 self.pathlib2; - } - ); - - intreehooks = super.intreehooks.overridePythonAttrs ( - old: { - doCheck = false; - } - ); - - ipython = super.ipython.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - isort = super.isort.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - jaraco-functools = super.jaraco-functools.overridePythonAttrs ( - old: { - # required for the extra "toml" dependency in setuptools_scm[toml] - buildInputs = (old.buildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - trio = super.trio.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) - ++ [ self.async-generator self.idna ]; - }); - - jeepney = super.jeepney.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.outcome self.trio ]; - }); - - jinja2-ansible-filters = super.jinja2-ansible-filters.overridePythonAttrs ( - old: { - preBuild = (old.preBuild or "") + '' - echo "${old.version}" > VERSION - ''; - } - ); - - jira = super.jira.overridePythonAttrs ( - old: { - inherit (pkgs.python3Packages.jira) patches; - buildInputs = (old.buildInputs or [ ]) ++ [ - self.pytestrunner - self.cryptography - self.pyjwt - self.setuptools-scm-git-archive - ]; - } - ); - - jq = super.jq.overridePythonAttrs (attrs: { - buildInputs = [ pkgs.jq ]; - patches = [ - (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/NixOS/nixpkgs/088da8735f6620b60d724aa7db742607ea216087/pkgs/development/python-modules/jq/jq-py-setup.patch"; - sha256 = "sha256-MYvX3S1YGe0QsUtExtOtULvp++AdVrv+Fid4Jh1xewQ="; - }) - ]; - }); - - jsondiff = - if lib.versionOlder "2.0.0" - then - super.jsondiff.overridePythonAttrs - ( - old: { - preBuild = lib.optionalString (!(old.src.isWheel or false)) ( - (old.preBuild or "") + '' - substituteInPlace setup.py \ - --replace "'jsondiff=jsondiff.cli:main_deprecated'," "" - '' - ); - } - ) - else super.jsondiff; - - jsonslicer = super.jsonslicer.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ]; - }); - - jsonschema = - if lib.versionAtLeast super.jsonschema.version "4.0.0" - then - super.jsonschema.overridePythonAttrs - (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.importlib-resources ]; - }) - else super.jsonschema; - - jupyter = super.jupyter.overridePythonAttrs ( - old: { - # jupyter is a meta-package. Everything relevant comes from the - # dependencies. It does however have a jupyter.py file that conflicts - # with jupyter-core so this meta solves this conflict. - meta.priority = 100; - } - ); - - jupyter-packaging = super.jupyter-packaging.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools self.wheel ]; - }); - - jupyter-server = super.jupyter-server.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ [ self.hatchling ]; - buildInputs = (old.buildInputs or [ ]) - ++ [ self.hatch-jupyter-builder ]; - }); - - jupyterlab-widgets = super.jupyterlab-widgets.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.jupyter-packaging ]; - } - ); - - kerberos = super.kerberos.overrideAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.libkrb5 ]; - }); - - keyring = super.keyring.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - kiwisolver = super.kiwisolver.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.cppy - ]; - } - ); - - lap = super.lap.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.numpy - ]; - } - ); - - libarchive = super.libarchive.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ]; - - postPatch = '' - substituteInPlace libarchive/library.py --replace \ - "_FILEPATH = find_and_load_library()" "_FILEPATH = '${pkgs.libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - }); - - libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: { - nativeBuildInputs = nativeBuildInputs ++ [ pkg-config ]; - propagatedBuildInputs = [ pkgs.libvirt ]; - }); - - lightgbm = super.lightgbm.overridePythonAttrs ( - old: { - nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs; - dontUseCmakeConfigure = true; - postConfigure = '' - export HOME=$(mktemp -d) - ''; - } - ); - - llama-cpp-python = super.llama-cpp-python.overridePythonAttrs ( - old: { - buildInputs = with pkgs; lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Accelerate - ]; - nativeBuildInputs = [ pkgs.cmake ] ++ (old.nativeBuildInputs or [ ]); - preBuild = '' - cd "$OLDPWD" - ''; - } - ); - - llvmlite = super.llvmlite.overridePythonAttrs ( - old: - let - # see https://github.com/numba/llvmlite#compatibility - llvm_version = toString ( - if lib.versionAtLeast old.version "0.40.0" then 14 - else if lib.versionAtLeast old.version "0.37.0" then 11 - else if lib.versionAtLeast old.version "0.34.0" && !stdenv.buildPlatform.isAarch64 then 10 - else if lib.versionAtLeast old.version "0.33.0" then 9 - else if lib.versionAtLeast old.version "0.29.0" then 8 - else if lib.versionAtLeast old.version "0.27.0" then 7 - else if lib.versionAtLeast old.version "0.23.0" then 6 - else if lib.versionAtLeast old.version "0.21.0" then 5 - else 4 - ); - llvm = pkgs."llvmPackages_${llvm_version}".llvm or (throw "LLVM${llvm_version} has been removed from nixpkgs; upgrade llvmlite or use older nixpkgs"); - in - { - inherit llvm; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.llvmlite.llvm ]; - - # Disable static linking - # https://github.com/numba/llvmlite/issues/93 - postPatch = '' - substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" - - substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" - ''; - - # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${llvm.dev}/bin/llvm-config - ''; - - __impureHostDeps = lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - - passthru = old.passthru // { llvm = llvm; }; - } - ); - - lsassy = - if super.lsassy.version == "3.1.1" then - super.lsassy.overridePythonAttrs - (old: { - # pyproject.toml contains a constraint `rich = "^10.6.0"` which is not replicated in setup.py - # hence pypi misses it and poetry pins rich to 11.0.0 - preConfigure = (old.preConfigure or "") + '' - rm pyproject.toml - ''; - }) else super.lsassy; - - lxml = super.lxml.overridePythonAttrs ( - old: { - nativeBuildInputs = with pkgs.buildPackages; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; - buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ libxml2 libxslt ]; - } - ); - - markdown-it-py = super.markdown-it-py.overridePythonAttrs ( - old: { - propagatedBuildInputs = builtins.filter (i: i.pname != "mdit-py-plugins") old.propagatedBuildInputs; - preConfigure = lib.optionalString (!(old.src.isWheel or false)) ( - (old.preConfigure or "") + '' - substituteInPlace pyproject.toml --replace 'plugins = ["mdit-py-plugins"]' 'plugins = []' - '' - ); - } - ); - - markupsafe = super.markupsafe.overridePythonAttrs ( - old: { - src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; - } - ); - - matplotlib = super.matplotlib.overridePythonAttrs ( - old: - let - enableGhostscript = old.passthru.args.enableGhostscript or false; - enableGtk3 = old.passthru.args.enableGtk3 or false; - enableQt = old.passthru.args.enableQt or false; - enableTk = old.passthru.args.enableTk or false; - - interactive = enableTk || enableGtk3 || enableQt; - - passthru = { - config = { - directories = { basedirlist = "."; }; - libs = { - system_freetype = true; - system_qhull = true; - } // lib.optionalAttrs stdenv.isDarwin { - # LTO not working in darwin stdenv, see Nixpkgs #19312 - enable_lto = false; - }; - }; - }; - - inherit (pkgs) tk tcl wayland qhull; - inherit (pkgs.xorg) libX11; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - in - { - XDG_RUNTIME_DIR = "/tmp"; - - buildInputs = old.buildInputs or [ ] ++ [ - pkgs.which - ] ++ lib.optionals enableGhostscript [ - pkgs.ghostscript - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa - ] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.7.0") [ - self.pybind11 - ]; - - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.certifi - pkgs.libpng - pkgs.freetype - qhull - ] - ++ lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] - ++ lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] - ++ lib.optionals enableQt [ self.pyqt5 ] - ; - - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkg-config - ] ++ lib.optionals (lib.versionAtLeast super.matplotlib.version "3.5.0") [ - self.setuptools-scm - self.setuptools-scm-git-archive - ]; - - # Clang doesn't understand -fno-strict-overflow, and matplotlib builds with -Werror - hardeningDisable = if stdenv.isDarwin then [ "strictoverflow" ] else [ ]; - - passthru = old.passthru or { } // passthru; - - MPLSETUPCFG = pkgs.writeText "mplsetup.cfg" (lib.generators.toINI { } passthru.config); - - # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the - # corresponding interpreter object for its library paths. This fails if - # `$DISPLAY` is not set. The fallback option assumes that Tcl/Tk are both - # installed under the same path which is not true in Nix. - # With the following patch we just hard-code these paths into the install - # script. - postPatch = - let - tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"''; - in - lib.optionalString enableTk '' - sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py - '' + lib.optionalString (stdenv.isLinux && interactive) '' - # fix paths to libraries in dlopen calls (headless detection) - substituteInPlace src/_c_internal_utils.c \ - --replace libX11.so.6 ${libX11}/lib/libX11.so.6 \ - --replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0 - '' + - # avoid matplotlib trying to download dependencies - '' - echo "[libs] - system_freetype=true - system_qhull=true" > mplsetup.cfg - ''; - - } - ); - - mccabe = super.mccabe.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - doCheck = false; - } - ); - - mip = super.mip.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoPatchelfHook ]; - - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.zlib self.cppy ]; - } - ); - - mmdet = super.mmdet.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytorch ]; - } - ); - - molecule = - if lib.versionOlder super.molecule.version "3.0.0" then - (super.molecule.overridePythonAttrs ( - old: { - patches = (old.patches or [ ]) ++ [ - # Fix build with more recent setuptools versions - (pkgs.fetchpatch { - url = "https://github.com/ansible-community/molecule/commit/c9fee498646a702c77b5aecf6497cff324acd056.patch"; - sha256 = "1g1n45izdz0a3c9akgxx14zhdw6c3dkb48j8pq64n82fa6ndl1b7"; - excludes = [ "pyproject.toml" ]; - }) - ]; - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools self.setuptools-scm self.setuptools-scm-git-archive ]; - } - )) else - super.molecule.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools self.setuptools-scm self.setuptools-scm-git-archive ]; - }); - - munch = super.munch.overridePythonAttrs ( - old: { - # Latest version of pypi imports pkg_resources at runtime, so setuptools is needed at runtime. :( - # They fixed this last year but never released a new version. - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - } - ); - - mpi4py = super.mpi4py.overridePythonAttrs ( - old: - let - cfg = pkgs.writeTextFile { - name = "mpi.cfg"; - text = ( - lib.generators.toINI - { } - { - mpi = { - mpicc = "${pkgs.mpi.outPath}/bin/mpicc"; - }; - } - ); - }; - in - { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.mpi ]; - enableParallelBuilding = true; - preBuild = '' - ln -sf ${cfg} mpi.cfg - ''; - } - ); - - multiaddr = super.multiaddr.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - mypy = super.mypy.overridePythonAttrs ( - old: - let - # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled - # version is also the default in the wheels on Pypi that include binaries. - # is64bit: unfortunately the build would exhaust all possible memory on i686-linux. - MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit; - - envAttrs = - if old ? env - then { env = old.env // { inherit MYPY_USE_MYPYC; }; } - else { inherit MYPY_USE_MYPYC; }; - in - { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.types-typed-ast - self.types-setuptools - ] - ++ lib.optional (lib.strings.versionAtLeast old.version "0.990") self.types-psutil - ; - - # when testing reduce optimisation level to drastically reduce build time - # (default is 3) - # MYPYC_OPT_LEVEL = 1; - } // envAttrs // lib.optionalAttrs (old.format != "wheel") { - # FIXME: Remove patch after upstream has decided the proper solution. - # https://github.com/python/mypy/pull/11143 - patches = (old.patches or [ ]) ++ lib.optionals ((lib.strings.versionAtLeast old.version "0.900") && lib.strings.versionOlder old.version "0.940") [ - (pkgs.fetchpatch { - url = "https://github.com/python/mypy/commit/f1755259d54330cd087cae763cd5bbbff26e3e8a.patch"; - sha256 = "sha256-5gPahX2X6+/qUaqDQIGJGvh9lQ2EDtks2cpQutgbOHk="; - }) - ] ++ lib.optionals ((lib.strings.versionAtLeast old.version "0.940") && lib.strings.versionOlder old.version "0.960") [ - (pkgs.fetchpatch { - url = "https://github.com/python/mypy/commit/e7869f05751561958b946b562093397027f6d5fa.patch"; - sha256 = "sha256-waIZ+m3tfvYE4HJ8kL6rN/C4fMjvLEe9UoPbt9mHWIM="; - }) - ] ++ lib.optionals ((lib.strings.versionAtLeast old.version "0.960") && (lib.strings.versionOlder old.version "0.971")) [ - (pkgs.fetchpatch { - url = "https://github.com/python/mypy/commit/2004ae023b9d3628d9f09886cbbc20868aee8554.patch"; - sha256 = "sha256-y+tXvgyiECO5+66YLvaje8Bz5iPvfWNIBJcsnZ2nOdI="; - }) - ]; - } - ); - - mysqlclient = super.mysqlclient.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.libmysqlclient ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libmysqlclient ]; - } - ); - - netcdf4 = super.netcdf4.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - pkgs.zlib - pkgs.netcdf - pkgs.hdf5 - pkgs.curl - pkgs.libjpeg - ]; - - # Variables used to configure the build process - USE_NCCONFIG = "0"; - HDF5_DIR = lib.getDev pkgs.hdf5; - NETCDF4_DIR = pkgs.netcdf; - CURL_DIR = pkgs.curl.dev; - JPEG_DIR = pkgs.libjpeg.dev; - } - ); - - numpy = super.numpy.overridePythonAttrs ( - old: - let - blas = old.passthru.args.blas or pkgs.openblasCompat; - blasImplementation = lib.nameFromURL blas.name "-"; - cfg = pkgs.writeTextFile { - name = "site.cfg"; - text = ( - lib.generators.toINI - { } - { - ${blasImplementation} = { - include_dirs = "${blas}/include"; - library_dirs = "${blas}/lib"; - } // lib.optionalAttrs (blasImplementation == "mkl") { - mkl_libs = "mkl_rt"; - lapack_libs = ""; - }; - } - ); - }; - in - { - # fails to build with format=pyproject and setuptools >= 65 - format = if (old.format == "poetry2nix") then "setuptools" else old.format; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ]; - buildInputs = (old.buildInputs or [ ]) ++ [ blas ]; - enableParallelBuilding = true; - preBuild = '' - ln -s ${cfg} site.cfg - ''; - preConfigure = '' - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - ''; - passthru = old.passthru // { - blas = blas; - inherit blasImplementation cfg; - }; - } - ); - - # The following are dependencies of torch >= 2.0.0. - # torch doesn't officially support system CUDA, unless you build it yourself. - nvidia-cudnn-cu11 = super.nvidia-cudnn-cu11.overridePythonAttrs (attrs: { - autoPatchelfIgnoreMissingDeps = true; - # (Bytecode collision happens with nvidia-cuda-nvrtc-cu11.) - postFixup = '' - rm -r $out/${self.python.sitePackages}/nvidia/{__pycache__,__init__.py} - ''; - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ - self.nvidia-cublas-cu11 - ]; - }); - - nvidia-cuda-nvrtc-cu11 = super.nvidia-cuda-nvrtc-cu11.overridePythonAttrs (_: { - # (Bytecode collision happens with nvidia-cudnn-cu11.) - postFixup = '' - rm -r $out/${self.python.sitePackages}/nvidia/{__pycache__,__init__.py} - ''; - }); - - nvidia-cusolver-cu11 = super.nvidia-cusolver-cu11.overridePythonAttrs (attrs: { - autoPatchelfIgnoreMissingDeps = true; - # (Bytecode collision happens with nvidia-cusolver-cu11.) - postFixup = '' - rm -r $out/${self.python.sitePackages}/nvidia/{__pycache__,__init__.py} - ''; - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ - self.nvidia-cublas-cu11 - ]; - }); - - omegaconf = super.omegaconf.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.jdk ]; - } - ); - - open3d = super.open3d.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.ipywidgets ]; - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.libusb1 - ] ++ lib.optionals stdenv.isLinux [ - pkgs.udev - ] ++ lib.optionals (lib.versionAtLeast super.open3d.version "0.16.0") [ - pkgs.mesa - ( - pkgs.symlinkJoin { - name = "llvm-with-ubuntu-compatible-symlink"; - paths = [ - pkgs.llvm_10.lib - (pkgs.runCommand "llvm-ubuntu-compatible-symlink" { } - '' - mkdir -p "$out/lib/"; - ln -s "${pkgs.llvm_10.lib}/lib/libLLVM-10.so" "$out/lib/libLLVM-10.so.1" - '' - ) - ]; - }) - ]; - - # Patch the dylib in the binary distribution to point to the nix build of libomp - preFixup = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast super.open3d.version "0.16.0") '' - install_name_tool -change /opt/homebrew/opt/libomp/lib/libomp.dylib ${pkgs.llvmPackages.openmp}/lib/libomp.dylib $out/lib/python*/site-packages/open3d/cpu/pybind.cpython-*-darwin.so - ''; - - # TODO(Sem Mulder): Add overridable flags for CUDA/PyTorch/Tensorflow support. - autoPatchelfIgnoreMissingDeps = true; - }); - - openbabel-wheel = super.openbabel-wheel.override { preferWheel = true; }; - - # Overrides for building packages based on OpenCV - # These flags are inspired by the opencv 4.x package in nixpkgs - _opencv-python-override = - old: { - # Disable OpenCL on macOS - # Can't use cmakeFlags because cmake is called by setup.py - CMAKE_ARGS = lib.optionalString stdenv.isDarwin "-DWITH_OPENCL=OFF"; - - nativeBuildInputs = [ pkgs.cmake ] ++ old.nativeBuildInputs; - buildInputs = [ - self.scikit-build - ] ++ lib.optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ - Accelerate - AVFoundation - Cocoa - CoreMedia - MediaToolbox - VideoDecodeAcceleration - ]) ++ (old.buildInputs or [ ]); - dontUseCmakeConfigure = true; - }; - - opencv-python = super.opencv-python.overridePythonAttrs self._opencv-python-override; - - opencv-python-headless = super.opencv-python-headless.overridePythonAttrs self._opencv-python-override; - - opencv-contrib-python = super.opencv-contrib-python.overridePythonAttrs self._opencv-python-override; - - openexr = super.openexr.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openexr pkgs.ilmbase ]; - NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; - } - ); - - openvino = super.openvino.overridePythonAttrs ( - old: { - buildInputs = [ - pkgs.ocl-icd - pkgs.hwloc - pkgs.tbb - pkgs.numactl - pkgs.libxml2 - ] ++ (old.buildInputs or [ ]); - } - ); - - orjson = - let - getCargoHash = version: { - "3.6.7" = "sha256-sz2k9podPB6QSptkyOu7+BoVTrKhefizRtYU+MICPt4="; - "3.6.8" = "sha256-vpfceVtYkU09xszNIihY1xbqGWieqDquxwsAmDH8jd4="; - "3.7.2" = "sha256-2U37IhftNYjH7sV7Nh51YpR/WjmPmmzX/aGuHsFgwf4="; - "3.7.9" = "sha256-QHzAhjHgm4XLxY2zUdnIsd/WWMI7dJLQQAvTXC+2asQ="; - "3.8.0" = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc="; - "3.8.1" = "sha256-QXguyDxQHW9Fd3Nhmi5JzSxZQuk3HGPhhh/RGuOTZNY="; - "3.8.3" = "sha256-oSZO4cN1sJKd0T7pYrKG63is8AZMKaLRZqj5UCVY/14="; - "3.8.4" = "sha256-O2W9zO7qHWG+78T+uECICAmecaSIbTTJPktJIPZYElE="; - "3.8.5" = "sha256-JtUCJ3TP9EKGcddeyW1e/72k21uKneq9SnZJeLvn9Os="; - "3.8.6" = "sha256-8T//q6nQoZhh8oJWDCeQf3gYRew58dXAaxkYELY4CJM="; - "3.8.7" = "sha256-JBO8nl0sC+XIn17vI7hC8+nA1HYI9jfvZrl9nCE3k1s="; - "3.8.8" = "sha256-AK4HtqPKg2O2FeLHCbY9o+N1BV4QFMNaHVE1NaFYHa4="; - "3.8.10" = "sha256-AcrTEHv7GYtGe4fXYsM24ElrzfhnOxLYlaon1ZrlD4A="; - }.${version} or ( - lib.warn "Unknown orjson version: '${version}'. Please update getCargoHash." lib.fakeHash - ); - in - super.orjson.overridePythonAttrs (old: if old.src.isWheel or false then { } else { - cargoDeps = pkgs.rustPlatform.fetchCargoTarball { - inherit (old) src; - name = "${old.pname}-${old.version}"; - hash = getCargoHash old.version; - }; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.rustPlatform.cargoSetupHook - pkgs.rustPlatform.maturinBuildHook - ]; - buildInputs = (old.buildInputs or [ ]) ++ lib.optional pkgs.stdenv.isDarwin pkgs.libiconv; - }); - - osqp = super.osqp.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ]; - dontUseCmakeConfigure = true; - } - ); - - - pandas = super.pandas.overridePythonAttrs (old: { - - buildInputs = old.buildInputs or [ ] ++ lib.optional stdenv.isDarwin pkgs.libcxx; - - # Doesn't work with -Werror,-Wunused-command-line-argument - # https://github.com/NixOS/nixpkgs/issues/39687 - hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - postPatch = lib.optionalString (!(old.src.isWheel or false) && stdenv.isDarwin) '' - cpp_sdk="${lib.getDev pkgs.libcxx}/include/c++/v1"; - echo "Adding $cpp_sdk to the setup.py common_include variable" - substituteInPlace setup.py \ - --replace "['pandas/src/klib', 'pandas/src']" \ - "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" - ''; - - - enableParallelBuilding = true; - }); - - pantalaimon = super.pantalaimon.overridePythonAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.installShellFiles ]; - postInstall = old.postInstall or "" + '' - installManPage docs/man/*.[1-9] - ''; - }); - - pao = super.pao.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.pyutilib ]; - }); - - paramiko = super.paramiko.overridePythonAttrs (old: { - doCheck = false; # requires networking - }); - - parsel = super.parsel.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - pdal = super.pdal.overridePythonAttrs ( - old: { - PDAL_CONFIG = "${pkgs.pdal}/bin/pdal-config"; - } - ); - - peewee = super.peewee.overridePythonAttrs ( - old: - let - withPostgres = old.passthru.withPostgres or false; - withMysql = old.passthru.withMysql or false; - in - { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ]; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) - ++ lib.optional withPostgres self.psycopg2 - ++ lib.optional withMysql self.mysql-connector; - } - ); - - pikepdf = super.pikepdf.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs or [ ] ++ [ pkgs.qpdf self.pybind11 ]; - pythonImportsCheck = old.pythonImportsCheck or [ ] ++ [ "pikepdf" ]; - } - ); - - pillow = super.pillow.overridePythonAttrs ( - old: - let - preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure; - in - { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ [ pkg-config self.pytest-runner ]; - buildInputs = with pkgs; (old.buildInputs or [ ]) - ++ [ freetype libjpeg zlib libtiff libxcrypt libwebp tcl lcms2 ] - ++ lib.optionals (lib.versionAtLeast old.version "7.1.0") [ xorg.libxcb ] - ++ lib.optionals (self.isPyPy) [ tk xorg.libX11 ]; - preConfigure = lib.optional (old.format != "wheel") preConfigure; - } - ); - - pip-requirements-parser = super.pip-requirements-parser.overridePythonAttrs (old: { - dontConfigure = true; - }); - - pluralizer = super.pluralizer.overridePythonAttrs (old: { - preBuild = '' - export PYPI_VERSION="${old.version}" - ''; - }); - - poethepoet = super.poethepoet.overrideAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.poetry ]; - }); - - poetry-core = super.poetry-core.overridePythonAttrs (old: - let - initFile = - if lib.versionOlder super.poetry-core.version "1.1" - then "poetry/__init__.py" - else "./src/poetry/core/__init__.py"; - in - { - # "Vendor" dependencies (for build-system support) - postPatch = '' - echo "import sys" >> ${initFile} - for path in $propagatedBuildInputs; do - echo "sys.path.insert(0, \"$path\")" >> ${initFile} - done - ''; - - # Propagating dependencies leads to issues downstream - # We've already patched poetry to prefer "vendored" dependencies - postFixup = '' - rm $out/nix-support/propagated-build-inputs - ''; - }); - - # Requires poetry which isn't available during bootstrap - poetry-plugin-export = super.poetry-plugin-export.overridePythonAttrs (old: { - dontUsePythonImportsCheck = true; - pipInstallFlags = [ - "--no-deps" - ]; - }); - - portend = super.portend.overridePythonAttrs ( - old: { - # required for the extra "toml" dependency in setuptools_scm[toml] - buildInputs = (old.buildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - prettytable = super.prettytable.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - prophet = super.prophet.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.cmdstan self.cmdstanpy ]; - PROPHET_REPACKAGE_CMDSTAN = "false"; - CMDSTAN = "${pkgs.cmdstan}"; - }); - - psycopg2 = super.psycopg2.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) - ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; - } - ); - - psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) - ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; - } - ); - - psycopg2cffi = super.psycopg2cffi.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) - ++ lib.optional stdenv.isDarwin pkgs.openssl; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ]; - } - ); - - py-solc-x = super.py-solc-x.overridePythonAttrs ( - old: { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.requests self.semantic-version ]; - } - ); - - pyarrow = - if (!super.pyarrow.src.isWheel or false) && lib.versionAtLeast super.pyarrow.version "0.16.0" then - super.pyarrow.overridePythonAttrs - ( - old: - let - parseMinor = drv: lib.concatStringsSep "." (lib.take 2 (lib.splitVersion drv.version)); - - # Starting with nixpkgs revision f149c7030a7, pyarrow takes "python3" as an argument - # instead of "python". Below we inspect function arguments to maintain compatibilitiy. - _arrow-cpp = pkgs.arrow-cpp.override ( - builtins.intersectAttrs - (lib.functionArgs pkgs.arrow-cpp.override) - { python = self.python; python3 = self.python; } - ); - - ARROW_HOME = _arrow-cpp; - arrowCppVersion = parseMinor _arrow-cpp; - pyArrowVersion = parseMinor super.pyarrow; - errorMessage = "arrow-cpp version (${arrowCppVersion}) mismatches pyarrow version (${pyArrowVersion})"; - in - if arrowCppVersion != pyArrowVersion then throw errorMessage else { - - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkg-config - pkgs.cmake - ]; - - buildInputs = (old.buildInputs or [ ]) ++ [ - _arrow-cpp - ]; - - preBuild = '' - export PYARROW_PARALLEL=$NIX_BUILD_CORES - ''; - - PARQUET_HOME = _arrow-cpp; - inherit ARROW_HOME; - - PYARROW_BUILD_TYPE = "release"; - PYARROW_WITH_FLIGHT = if _arrow-cpp.enableFlight then 1 else 0; - PYARROW_WITH_DATASET = 1; - PYARROW_WITH_PARQUET = 1; - PYARROW_CMAKE_OPTIONS = [ - "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" - - # This doesn't use setup hook to call cmake so we need to workaround #54606 - # ourselves - "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" - ]; - - dontUseCmakeConfigure = true; - } - ) else - super.pyarrow; - - pycairo = ( - drv: ( - drv.overridePythonAttrs ( - _: { - format = "other"; - } - ) - ).overridePythonAttrs ( - old: { - - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.meson - pkgs.ninja - pkg-config - ]; - - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - pkgs.cairo - ]; - - mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ]; - } - ) - ) - super.pycairo; - - pycocotools = super.pycocotools.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.numpy - ]; - } - ); - - pyfftw = super.pyfftw.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.fftw - pkgs.fftwFloat - pkgs.fftwLongDouble - ]; - }); - - pyfuse3 = super.pyfuse3.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.fuse3 ]; - }); - - pygame = super.pygame.overridePythonAttrs ( - old: rec { - nativeBuildInputs = [ - pkg-config - pkgs.SDL - ]; - - buildInputs = [ - pkgs.SDL - pkgs.SDL_image - pkgs.SDL_mixer - pkgs.SDL_ttf - pkgs.libpng - pkgs.libjpeg - pkgs.portmidi - pkgs.xorg.libX11 - pkgs.freetype - ]; - - # Tests fail because of no audio device and display. - doCheck = false; - preConfigure = '' - sed \ - -e "s/origincdirs = .*/origincdirs = []/" \ - -e "s/origlibdirs = .*/origlibdirs = []/" \ - -e "/'\/lib\/i386-linux-gnu', '\/lib\/x86_64-linux-gnu']/d" \ - -e "/\/include\/smpeg/d" \ - -i buildconfig/config_unix.py - ${lib.concatMapStrings - (dep: '' - sed \ - -e "/origincdirs =/a\ origincdirs += ['${lib.getDev dep}/include']" \ - -e "/origlibdirs =/a\ origlibdirs += ['${lib.getLib dep}/lib']" \ - -i buildconfig/config_unix.py - '') - buildInputs - } - LOCALBASE=/ ${self.python.interpreter} buildconfig/config.py - ''; - } - ); - - pygeos = super.pygeos.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos ]; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.geos ]; - } - ); - - pygobject = super.pygobject.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.glib pkgs.gobject-introspection ]; - } - ); - - pylint = super.pylint.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - pymediainfo = super.pymediainfo.overridePythonAttrs ( - old: { - postPatch = (old.postPatch or "") + '' - substituteInPlace pymediainfo/__init__.py \ - --replace "libmediainfo.0.dylib" \ - "${pkgs.libmediainfo}/lib/libmediainfo.0${stdenv.hostPlatform.extensions.sharedLibrary}" \ - --replace "libmediainfo.dylib" \ - "${pkgs.libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}" \ - --replace "libmediainfo.so.0" \ - "${pkgs.libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0" - ''; - } - ); - - pynetbox = super.pynetbox.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - pynput = super.pynput.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) - ++ [ self.sphinx ]; - - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) - ++ [ self.setuptools-lint ]; - }); - - pymssql = super.pymssql.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) - ++ [ pkgs.openssl pkgs.libkrb5 ]; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) - ++ [ pkgs.freetds ]; - }); - - pyopencl = super.pyopencl.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.numpy ]; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.ocl-icd pkgs.opencl-headers ]; - } - ); - - pyopenssl = super.pyopenssl.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ]; - } - ); - - pyproj = super.pyproj.overridePythonAttrs ( - old: { - PROJ_DIR = "${pkgs.proj}"; - PROJ_LIBDIR = "${pkgs.proj}/lib"; - PROJ_INCDIR = "${pkgs.proj.dev}/include"; - } - ); - - pyrealsense2 = super.pyrealsense2.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libusb1.out ]; - }); - - pyrfr = super.pyrfr.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.swig ]; - }); - - pyscard = super.pyscard.overridePythonAttrs (old: - # see https://github.com/NixOS/nixpkgs/blob/93568862a610dc1469dc40b15c1096a9357698ac/pkgs/development/python-modules/pyscard/default.nix - let - inherit (pkgs) PCSC pcsclite; - withApplePCSC = stdenv.isDarwin; - in - { - postPatch = - if withApplePCSC then '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ - "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" - '' else '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "libpcsclite.so.1" \ - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" - ''; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ ( - if withApplePCSC then [ PCSC ] else [ pcsclite ] - ); - NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC) - "-I ${lib.getDev pcsclite}/include/PCSC"; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.swig - ]; - } - ); - - pytaglib = super.pytaglib.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.taglib ]; - }); - - pytezos = super.pytezos.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libsodium ]; - }); - - python-bugzilla = super.python-bugzilla.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.docutils - ]; - } - ); - - python-ldap = super.python-ldap.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openldap pkgs.cyrus_sasl ]; - } - ); - - python-snap7 = super.python-snap7.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - pkgs.snap7 - ]; - - postPatch = (old.postPatch or "") + '' - echo "Patching find_library call." - substituteInPlace snap7/common.py \ - --replace "find_library('snap7')" "\"${pkgs.snap7}/lib/libsnap7.so\"" - ''; - }); - - - pytoml = super.pytoml.overridePythonAttrs ( - old: { - doCheck = false; - } - ); - - pytorch-lightning = super.pytorch-lightning.override { - unpackPhase = '' - # $src remains a gzipped tarball otherwise. - mkdir -p tmp - tar xvf $src --directory=tmp - mv tmp/pytorch-lightning*/* . - rm -rf tmp - ''; - }; - - pyqt5 = - let - qt5 = selectQt5 super.pyqt5.version; - in - super.pyqt5.overridePythonAttrs ( - old: { - postPatch = '' - # Confirm license - sed -i s/"if tool == 'pep517':"/"if True:"/ project.py - ''; - - dontConfigure = true; - dontWrapQtApps = true; - nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ - self.pyqt-builder - self.sip - qt5.full - ]; - } - ); - - pyqt5-qt5 = - let - qt5 = selectQt5 super.pyqt5-qt5.version; - in - super.pyqt5-qt5.overridePythonAttrs ( - old: { - dontWrapQtApps = true; - propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ - qt5.full - qt5.qtgamepad # As of 2022-05-13 not a port of qt5.full - pkgs.gtk3 - pkgs.speechd - pkgs.postgresql - pkgs.unixODBC - ]; - } - ); - - pytest-datadir = super.pytest-datadir.overridePythonAttrs ( - old: { - postInstall = '' - rm -f $out/LICENSE - ''; - } - ); - - pytest = super.pytest.overridePythonAttrs ( - old: { - # Fixes https://github.com/pytest-dev/pytest/issues/7891 - postPatch = old.postPatch or "" + '' - # sometimes setup.cfg doesn't exist - if [ -f setup.cfg ]; then - sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg - fi - ''; - } - ); - - pytest-django = super.pytest-django.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.py --replace "'pytest>=3.6'," "" - substituteInPlace setup.py --replace "'pytest>=3.6'" "" - ''; - } - ); - - pytest-randomly = super.pytest-randomly.overrideAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.importlib-metadata - ]; - }); - - pytest-runner = super.pytest-runner or super.pytestrunner; - - pytest-pylint = super.pytest-pylint.overridePythonAttrs ( - old: { - buildInputs = [ self.pytest-runner ]; - } - ); - - # pytest-splinter seems to put a .marker file in an empty directory - # presumably so it's tracked by and can be installed with MANIFEST.in, see - # https://github.com/pytest-dev/pytest-splinter/commit/a48eeef662f66ff9d3772af618748e73211a186b - # - # This directory then gets used as an empty initial profile directory and is - # zipped up. But if the .marker file is in the Nix store, it has the - # creation date of 1970, and Zip doesn't work with such old files, so it - # fails at runtime! - # - # We fix this here by just removing the file after the installation - # - # The error you get without this is: - # - # E ValueError: ZIP does not support timestamps before 1980 - # /nix/store/55b9ip7xkpimaccw9pa0vacy5q94f5xa-python3-3.7.6/lib/python3.7/zipfile.py:357: ValueError - pytest-splinter = super.pytest-splinter.overrideAttrs (old: { - postInstall = old.postInstall or "" + '' - rm $out/${super.python.sitePackages}/pytest_splinter/profiles/firefox/.marker - ''; - }); - - python-jose = super.python-jose.overridePythonAttrs ( - old: { - buildInputs = [ self.pytest-runner ]; - } - ); - - python-magic = super.python-magic.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace magic/loader.py \ - --replace "'libmagic.so.1'" "'${lib.getLib pkgs.file}/lib/libmagic.so.1'" - ''; - pythonImportsCheck = old.pythonImportsCheck or [ ] ++ [ "magic" ]; - } - ); - - python-olm = super.python-olm.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs or [ ] ++ [ pkgs.olm ]; - } - ); - - python-pam = super.python-pam.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace src/pam/__internals.py \ - --replace 'find_library("pam")' '"${pkgs.pam}/lib/libpam.so"' \ - --replace 'find_library("pam_misc")' '"${pkgs.pam}/lib/libpam_misc.so"' - ''; - } - ); - - python-snappy = super.python-snappy.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.snappy ]; - } - ); - - python-twitter = super.python-twitter.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - }); - - pythran = super.pythran.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - }); - - ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - python-prctl = super.python-prctl.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.libcap - ]; - } - ); - - pyudev = super.pyudev.overridePythonAttrs (old: { - postPatch = '' - substituteInPlace src/pyudev/_ctypeslib/utils.py \ - --replace "find_library(name)" "'${lib.getLib pkgs.systemd}/lib/libudev.so'" - ''; - }); - - pyusb = super.pyusb.overridePythonAttrs ( - old: { - postPatch = '' - libusb=${pkgs.libusb1.out}/lib/libusb-1.0${pkgs.stdenv.hostPlatform.extensions.sharedLibrary} - test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } - sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py - ''; - } - ); - - pywavelets = super.pywavelets.overridePythonAttrs ( - old: { - HDF5_DIR = "${pkgs.hdf5}"; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.hdf5 ]; - } - ); - - pyzmq = super.pyzmq.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.zeromq ]; - } - ); - - recommonmark = super.rich.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.commonmark ]; - } - ); - - rich = super.rich.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.commonmark ]; - } - ); - - rockset = super.rockset.overridePythonAttrs ( - old: { - postPatch = '' - cp ./setup_rockset.py ./setup.py - ''; - } - ); - - scaleapi = super.scaleapi.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true - ''; - } - ); - - panel = super.panel.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.nodejs ]; - } - ); - - # Pybind11 is an undeclared dependency of scipy that we need to pick from nixpkgs - # Make it not fail with infinite recursion - pybind11 = super.pybind11.overridePythonAttrs ( - old: { - cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - "-DPYBIND11_TEST=off" - ]; - doCheck = false; # Circular test dependency - - # Link include and share so it can be used by packages that use pybind11 through cmake - postInstall = '' - ln -s $out/${self.python.sitePackages}/pybind11/{include,share} $out/ - ''; - } - ); - - rasterio = super.rasterio.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gdal ]; - }); - - rfc3986-validator = super.rfc3986-validator.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.pytest-runner - ]; - }); - - rlp = super.rlp.overridePythonAttrs { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - }; - - rmfuse = super.rmfuse.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; - }); - - rtree = super.rtree.overridePythonAttrs (old: { - propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) ++ [ pkgs.libspatialindex ]; - postPatch = '' - substituteInPlace rtree/finder.py --replace \ - "find_library('spatialindex_c')" \ - "'${pkgs.libspatialindex}/lib/libspatialindex_c${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - }); - - ruamel-yaml = super.ruamel-yaml.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) - ++ [ self.ruamel-yaml-clib ]; - } - ); - - scipy = super.scipy.overridePythonAttrs ( - old: - if old.format != "wheel" then { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ - [ pkgs.gfortran ] ++ - lib.optionals (lib.versionAtLeast super.scipy.version "1.7.0") [ self.pythran ] ++ - lib.optionals (lib.versionAtLeast super.scipy.version "1.9.0") [ self.meson-python pkg-config ]; - dontUseMesonConfigure = true; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pybind11 ]; - setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - enableParallelBuilding = true; - buildInputs = (old.buildInputs or [ ]) ++ [ self.numpy.blas ]; - preConfigure = '' - sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - ''; - preBuild = lib.optional (lib.versionOlder super.scipy.version "1.9.0") '' - ln -s ${self.numpy.cfg} site.cfg - ''; - } else old - ); - - scikit-image = super.scikit-image.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.pythran - self.packaging - self.wheel - self.numpy - ]; - } - ); - - scikit-learn = super.scikit-learn.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.gfortran - ] ++ lib.optionals stdenv.cc.isClang [ - pkgs.llvmPackages.openmp - ] ++ lib.optionals stdenv.isLinux [ - pkgs.glibcLocales - ]; - - enableParallelBuilding = true; - } - ); - - secp256k1 = super.secp256k1.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig pkgs.autoconf pkgs.automake pkgs.libtool ]; - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - doCheck = false; - # Local setuptools versions like "x.y.post0" confuse an internal check - postPatch = '' - substituteInPlace setup.py \ - --replace 'setuptools_version.' '"${self.setuptools.version}".' \ - --replace 'pytest-runner==' 'pytest-runner>=' - ''; - }); - - selenium = - let - v4orLater = lib.versionAtLeast super.selenium.version "4"; - selenium = super.selenium.override { - # Selenium >=4 is built with Bazel - preferWheel = v4orLater; - }; - in - selenium.overridePythonAttrs (old: { - # Selenium <4 can be installed from sources, with setuptools - buildInputs = old.buildInputs ++ (lib.optionals (!v4orLater) [ self.setuptools ]); - }); - - shapely = super.shapely.overridePythonAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.geos ]; - - GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - - GEOS_LIBC = lib.optionalString (!stdenv.isDarwin) "${lib.getLib stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; - - # Fix library paths - postPatch = lib.optionalString (!(old.src.isWheel or false)) (old.postPatch or "" + '' - ${pkgs.python3.interpreter} ${./shapely-rewrite.py} shapely/geos.py - ''); - } - ); - - shellcheck-py = super.shellcheck-py.overridePythonAttrs (old: { - - # Make fetching/installing external binaries no-ops - preConfigure = - let - fakeCommand = "type('FakeCommand', (Command,), {'initialize_options': lambda self: None, 'finalize_options': lambda self: None, 'run': lambda self: None})"; - in - '' - substituteInPlace setup.py \ - --replace "'fetch_binaries': fetch_binaries," "'fetch_binaries': ${fakeCommand}," \ - --replace "'install_shellcheck': install_shellcheck," "'install_shellcheck': ${fakeCommand}," - ''; - - propagatedUserEnvPkgs = (old.propagatedUserEnvPkgs or [ ]) ++ [ - pkgs.shellcheck - ]; - - }); - - soundfile = super.soundfile.overridePythonAttrs (old: { - postPatch = '' - substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${pkgs.libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - }); - - suds = super.suds.overridePythonAttrs (old: { - # Fix naming convention shenanigans. - # https://github.com/suds-community/suds/blob/a616d96b070ca119a532ff395d4a2a2ba42b257c/setup.py#L648 - SUDS_PACKAGE = "suds"; - }); - - systemd-python = super.systemd-python.overridePythonAttrs (old: { - buildInputs = old.buildInputs ++ [ pkgs.systemd ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; - }); - - tables = super.tables.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pywavelets ]; - HDF5_DIR = lib.getDev pkgs.hdf5; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - propagatedBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.hdf5 self.numpy self.numexpr ]; - } - ); - - tempora = super.tempora.overridePythonAttrs ( - old: { - # required for the extra "toml" dependency in setuptools_scm[toml] - buildInputs = (old.buildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - tensorboard = super.tensorboard.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.wheel - self.absl-py - ]; - HDF5_DIR = "${pkgs.hdf5}"; - propagatedBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.hdf5 - self.google-auth-oauthlib - self.tensorboard-plugin-wit - self.numpy - self.markdown - self.tensorboard-data-server - self.grpcio - self.protobuf - self.werkzeug - self.absl-py - ]; - } - ); - - tensorflow = super.tensorflow.overridePythonAttrs ( - old: { - postInstall = '' - rm $out/bin/tensorboard - ''; - } - ); - - tensorflow-macos = super.tensorflow-macos.overridePythonAttrs ( - old: { - postInstall = self.tensorflow.postInstall; - } - ); - - tensorpack = super.tensorpack.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.cfg --replace "# will call find_packages()" "" - ''; - } - ); - - tinycss2 = super.tinycss2.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - # The tokenizers build requires a complex rust setup (cf. nixpkgs override) - # - # Instead of providing a full source build, we use a wheel to keep - # the complexity manageable for now. - tokenizers = super.tokenizers.override { - preferWheel = true; - }; - - torch = super.torch.overridePythonAttrs (old: { - # torch has an auto-magical way to locate the cuda libraries from site-packages. - autoPatchelfIgnoreMissingDeps = true; - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.numpy - ]; - }); - - torchvision = super.torchvision.overridePythonAttrs (old: { - autoPatchelfIgnoreMissingDeps = true; - - # (no patchelf on darwin, since no elves there.) - preFixup = lib.optionals (!stdenv.isDarwin) '' - addAutoPatchelfSearchPath "${self.torch}/${self.python.sitePackages}/torch/lib" - ''; - - buildInputs = (old.buildInputs or [ ]) ++ [ - self.torch - ]; - }); - - # Circular dependency between triton and torch (see https://github.com/openai/triton/issues/1374) - # You can remove this once triton publishes a new stable build and torch takes it. - triton = super.triton.overridePythonAttrs (old: { - propagatedBuildInputs = builtins.filter (e: e.pname != "torch") old.propagatedBuildInputs; - pipInstallFlags = [ "--no-deps" ]; - }); - - typed_ast = super.typed-ast.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.pytest-runner - ]; - }); - - urwidtrees = super.urwidtrees.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.urwid - ]; - } - ); - - vose-alias-method = super.vose-alias-method.overridePythonAttrs ( - old: { - postInstall = '' - rm -f $out/LICENSE - ''; - } - ); - - vispy = super.vispy.overrideAttrs ( - old: { - inherit (pkgs.python3.pkgs.vispy) patches; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - self.setuptools-scm-git-archive - ]; - } - ); - - uvloop = super.uvloop.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.ApplicationServices - pkgs.darwin.apple_sdk.frameworks.CoreServices - ]; - } - ); - - - # Stop infinite recursion by using bootstrapped pkg from nixpkgs - bootstrapped-pip = super.bootstrapped-pip.override { - wheel = ((if self.python.isPy2 then pkgs.python2 else pkgs.python3).pkgs.override { - python = self.python; - }).wheel; - }; - - watchfiles = - let - # Watchfiles does not include Cargo.lock in tarball released on PyPi for versions up to 0.17.0 - getRepoHash = version: { - "0.19.0" = "sha256-NmmeoaIfFMNKCcjH6tPnkpflkN35bKlT76MqF9W8LBc="; - "0.18.1" = "sha256-XEhu6M1hFi3/gAKZcei7KJSrIhhlZhlvZvbfyA6VLR4="; - "0.18.0" = "sha256-biGGn0YAUbSO1hCJ4kU0ZWlqlXl/HRrBS3iIA3myRI8="; - "0.17.0" = "1swpf265h9qq30cx55iy6jjirba3wml16wzb68k527ynrxr7hvqx"; - "0.16.1" = "1ss6gzcr6js2d2sddgz1p52gyiwpqmgrxm8r6wim7gnm4wvhav8a"; - "0.15.0" = "14k3avrj7v794kk4mk2xggn40a4s0zg8iq8wmyyyrf7va6hz29hf"; - "0.14.1" = "1pgfbhxrvr3dw46x9piqj3ydxgn4lkrfp931q0cajinrpv4acfay"; - "0.14" = "0lml67ilyly0i632pffdy1gd07404vx90xnkw8q6wf6xp5afmkka"; - "0.13" = "0rkz8yr01mmxm2lcmbnr9i5c7n371mksij7v3ws0aqlrh3kgww02"; - "0.12" = "16788a0d8n1bb705f0k3dvav2fmbbl6pcikwpgarl1l3fcfff8kl"; - "0.11" = "0vx56h9wfxj7x3aq7jign4rnlfm7x9nhjwmsv8p22acbzbs10dgv"; - "0.10" = "0ypdy9sq4211djqh4ni5ap9l7whq9hw0vhsxjfl3a0a4czlldxqp"; - }.${version}; - sha256 = getRepoHash super.watchfiles.version; - in - super.watchfiles.overridePythonAttrs (old: rec { - src = pkgs.fetchFromGitHub { - owner = "samuelcolvin"; - repo = "watchfiles"; - rev = "v${old.version}"; - inherit sha256; - }; - patchPhase = builtins.concatStringsSep "\n" [ - (old.patchPhase or "") - '' - substituteInPlace "Cargo.lock" --replace 'version = "0.0.0"' 'version = "${old.version}"' - substituteInPlace "Cargo.toml" --replace 'version = "0.0.0"' 'version = "${old.version}"' - '' - ]; - cargoDeps = pkgs.rustPlatform.importCargoLock { - lockFile = "${src.out}/Cargo.lock"; - }; - buildInputs = (old.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.Security - pkgs.darwin.apple_sdk.frameworks.CoreServices - pkgs.libiconv - ]; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.rustPlatform.cargoSetupHook - pkgs.rustPlatform.maturinBuildHook - ]; - }); - - weasyprint = super.weasyprint.overridePythonAttrs ( - old: { - inherit (pkgs.python3.pkgs.weasyprint) patches; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - web3 = super.web3.overridePythonAttrs { - preConfigure = '' - substituteInPlace setup.py --replace \'setuptools-markdown\' "" - ''; - }; - - weblate-language-data = super.weblate-language-data.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ - self.translate-toolkit - ]; - } - ); - - wheel = if self.python.isPy2 then - super.wheel.override { - inherit (self) bootstrapped-pip; - } - else - super.wheel; - - zipp = if super.zipp == null then null else - super.zipp.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.toml - ]; - } - ); - - psutil = super.psutil.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ - lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.IOKit; - } - ); - - sentencepiece = super.sentencepiece.overridePythonAttrs ( - old: { - dontUseCmakeConfigure = true; - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkg-config - pkgs.cmake - pkgs.gperftools - ]; - buildInputs = (old.buildInputs or [ ]) ++ [ - pkgs.sentencepiece - ]; - } - ); - - sentence-transformers = super.sentence-transformers.overridePythonAttrs ( - old: { - buildInputs = - (old.buildInputs or [ ]) - ++ [ self.typing-extensions ]; - } - ); - - supervisor = super.supervisor.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ - self.meld3 - self.setuptools - ]; - } - ); - - cytoolz = super.cytoolz.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.toolz ]; - } - ); - - # For some reason the toml dependency of tqdm declared here: - # https://github.com/tqdm/tqdm/blob/67130a23646ae672836b971e1086b6ae4c77d930/pyproject.toml#L2 - # is not translated correctly to a nix dependency. - tqdm = super.tqdm.overridePythonAttrs ( - old: { - buildInputs = [ super.toml ] ++ (old.buildInputs or [ ]); - } - ); - - watchdog = super.watchdog.overrideAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) - ++ lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreServices; - } - ); - - # pyee cannot find `vcversioner` and other "setup requirements", so it tries to - # download them from the internet, which only works when nix sandboxing is disabled. - # Additionally, since pyee uses vcversioner to specify its version, we need to do this - # manually specify its version. - pyee = super.pyee.overrideAttrs ( - old: { - postPatch = old.postPatch or "" + '' - sed -i setup.py \ - -e '/setup_requires/,/],/d' \ - -e 's/vcversioner={},/version="${old.version}",/' - ''; - } - ); - - minimal-snowplow-tracker = super.minimal-snowplow-tracker.overridePythonAttrs - ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ super.setuptools ]; - } - ); - - # nixpkgs has setuptools_scm 4.1.2 - # but newrelic has a seemingly unnecessary version constraint for <4 - # So we patch that out - newrelic = super.newrelic.overridePythonAttrs ( - old: { - postPatch = old.postPatch or "" + '' - substituteInPlace setup.py --replace '"setuptools_scm>=3.2,<4"' '"setuptools_scm"' - ''; - } - ); - - wxpython = super.wxpython.overridePythonAttrs (old: - let - localPython = self.python.withPackages (ps: with ps; [ - setuptools - numpy - six - ]); - in - { - DOXYGEN = "${pkgs.doxygen}/bin/doxygen"; - - nativeBuildInputs = with pkgs; [ - which - doxygen - gtk3 - pkg-config - autoPatchelfHook - ] ++ (old.nativeBuildInputs or [ ]); - - buildInputs = with pkgs; [ - gtk3 - webkitgtk - ncurses - SDL2 - xorg.libXinerama - xorg.libSM - xorg.libXxf86vm - xorg.libXtst - xorg.xorgproto - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - libGLU - libGL - libglvnd - mesa - ] ++ old.buildInputs; - - buildPhase = '' - ${localPython.interpreter} build.py -v build_wx - ${localPython.interpreter} build.py -v dox etg --nodoc sip - ${localPython.interpreter} build.py -v build_py - ''; - - installPhase = '' - ${localPython.interpreter} setup.py install --skip-build --prefix=$out - ''; - }); - - marisa-trie = super.marisa-trie.overridePythonAttrs ( - old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; - } - ); - - ua-parser = super.ua-parser.overridePythonAttrs ( - old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.pyyaml ]; - } - ); - - pygraphviz = super.pygraphviz.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.graphviz ]; - }); - - pysqlite = super.pysqlite.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.sqlite ]; - patchPhase = '' - substituteInPlace "setup.cfg" \ - --replace "/usr/local/include" "${pkgs.sqlite.dev}/include" \ - --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib" - ${lib.optionalString (!stdenv.isDarwin) ''export LDSHARED="$CC -pthread -shared"''} - ''; - }); - - selinux = super.selinux.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ]; - }); - - setuptools-scm = super.setuptools-scm.overridePythonAttrs (old: { - setupHook = pkgs.writeText "setuptools-scm-setup-hook.sh" '' - poetry2nix-setuptools-scm-hook() { - if [ -z "''${dontPretendSetuptoolsSCMVersion-}" ]; then - export SETUPTOOLS_SCM_PRETEND_VERSION="$version" - fi - } - - preBuildHooks+=(poetry2nix-setuptools-scm-hook) - ''; - }); - - uwsgi = super.uwsgi.overridePythonAttrs - (old: - { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.ncurses ]; - } // lib.optionalAttrs (lib.versionAtLeast old.version "2.0.19" && lib.versionOlder old.version "2.0.20") { - sourceRoot = "."; - }); - - wcwidth = super.wcwidth.overridePythonAttrs (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]); - }); - - wtforms = super.wtforms.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.Babel ]; - }); - - nbconvert = - let - patchExporters = lib.optionalString (lib.versionAtLeast self.nbconvert.version "6.5.0") '' - substituteInPlace \ - ./nbconvert/exporters/templateexporter.py \ - --replace \ - 'root_dirs.extend(jupyter_path())' \ - 'root_dirs.extend(jupyter_path() + [os.path.join("@out@", "share", "jupyter")])' \ - --subst-var out - ''; - in - super.nbconvert.overridePythonAttrs (old: { - postPatch = lib.optionalString (!(old.src.isWheel or false)) ( - patchExporters + lib.optionalString (lib.versionAtLeast self.nbconvert.version "7.0") '' - substituteInPlace \ - ./hatch_build.py \ - --replace \ - 'if self.target_name not in ["wheel", "sdist"]:' \ - 'if True:' - '' - ); - postInstall = lib.optionalString (old.src.isWheel or false) '' - pushd $out/${self.python.sitePackages} - ${patchExporters} - popd - ''; - }); - - meson-python = super.meson-python.overridePythonAttrs (old: { - dontUseMesonConfigure = true; - }); - - mkdocs = super.mkdocs.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [ self.babel ]; - }); - - # patch mkdocstrings to fix jinja2 imports - mkdocstrings = - let - patchJinja2Imports = self.pkgs.fetchpatch { - name = "fix-jinja2-imports.patch"; - url = "https://github.com/mkdocstrings/mkdocstrings/commit/b37722716b1e0ed6393ec71308dfb0f85e142f3b.patch"; - hash = "sha256-DD1SjEvs5HBlSRLrqP3jhF/yoeWkF7F3VXCD1gyt5Fc="; - }; - in - super.mkdocstrings.overridePythonAttrs ( - old: lib.optionalAttrs - (lib.versionAtLeast old.version "0.17" && lib.versionOlder old.version "0.18") - { - patches = old.patches or [ ] ++ lib.optionals (!(old.src.isWheel or false)) [ patchJinja2Imports ]; - # strip the first two levels ("a/src/") when patching since we're in site-packages - # just above mkdocstrings - postInstall = lib.optionalString (old.src.isWheel or false) '' - pushd "$out/${self.python.sitePackages}" - patch -p2 < "${patchJinja2Imports}" - popd - ''; - } - ); - - flake8-mutable = super.flake8-mutable.overridePythonAttrs - (old: { buildInputs = old.buildInputs or [ ] ++ [ self.pytest-runner ]; }); - pydantic = super.pydantic.overridePythonAttrs - (old: { buildInputs = old.buildInputs or [ ] ++ [ pkgs.libxcrypt ]; }); - - y-py = super.y-py.override { - preferWheel = true; - }; - } - ) -] diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py deleted file mode 100644 index d3b365459bd3d..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/shapely-rewrite.py +++ /dev/null @@ -1,46 +0,0 @@ -""" -Rewrite libc/library path references to Nix store paths -Nixpkgs uses a normal patch for this but we need to be less -sensitive to changes between versions. -""" -from textwrap import dedent -import sys -import ast -import os - - -with open(sys.argv[1]) as f: - mod = ast.parse(f.read(), "geos.py") - - -class LibTransformer(ast.NodeTransformer): - _lgeos_replaced = False - - def visit_If(self, node): - if ast.unparse(node).startswith("if sys.platform.startswith('linux')"): - return ast.parse( - dedent( - """ - free = CDLL(%s).free - free.argtypes = [c_void_p] - free.restype = None - """ - ) - % (lambda x: "'" + x + "'" if x else None)(os.environ.get("GEOS_LIBC")) - ) - return node - - def visit_Assign(self, node): - _target = node.targets[0] - if ( - not self._lgeos_replaced - and isinstance(_target, ast.Name) - and _target.id == "_lgeos" - ): - self._lgeos_replaced = True - return ast.parse("_lgeos = CDLL('%s')" % os.environ["GEOS_LIBRARY_PATH"]) - return node - - -with open(sys.argv[1], "w") as f: - f.write(ast.unparse(LibTransformer().visit(mod))) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix deleted file mode 100644 index 1ef253365a9fd..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ lib, stdenv, poetryLib, python, isLinux ? stdenv.isLinux }: -let - inherit (lib.strings) escapeRegex hasPrefix hasSuffix hasInfix splitString removePrefix removeSuffix; - targetMachine = poetryLib.getTargetMachine stdenv; - - pythonVer = - let - ver = builtins.splitVersion python.version; - major = builtins.elemAt ver 0; - minor = builtins.elemAt ver 1; - tags = [ "cp" "py" ]; - in - { inherit major minor tags; }; - abiTag = "cp${pythonVer.major}${pythonVer.minor}m"; - - # - # Parses wheel file returning an attribute set - # - toWheelAttrs = str: - let - entries' = splitString "-" str; - el = builtins.length entries'; - entryAt = builtins.elemAt entries'; - - # Hack: Remove version "suffixes" like 2.11.4-1 - entries = - if el == 6 then [ - (entryAt 0) # name - (entryAt 1) # version - # build tag is skipped - (entryAt (el - 3)) # python version - (entryAt (el - 2)) # abi - (entryAt (el - 1)) # platform - ] else entries'; - p = removeSuffix ".whl" (builtins.elemAt entries 4); - in - { - pkgName = builtins.elemAt entries 0; - pkgVer = builtins.elemAt entries 1; - pyVer = builtins.elemAt entries 2; - abi = builtins.elemAt entries 3; - platform = p; - }; - - # - # Builds list of acceptable osx wheel files - # - # <versions> accepted versions in descending order of preference - # <candidates> list of wheel files to select from - findBestMatches = versions: candidates: - let - v = lib.lists.head versions; - vs = lib.lists.tail versions; - in - if (builtins.length versions == 0) - then [ ] - else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates); - - # x = "cpXX" | "py2" | "py3" | "py2.py3" - isPyVersionCompatible = pyver@{ major, minor, tags }: x: - let - isCompat = m: - builtins.elem m.tag tags - && m.major == major - && builtins.compareVersions minor m.minor >= 0; - parseMarker = v: - let - tag = builtins.substring 0 2 v; - major = builtins.substring 2 1 v; - end = builtins.substring 3 3 v; - minor = if builtins.stringLength end > 0 then end else "0"; - in - { inherit major minor tag; }; - markers = splitString "." x; - in - lib.lists.any isCompat (map parseMarker markers); - - # - # Selects the best matching wheel file from a list of files - # - selectWheel = files: - let - filesWithoutSources = (builtins.filter (x: hasSuffix ".whl" x.file) files); - isPyAbiCompatible = pyabi: x: x == "none" || hasPrefix pyabi x || hasPrefix x pyabi || ( - # The CPython stable ABI is abi3 as in the shared library suffix. - python.passthru.implementation == "cpython" && - builtins.elemAt (lib.splitString "." python.version) 0 == "3" && - x == "abi3" - ); - withPython = ver: abi: x: (isPyVersionCompatible ver x.pyVer) && (isPyAbiCompatible abi x.abi); - withPlatform = - if isLinux - then - if targetMachine != null - then - # See PEP 600 for details. - (p: - builtins.match "any|manylinux(1|2010|2014)_${escapeRegex targetMachine}|manylinux_[0-9]+_[0-9]+_${escapeRegex targetMachine}" p != null - ) - else - (p: p == "any") - else - if stdenv.isDarwin - then - if stdenv.targetPlatform.isAarch64 - then (p: p == "any" || (hasInfix "macosx" p && lib.lists.any (e: hasSuffix e p) [ "arm64" "aarch64" ])) - else (p: p == "any" || (hasInfix "macosx" p && hasSuffix "x86_64" p)) - else (p: p == "any"); - withPlatforms = x: lib.lists.any withPlatform (splitString "." x.platform); - filterWheel = x: - let - f = toWheelAttrs x.file; - in - (withPython pythonVer abiTag f) && (withPlatforms f); - filtered = builtins.filter filterWheel filesWithoutSources; - choose = files: - let - osxMatches = [ "12_0" "11_0" "10_15" "10_14" "10_12" "10_11" "10_10" "10_9" "10_8" "10_7" "any" ]; - linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "manylinux_" "any" ]; - chooseLinux = x: lib.take 1 (findBestMatches linuxMatches x); - chooseOSX = x: lib.take 1 (findBestMatches osxMatches x); - in - if isLinux - then chooseLinux files - else chooseOSX files; - in - if (builtins.length filtered == 0) - then [ ] - else choose (filtered); -in -{ - inherit selectWheel toWheelAttrs isPyVersionCompatible; -} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix deleted file mode 100644 index c9cef28fe85ef..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ /dev/null @@ -1,258 +0,0 @@ -{ lib, stdenv, poetryLib }: python: -let - inherit (poetryLib) ireplace; - - targetMachine = poetryLib.getTargetMachine stdenv; - - # Like builtins.substring but with stop being offset instead of length - substr = start: stop: s: builtins.substring start (stop - start) s; - - # Strip leading/trailing whitespace from string - stripStr = s: lib.elemAt (builtins.split "^ *" (lib.elemAt (builtins.split " *$" s) 0)) 2; - findSubExpressionsFun = acc: c: ( - if c == "(" then - ( - let - posNew = acc.pos + 1; - isOpen = acc.openP == 0; - startPos = if isOpen then posNew else acc.startPos; - in - acc // { - inherit startPos; - exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ]; - pos = posNew; - openP = acc.openP + 1; - } - ) else if c == ")" then - ( - let - openP = acc.openP - 1; - exprs = findSubExpressions (substr acc.startPos acc.pos acc.expr); - in - acc // { - inherit openP; - pos = acc.pos + 1; - exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs; - exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos; - } - ) else acc // { pos = acc.pos + 1; } - ); - - # Make a tree out of expression groups (parens) - findSubExpressions = expr': - let - expr = " " + expr'; - acc = builtins.foldl' - findSubExpressionsFun - { - exprs = [ ]; - expr = expr; - pos = 0; - openP = 0; - exprPos = 0; - startPos = 0; - } - (lib.stringToCharacters expr); - tailExpr = (substr acc.exprPos acc.pos expr); - tailExprs = if tailExpr != "" then [ tailExpr ] else [ ]; - in - acc.exprs ++ tailExprs; - parseExpressions = exprs: - let - splitCond = ( - s: builtins.map - (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) - (builtins.split " (and|or) " (s + " ")) - ); - mapfn = expr: ( - if (builtins.match "^ ?$" expr != null) then null # Filter empty - else if (builtins.elem expr [ "and" "or" ]) then { - type = "bool"; - value = expr; - } - else { - type = "expr"; - value = expr; - } - ); - parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr)); - in - builtins.foldl' - ( - acc: v: acc ++ (if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ]) - ) [ ] - exprs; - - # Transform individual expressions to structured expressions - # This function also performs variable substitution, replacing environment markers with their explicit values - transformExpressions = exprs: - let - variables = { - os_name = ( - if python.pname == "jython" then "java" - else "posix" - ); - sys_platform = ( - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "darwin" - else throw "Unsupported platform" - ); - platform_machine = targetMachine; - platform_python_implementation = - let - impl = python.passthru.implementation; - in - ( - if impl == "cpython" then "CPython" - else if impl == "pypy" then "PyPy" - else throw "Unsupported implementation ${impl}" - ); - platform_release = ""; # Field not reproducible - platform_system = ( - if stdenv.isLinux then "Linux" - else if stdenv.isDarwin then "Darwin" - else throw "Unsupported platform" - ); - platform_version = ""; # Field not reproducible - python_version = python.passthru.pythonVersion; - python_full_version = python.version; - implementation_name = python.implementation; - implementation_version = python.version; - # extra = ""; - }; - substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value; - processVar = value: builtins.foldl' (acc: v: v acc) value [ - stripStr - substituteVar - ]; - in - if builtins.typeOf exprs == "set" then - ( - if exprs.type == "expr" then - ( - let - mVal = ''[a-zA-Z0-9\'"_\. \-]+''; - mOp = "in|[!=<>]+"; - e = stripStr exprs.value; - m' = builtins.match ''^(${mVal}) +(${mOp}) *(${mVal})$'' e; - m = builtins.map stripStr (if m' != null then m' else builtins.match ''^(${mVal}) +(${mOp}) *(${mVal})$'' e); - m0 = processVar (builtins.elemAt m 0); - m2 = processVar (builtins.elemAt m 2); - in - { - type = "expr"; - value = { - # HACK: We don't know extra at eval time, so we assume the expression is always true - op = if m0 == "extra" then "true" else builtins.elemAt m 1; - values = [ m0 m2 ]; - }; - } - ) else exprs - ) else builtins.map transformExpressions exprs; - - # Recursively eval all expressions - evalExpressions = exprs: - let - unmarshal = v: ( - # TODO: Handle single quoted values - if v == "True" then true - else if v == "False" then false - else builtins.fromJSON v - ); - hasElem = needle: haystack: builtins.elem needle (builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " haystack)); - op = { - "true" = x: y: true; - "<=" = x: y: op.">=" y x; - "<" = x: y: lib.versionOlder (unmarshal x) (unmarshal y); - "!=" = x: y: x != y; - "==" = x: y: x == y; - ">=" = x: y: lib.versionAtLeast (unmarshal x) (unmarshal y); - ">" = x: y: op."<" y x; - "~=" = v: c: - let - parts = builtins.splitVersion c; - pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); - upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); - in - op.">=" v c && op."<" v upperConstraint; - "===" = x: y: x == y; - "in" = x: y: - let - values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y)); - in - builtins.elem (unmarshal x) values; - }; - in - if builtins.typeOf exprs == "set" then - ( - if exprs.type == "expr" then - ( - let - expr = exprs; - result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); - in - { - type = "value"; - value = result; - } - ) else exprs - ) else builtins.map evalExpressions exprs; - - # Now that we have performed an eval all that's left to do is to concat the graph into a single bool - reduceExpressions = exprs: - let - cond = { - "and" = x: y: x && y; - "or" = x: y: x || y; - }; - reduceExpressionsFun = acc: v: ( - if builtins.typeOf v == "set" then - ( - if v.type == "value" then - ( - acc // { - value = cond."${acc.cond}" acc.value v.value; - } - ) else if v.type == "bool" then - ( - acc // { - cond = v.value; - } - ) else throw "Unsupported type" - ) else if builtins.typeOf v == "list" then - ( - let - ret = builtins.foldl' - reduceExpressionsFun - { - value = true; - cond = "and"; - } - v; - in - acc // { - value = cond."${acc.cond}" acc.value ret.value; - } - ) else throw "Unsupported type" - ); - in - ( - builtins.foldl' - reduceExpressionsFun - { - value = true; - cond = "and"; - } - exprs - ).value; -in -e: builtins.foldl' (acc: v: v acc) e [ - findSubExpressions - parseExpressions - transformExpressions - evalExpressions - reduceExpressions -] diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix deleted file mode 100644 index b0423a98f9ecb..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, poetry2nix -, python -, fetchFromGitHub -, projectDir ? ./. -, pyproject ? projectDir + "/pyproject.toml" -, poetrylock ? projectDir + "/poetry.lock" -}: - - -poetry2nix.mkPoetryApplication { - - inherit python; - - inherit projectDir pyproject poetrylock; - - src = fetchFromGitHub (lib.importJSON ./src.json); - - # "Vendor" dependencies (for build-system support) - postPatch = '' - # Figure out the location of poetry.core - # As poetry.core is using the same root import name as the poetry package and the python module system wont look for the root - # in the separate second location we need to link poetry.core to poetry - POETRY_CORE=$(python -c 'import poetry.core; import os.path; print(os.path.dirname(poetry.core.__file__))') - - echo "import sys" >> src/poetry/__init__.py - for path in $propagatedBuildInputs; do - echo "sys.path.insert(0, \"$path\")" >> src/poetry/__init__.py - done - ''; - - postInstall = '' - ln -s $POETRY_CORE $out/${python.sitePackages}/poetry/core - - mkdir -p "$out/share/bash-completion/completions" - "$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry" - mkdir -p "$out/share/zsh/site-functions" - "$out/bin/poetry" completions zsh > "$out/share/zsh/site-functions/_poetry" - mkdir -p "$out/share/fish/vendor_completions.d" - "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" - ''; - - # Propagating dependencies leads to issues downstream - # We've already patched poetry to prefer "vendored" dependencies - postFixup = '' - rm $out/nix-support/propagated-build-inputs - ''; - - # Fails because of impurities (network, git etc etc) - doCheck = false; - - overrides = [ - poetry2nix.defaultPoetryOverrides - (self: super: { - cryptography = super.cryptography.overridePythonAttrs (old: { - meta = old.meta // { - knownVulnerabilities = old.meta.knownVulnerabilities or [ ] - ++ lib.optionals (lib.versionOlder old.version "41.0.0") [ - "CVE-2023-2650" - "CVE-2023-2975" - "CVE-2023-3446" - "CVE-2023-3817" - "CVE-2023-38325" - ]; - }; - }); - requests = super.requests.overridePythonAttrs (old: { - meta = old.meta // { - knownVulnerabilities = old.meta.knownVulnerabilities or [ ] - ++ lib.optionals (lib.versionOlder old.version "2.31.0") [ - "CVE-2023-32681" - ]; - }; - }); - }) - ]; - - meta = with lib; { - inherit (python.meta) platforms; - maintainers = with maintainers; [ adisbladis jakewaksbaum ]; - }; -} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock deleted file mode 100644 index 4920580e54fe4..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock +++ /dev/null @@ -1,1906 +0,0 @@ -# This file is automatically @generated by Poetry and should not be changed by hand. - -[[package]] -name = "attrs" -version = "23.1.0" -description = "Classes Without Boilerplate" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"}, - {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"}, -] - -[package.dependencies] -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -cov = ["attrs[tests]", "coverage[toml] (>=5.3)"] -dev = ["attrs[docs,tests]", "pre-commit"] -docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"] -tests = ["attrs[tests-no-zope]", "zope-interface"] -tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] - -[[package]] -name = "backports-cached-property" -version = "1.0.2" -description = "cached_property() - computed once per instance, cached as attribute" -category = "main" -optional = false -python-versions = ">=3.6.0" -files = [ - {file = "backports.cached-property-1.0.2.tar.gz", hash = "sha256:9306f9eed6ec55fd156ace6bc1094e2c86fae5fb2bf07b6a9c00745c656e75dd"}, - {file = "backports.cached_property-1.0.2-py3-none-any.whl", hash = "sha256:baeb28e1cd619a3c9ab8941431fe34e8490861fb998c6c4590693d50171db0cc"}, -] - -[[package]] -name = "cachecontrol" -version = "0.12.11" -description = "httplib2 caching for requests" -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "CacheControl-0.12.11-py2.py3-none-any.whl", hash = "sha256:2c75d6a8938cb1933c75c50184549ad42728a27e9f6b92fd677c3151aa72555b"}, - {file = "CacheControl-0.12.11.tar.gz", hash = "sha256:a5b9fcc986b184db101aa280b42ecdcdfc524892596f606858e0b7a8b4d9e144"}, -] - -[package.dependencies] -lockfile = {version = ">=0.9", optional = true, markers = "extra == \"filecache\""} -msgpack = ">=0.5.2" -requests = "*" - -[package.extras] -filecache = ["lockfile (>=0.9)"] -redis = ["redis (>=2.10.5)"] - -[[package]] -name = "cachy" -version = "0.3.0" -description = "Cachy provides a simple yet effective caching library." -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "cachy-0.3.0-py2.py3-none-any.whl", hash = "sha256:338ca09c8860e76b275aff52374330efedc4d5a5e45dc1c5b539c1ead0786fe7"}, - {file = "cachy-0.3.0.tar.gz", hash = "sha256:186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"}, -] - -[package.extras] -memcached = ["python-memcached (>=1.59,<2.0)"] -msgpack = ["msgpack-python (>=0.5,<0.6)"] -redis = ["redis (>=3.3.6,<4.0.0)"] - -[[package]] -name = "certifi" -version = "2022.12.7" -description = "Python package for providing Mozilla's CA Bundle." -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"}, - {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"}, -] - -[[package]] -name = "cffi" -version = "1.15.1" -description = "Foreign Function Interface for Python calling C code." -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"}, - {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"}, - {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"}, - {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"}, - {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"}, - {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"}, - {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"}, - {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"}, - {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"}, - {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"}, - {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"}, - {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"}, - {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"}, - {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"}, - {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"}, - {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"}, - {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"}, - {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"}, - {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"}, -] - -[package.dependencies] -pycparser = "*" - -[[package]] -name = "cfgv" -version = "3.3.1" -description = "Validate configuration and produce human readable error messages." -category = "dev" -optional = false -python-versions = ">=3.6.1" -files = [ - {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"}, - {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"}, -] - -[[package]] -name = "charset-normalizer" -version = "3.1.0" -description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "main" -optional = false -python-versions = ">=3.7.0" -files = [ - {file = "charset-normalizer-3.1.0.tar.gz", hash = "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win32.whl", hash = "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win32.whl", hash = "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win32.whl", hash = "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win32.whl", hash = "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win32.whl", hash = "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b"}, - {file = "charset_normalizer-3.1.0-py3-none-any.whl", hash = "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d"}, -] - -[[package]] -name = "cleo" -version = "2.0.1" -description = "Cleo allows you to create beautiful and testable command-line interfaces." -category = "main" -optional = false -python-versions = ">=3.7,<4.0" -files = [ - {file = "cleo-2.0.1-py3-none-any.whl", hash = "sha256:6eb133670a3ed1f3b052d53789017b6e50fca66d1287e6e6696285f4cb8ea448"}, - {file = "cleo-2.0.1.tar.gz", hash = "sha256:eb4b2e1f3063c11085cebe489a6e9124163c226575a3c3be69b2e51af4a15ec5"}, -] - -[package.dependencies] -crashtest = ">=0.4.1,<0.5.0" -rapidfuzz = ">=2.2.0,<3.0.0" - -[[package]] -name = "colorama" -version = "0.4.6" -description = "Cross-platform colored terminal text." -category = "dev" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" -files = [ - {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, - {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, -] - -[[package]] -name = "coverage" -version = "7.2.5" -description = "Code coverage measurement for Python" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "coverage-7.2.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:883123d0bbe1c136f76b56276074b0c79b5817dd4238097ffa64ac67257f4b6c"}, - {file = "coverage-7.2.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d2fbc2a127e857d2f8898aaabcc34c37771bf78a4d5e17d3e1f5c30cd0cbc62a"}, - {file = "coverage-7.2.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f3671662dc4b422b15776cdca89c041a6349b4864a43aa2350b6b0b03bbcc7f"}, - {file = "coverage-7.2.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:780551e47d62095e088f251f5db428473c26db7829884323e56d9c0c3118791a"}, - {file = "coverage-7.2.5-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:066b44897c493e0dcbc9e6a6d9f8bbb6607ef82367cf6810d387c09f0cd4fe9a"}, - {file = "coverage-7.2.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b9a4ee55174b04f6af539218f9f8083140f61a46eabcaa4234f3c2a452c4ed11"}, - {file = "coverage-7.2.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:706ec567267c96717ab9363904d846ec009a48d5f832140b6ad08aad3791b1f5"}, - {file = "coverage-7.2.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ae453f655640157d76209f42c62c64c4d4f2c7f97256d3567e3b439bd5c9b06c"}, - {file = "coverage-7.2.5-cp310-cp310-win32.whl", hash = "sha256:f81c9b4bd8aa747d417407a7f6f0b1469a43b36a85748145e144ac4e8d303cb5"}, - {file = "coverage-7.2.5-cp310-cp310-win_amd64.whl", hash = "sha256:dc945064a8783b86fcce9a0a705abd7db2117d95e340df8a4333f00be5efb64c"}, - {file = "coverage-7.2.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:40cc0f91c6cde033da493227797be2826cbf8f388eaa36a0271a97a332bfd7ce"}, - {file = "coverage-7.2.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a66e055254a26c82aead7ff420d9fa8dc2da10c82679ea850d8feebf11074d88"}, - {file = "coverage-7.2.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c10fbc8a64aa0f3ed136b0b086b6b577bc64d67d5581acd7cc129af52654384e"}, - {file = "coverage-7.2.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9a22cbb5ede6fade0482111fa7f01115ff04039795d7092ed0db43522431b4f2"}, - {file = "coverage-7.2.5-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:292300f76440651529b8ceec283a9370532f4ecba9ad67d120617021bb5ef139"}, - {file = "coverage-7.2.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7ff8f3fb38233035028dbc93715551d81eadc110199e14bbbfa01c5c4a43f8d8"}, - {file = "coverage-7.2.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:a08c7401d0b24e8c2982f4e307124b671c6736d40d1c39e09d7a8687bddf83ed"}, - {file = "coverage-7.2.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ef9659d1cda9ce9ac9585c045aaa1e59223b143f2407db0eaee0b61a4f266fb6"}, - {file = "coverage-7.2.5-cp311-cp311-win32.whl", hash = "sha256:30dcaf05adfa69c2a7b9f7dfd9f60bc8e36b282d7ed25c308ef9e114de7fc23b"}, - {file = "coverage-7.2.5-cp311-cp311-win_amd64.whl", hash = "sha256:97072cc90f1009386c8a5b7de9d4fc1a9f91ba5ef2146c55c1f005e7b5c5e068"}, - {file = "coverage-7.2.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:bebea5f5ed41f618797ce3ffb4606c64a5de92e9c3f26d26c2e0aae292f015c1"}, - {file = "coverage-7.2.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:828189fcdda99aae0d6bf718ea766b2e715eabc1868670a0a07bf8404bf58c33"}, - {file = "coverage-7.2.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6e8a95f243d01ba572341c52f89f3acb98a3b6d1d5d830efba86033dd3687ade"}, - {file = "coverage-7.2.5-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8834e5f17d89e05697c3c043d3e58a8b19682bf365048837383abfe39adaed5"}, - {file = "coverage-7.2.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d1f25ee9de21a39b3a8516f2c5feb8de248f17da7eead089c2e04aa097936b47"}, - {file = "coverage-7.2.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1637253b11a18f453e34013c665d8bf15904c9e3c44fbda34c643fbdc9d452cd"}, - {file = "coverage-7.2.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8e575a59315a91ccd00c7757127f6b2488c2f914096077c745c2f1ba5b8c0969"}, - {file = "coverage-7.2.5-cp37-cp37m-win32.whl", hash = "sha256:509ecd8334c380000d259dc66feb191dd0a93b21f2453faa75f7f9cdcefc0718"}, - {file = "coverage-7.2.5-cp37-cp37m-win_amd64.whl", hash = "sha256:12580845917b1e59f8a1c2ffa6af6d0908cb39220f3019e36c110c943dc875b0"}, - {file = "coverage-7.2.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b5016e331b75310610c2cf955d9f58a9749943ed5f7b8cfc0bb89c6134ab0a84"}, - {file = "coverage-7.2.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:373ea34dca98f2fdb3e5cb33d83b6d801007a8074f992b80311fc589d3e6b790"}, - {file = "coverage-7.2.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a063aad9f7b4c9f9da7b2550eae0a582ffc7623dca1c925e50c3fbde7a579771"}, - {file = "coverage-7.2.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:38c0a497a000d50491055805313ed83ddba069353d102ece8aef5d11b5faf045"}, - {file = "coverage-7.2.5-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a2b3b05e22a77bb0ae1a3125126a4e08535961c946b62f30985535ed40e26614"}, - {file = "coverage-7.2.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:0342a28617e63ad15d96dca0f7ae9479a37b7d8a295f749c14f3436ea59fdcb3"}, - {file = "coverage-7.2.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:cf97ed82ca986e5c637ea286ba2793c85325b30f869bf64d3009ccc1a31ae3fd"}, - {file = "coverage-7.2.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c2c41c1b1866b670573657d584de413df701f482574bad7e28214a2362cb1fd1"}, - {file = "coverage-7.2.5-cp38-cp38-win32.whl", hash = "sha256:10b15394c13544fce02382360cab54e51a9e0fd1bd61ae9ce012c0d1e103c813"}, - {file = "coverage-7.2.5-cp38-cp38-win_amd64.whl", hash = "sha256:a0b273fe6dc655b110e8dc89b8ec7f1a778d78c9fd9b4bda7c384c8906072212"}, - {file = "coverage-7.2.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5c587f52c81211d4530fa6857884d37f514bcf9453bdeee0ff93eaaf906a5c1b"}, - {file = "coverage-7.2.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4436cc9ba5414c2c998eaedee5343f49c02ca93b21769c5fdfa4f9d799e84200"}, - {file = "coverage-7.2.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6599bf92f33ab041e36e06d25890afbdf12078aacfe1f1d08c713906e49a3fe5"}, - {file = "coverage-7.2.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:857abe2fa6a4973f8663e039ead8d22215d31db613ace76e4a98f52ec919068e"}, - {file = "coverage-7.2.5-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6f5cab2d7f0c12f8187a376cc6582c477d2df91d63f75341307fcdcb5d60303"}, - {file = "coverage-7.2.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:aa387bd7489f3e1787ff82068b295bcaafbf6f79c3dad3cbc82ef88ce3f48ad3"}, - {file = "coverage-7.2.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:156192e5fd3dbbcb11cd777cc469cf010a294f4c736a2b2c891c77618cb1379a"}, - {file = "coverage-7.2.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bd3b4b8175c1db502adf209d06136c000df4d245105c8839e9d0be71c94aefe1"}, - {file = "coverage-7.2.5-cp39-cp39-win32.whl", hash = "sha256:ddc5a54edb653e9e215f75de377354e2455376f416c4378e1d43b08ec50acc31"}, - {file = "coverage-7.2.5-cp39-cp39-win_amd64.whl", hash = "sha256:338aa9d9883aaaad53695cb14ccdeb36d4060485bb9388446330bef9c361c252"}, - {file = "coverage-7.2.5-pp37.pp38.pp39-none-any.whl", hash = "sha256:8877d9b437b35a85c18e3c6499b23674684bf690f5d96c1006a1ef61f9fdf0f3"}, - {file = "coverage-7.2.5.tar.gz", hash = "sha256:f99ef080288f09ffc687423b8d60978cf3a465d3f404a18d1a05474bd8575a47"}, -] - -[package.dependencies] -tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""} - -[package.extras] -toml = ["tomli"] - -[[package]] -name = "crashtest" -version = "0.4.1" -description = "Manage Python errors with ease" -category = "main" -optional = false -python-versions = ">=3.7,<4.0" -files = [ - {file = "crashtest-0.4.1-py3-none-any.whl", hash = "sha256:8d23eac5fa660409f57472e3851dab7ac18aba459a8d19cbbba86d3d5aecd2a5"}, - {file = "crashtest-0.4.1.tar.gz", hash = "sha256:80d7b1f316ebfbd429f648076d6275c877ba30ba48979de4191714a75266f0ce"}, -] - -[[package]] -name = "cryptography" -version = "40.0.2" -description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "cryptography-40.0.2-cp36-abi3-macosx_10_12_universal2.whl", hash = "sha256:8f79b5ff5ad9d3218afb1e7e20ea74da5f76943ee5edb7f76e56ec5161ec782b"}, - {file = "cryptography-40.0.2-cp36-abi3-macosx_10_12_x86_64.whl", hash = "sha256:05dc219433b14046c476f6f09d7636b92a1c3e5808b9a6536adf4932b3b2c440"}, - {file = "cryptography-40.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4df2af28d7bedc84fe45bd49bc35d710aede676e2a4cb7fc6d103a2adc8afe4d"}, - {file = "cryptography-40.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0dcca15d3a19a66e63662dc8d30f8036b07be851a8680eda92d079868f106288"}, - {file = "cryptography-40.0.2-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:a04386fb7bc85fab9cd51b6308633a3c271e3d0d3eae917eebab2fac6219b6d2"}, - {file = "cryptography-40.0.2-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:adc0d980fd2760c9e5de537c28935cc32b9353baaf28e0814df417619c6c8c3b"}, - {file = "cryptography-40.0.2-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:d5a1bd0e9e2031465761dfa920c16b0065ad77321d8a8c1f5ee331021fda65e9"}, - {file = "cryptography-40.0.2-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:a95f4802d49faa6a674242e25bfeea6fc2acd915b5e5e29ac90a32b1139cae1c"}, - {file = "cryptography-40.0.2-cp36-abi3-win32.whl", hash = "sha256:aecbb1592b0188e030cb01f82d12556cf72e218280f621deed7d806afd2113f9"}, - {file = "cryptography-40.0.2-cp36-abi3-win_amd64.whl", hash = "sha256:b12794f01d4cacfbd3177b9042198f3af1c856eedd0a98f10f141385c809a14b"}, - {file = "cryptography-40.0.2-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:142bae539ef28a1c76794cca7f49729e7c54423f615cfd9b0b1fa90ebe53244b"}, - {file = "cryptography-40.0.2-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:956ba8701b4ffe91ba59665ed170a2ebbdc6fc0e40de5f6059195d9f2b33ca0e"}, - {file = "cryptography-40.0.2-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4f01c9863da784558165f5d4d916093737a75203a5c5286fde60e503e4276c7a"}, - {file = "cryptography-40.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:3daf9b114213f8ba460b829a02896789751626a2a4e7a43a28ee77c04b5e4958"}, - {file = "cryptography-40.0.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:48f388d0d153350f378c7f7b41497a54ff1513c816bcbbcafe5b829e59b9ce5b"}, - {file = "cryptography-40.0.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c0764e72b36a3dc065c155e5b22f93df465da9c39af65516fe04ed3c68c92636"}, - {file = "cryptography-40.0.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:cbaba590180cba88cb99a5f76f90808a624f18b169b90a4abb40c1fd8c19420e"}, - {file = "cryptography-40.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7a38250f433cd41df7fcb763caa3ee9362777fdb4dc642b9a349721d2bf47404"}, - {file = "cryptography-40.0.2.tar.gz", hash = "sha256:c33c0d32b8594fa647d2e01dbccc303478e16fdd7cf98652d5b3ed11aa5e5c99"}, -] - -[package.dependencies] -cffi = ">=1.12" - -[package.extras] -docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"] -docstest = ["pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"] -pep8test = ["black", "check-manifest", "mypy", "ruff"] -sdist = ["setuptools-rust (>=0.11.4)"] -ssh = ["bcrypt (>=3.1.5)"] -test = ["iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-shard (>=0.1.2)", "pytest-subtests", "pytest-xdist"] -test-randomorder = ["pytest-randomly"] -tox = ["tox"] - -[[package]] -name = "deepdiff" -version = "5.8.1" -description = "Deep Difference and Search of any Python object/data." -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "deepdiff-5.8.1-py3-none-any.whl", hash = "sha256:e9aea49733f34fab9a0897038d8f26f9d94a97db1790f1b814cced89e9e0d2b7"}, - {file = "deepdiff-5.8.1.tar.gz", hash = "sha256:8d4eb2c4e6cbc80b811266419cb71dd95a157094a3947ccf937a94d44943c7b8"}, -] - -[package.dependencies] -ordered-set = ">=4.1.0,<4.2.0" - -[package.extras] -cli = ["clevercsv (==0.7.1)", "click (==8.0.3)", "pyyaml (==5.4.1)", "toml (==0.10.2)"] - -[[package]] -name = "distlib" -version = "0.3.6" -description = "Distribution utilities" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"}, - {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"}, -] - -[[package]] -name = "dulwich" -version = "0.20.50" -description = "Python Git Library" -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "dulwich-0.20.50-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:97f02f8d500d4af08dc022d697c56e8539171acc3f575c2fe9acf3b078e5c8c9"}, - {file = "dulwich-0.20.50-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7301773e5cc16d521bc6490e73772a86a4d1d0263de506f08b54678cc4e2f061"}, - {file = "dulwich-0.20.50-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b70106580ed11f45f4c32d2831d0c9c9f359bc2415fff4a6be443e3a36811398"}, - {file = "dulwich-0.20.50-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f9c4f2455f966cad94648278fa9972e4695b35d04f82792fa58e1ea15dd83f0"}, - {file = "dulwich-0.20.50-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9163fbb021a8ad9c35a0814a5eedf45a8eb3a0b764b865d7016d901fc5a947fc"}, - {file = "dulwich-0.20.50-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:322ff8ff6aa4d6d36294cd36de1c84767eb1903c7db3e7b4475ad091febf5363"}, - {file = "dulwich-0.20.50-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5d3290a45651c8e534f8e83ae2e30322aefdd162f0f338bae2e79a6ee5a87513"}, - {file = "dulwich-0.20.50-cp310-cp310-win32.whl", hash = "sha256:80ab07131a6e68594441f5c4767e9e44e87fceafc3e347e541c928a18c679bd8"}, - {file = "dulwich-0.20.50-cp310-cp310-win_amd64.whl", hash = "sha256:eefe786a6010f8546baac4912113eeed4e397ddb8c433a345b548a04d4176496"}, - {file = "dulwich-0.20.50-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:df3562dde3079d57287c233d45b790bc967c5aae975c9a7b07ca30e60e055512"}, - {file = "dulwich-0.20.50-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e1ae18d5805f0c0c5dac65795f8d48660437166b12ee2c0ffea95bfdbf9c1051"}, - {file = "dulwich-0.20.50-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d2f7df39bd1378d3b0bfb3e7fc930fd0191924af1f0ef587bcd9946afe076c06"}, - {file = "dulwich-0.20.50-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:731e7f319b34251fadeb362ada1d52cc932369d9cdfa25c0e41150cda28773d0"}, - {file = "dulwich-0.20.50-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b4d11d44176e5d2fa8271fc86ad1e0a8731b9ad8f77df64c12846b30e16135eb"}, - {file = "dulwich-0.20.50-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7aaabb8e4beadd53f75f853a981caaadef3ef130e5645c902705704eaf136daa"}, - {file = "dulwich-0.20.50-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c3dc9f97ec8d3db08d9723b9fd06f3e52c15b84c800d153cfb59b0a3dc8b8d40"}, - {file = "dulwich-0.20.50-cp311-cp311-win32.whl", hash = "sha256:3b1964fa80cafd5a1fd71615b0313daf6f3295c6ab05656ea0c1d2423539904a"}, - {file = "dulwich-0.20.50-cp311-cp311-win_amd64.whl", hash = "sha256:a24a3893108f3b97beb958670d5f3f2a3bec73a1fe18637a572a85abd949a1c4"}, - {file = "dulwich-0.20.50-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6d409a282f8848fd6c8d7c7545ad2f75c16de5d5977de202642f1d50fdaac554"}, - {file = "dulwich-0.20.50-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5411d0f1092152e1c0bb916ae490fe181953ae1b8d13f4e68661253e10b78dbb"}, - {file = "dulwich-0.20.50-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6343569f998ce429e2a5d813c56768ac51b496522401db950f0aa44240bfa901"}, - {file = "dulwich-0.20.50-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:a405cd236766060894411614a272cfb86fe86cde5ca73ef264fc4fa5a715fff4"}, - {file = "dulwich-0.20.50-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:ee0f9b02019c0ea84cdd31c00a0c283669b771c85612997a911715cf84e33d99"}, - {file = "dulwich-0.20.50-cp36-cp36m-win32.whl", hash = "sha256:2644466270267270f2157ea6f1c0aa224f6f3bf06a307fc39954e6b4b3d82bae"}, - {file = "dulwich-0.20.50-cp36-cp36m-win_amd64.whl", hash = "sha256:d4629635a97e3af1b5da48071e00c8e70fad85f3266fadabe1f5a8f49172c507"}, - {file = "dulwich-0.20.50-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0e4862f318d99cc8a500e3622a89613a88c07d957a0f628cdc2ed86addff790f"}, - {file = "dulwich-0.20.50-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c96e3fb9d48c0454dc242c7accc7819780c9a7f29e441a9eff12361ed0fa35f9"}, - {file = "dulwich-0.20.50-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8cc6092a4f0bbbff2e553e87a9c6325955b64ea43fca21297c8182e19ae8a43c"}, - {file = "dulwich-0.20.50-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:519b627d49d273e2fd01c79d09e578675ca6cd05193c1787e9ef165c9a1d66ea"}, - {file = "dulwich-0.20.50-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:6a75cab01b909c4c683c2083e060e378bc01701b7366b5a7d9846ef6d3b9e3d5"}, - {file = "dulwich-0.20.50-cp37-cp37m-win32.whl", hash = "sha256:ea8ffe26d91dbcd5580dbd5a07270a12ea57b091604d77184da0a0d9fad50ed3"}, - {file = "dulwich-0.20.50-cp37-cp37m-win_amd64.whl", hash = "sha256:8f3af857f94021cae1322d86925bfc0dd31e501e885ab5db275473bfac0bb39d"}, - {file = "dulwich-0.20.50-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:3fb35cedb1243bc420d885ef5b4afd642c6ac8f07ddfc7fdbca1becf9948bf7e"}, - {file = "dulwich-0.20.50-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4bb23a9cec63e16c0e432335f068169b73dd44fa9318dd7cd7a4ca83607ff367"}, - {file = "dulwich-0.20.50-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5267619b34ddaf8d9a6b841492cd17a971fd25bf9a5657f2de928385c3a08b94"}, - {file = "dulwich-0.20.50-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9091f1d53a3c0747cbf0bd127c64e7f09b770264d8fb53e284383fcdf69154e7"}, - {file = "dulwich-0.20.50-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a6ec7c8fea2b44187a3b545e6c11ab9947ffb122647b07abcdb7cc3aaa770c0e"}, - {file = "dulwich-0.20.50-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:11b180b80363b4fc70664197028181a17ae4c52df9965a29b62a6c52e40c2dbe"}, - {file = "dulwich-0.20.50-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c83e7840d9d0a94d7033bc109efe0c22dfcdcd816bcd4469085e42809e3bf5ba"}, - {file = "dulwich-0.20.50-cp38-cp38-win32.whl", hash = "sha256:c075f69c2de19d9fd97e3b70832d2b42c6a4a5d909b3ffd1963b67d86029f95f"}, - {file = "dulwich-0.20.50-cp38-cp38-win_amd64.whl", hash = "sha256:06775c5713cfeda778c7c67d4422b5e7554d3a7f644f1dde646cdf486a30285a"}, - {file = "dulwich-0.20.50-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:49f66f1c057c18d7d60363f461f4ab8329320fbe1f02a7a33c255864a7d3c942"}, - {file = "dulwich-0.20.50-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4e541cd690a5e3d55082ed51732d755917e933cddeb4b0204f2a5ec5d5d7b60b"}, - {file = "dulwich-0.20.50-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:80e8750ee2fa0ab2784a095956077758e5f6107de27f637c4b9d18406652c22c"}, - {file = "dulwich-0.20.50-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fbb6368f18451dc44c95c55e1a609d1a01d3821f7ed480b22b2aea1baca0f4a7"}, - {file = "dulwich-0.20.50-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3ee45001411b638641819b7b3b33f31f13467c84066e432256580fcab7d8815"}, - {file = "dulwich-0.20.50-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4842e22ed863a776b36ef8ffe9ed7b772eb452b42c8d02975c29d27e3bc50ab4"}, - {file = "dulwich-0.20.50-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:790e4a641284a7fb4d56ebdaf8b324a5826fbbb9c54307c06f586f9f6a5e56db"}, - {file = "dulwich-0.20.50-cp39-cp39-win32.whl", hash = "sha256:f08406b6b789dea5c95ba1130a0801d8748a67f18be940fe7486a8b481fde875"}, - {file = "dulwich-0.20.50-cp39-cp39-win_amd64.whl", hash = "sha256:78c388ad421199000fb7b5ed5f0c7b509b3e31bd7cad303786a4d0bf89b82f60"}, - {file = "dulwich-0.20.50-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:cb194c53109131bcbcd1ca430fcd437cdaf2d33e204e45fbe121c47eaa43e9af"}, - {file = "dulwich-0.20.50-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7542a72c5640dd0620862d6df8688f02a6c336359b5af9b3fcfe11b7fa6652f"}, - {file = "dulwich-0.20.50-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4aa1d0861517ebbbe0e0084cc9ab4f7ab720624a3eda2bd10e45f774ab858db8"}, - {file = "dulwich-0.20.50-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:583c6bbc27f13fe2e41a19f6987a42681c6e4f6959beae0a6e5bb033b8b081a8"}, - {file = "dulwich-0.20.50-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0c61c193d02c0e1e0d758cdd57ae76685c368d09a01f00d704ba88bd96767cfe"}, - {file = "dulwich-0.20.50-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c2edbff3053251985f10702adfafbee118298d383ef5b5b432a5f22d1f1915df"}, - {file = "dulwich-0.20.50-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a344230cadfc5d315752add6ce9d4cfcfc6c85e36bbf57fce9444bcc7c6ea8fb"}, - {file = "dulwich-0.20.50-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:57bff9bde0b6b05b00c6acbb1a94357caddb2908ed7026a48c715ff50d220335"}, - {file = "dulwich-0.20.50-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:e29a3c2037761fa816aa556e78364dfc8e3f44b873db2d17aed96f9b06ac83a3"}, - {file = "dulwich-0.20.50-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2aa2a4a84029625bf9c63771f8a628db1f3be2d2ea3cb8b17942cd4317797152"}, - {file = "dulwich-0.20.50-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd9fa00971ecf059bb358085a942ecac5be4ff71acdf299f44c8cbc45c18659f"}, - {file = "dulwich-0.20.50-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:af4adac92fb95671ea3a24f2f8e5e5e8f638711ce9c33a3ca6cd68bf1ff7d99f"}, - {file = "dulwich-0.20.50.tar.gz", hash = "sha256:50a941796b2c675be39be728d540c16b5b7ce77eb9e1b3f855650ece6832d2be"}, -] - -[package.dependencies] -urllib3 = ">=1.25" - -[package.extras] -fastimport = ["fastimport"] -https = ["urllib3 (>=1.24.1)"] -paramiko = ["paramiko"] -pgp = ["gpg"] - -[[package]] -name = "exceptiongroup" -version = "1.1.1" -description = "Backport of PEP 654 (exception groups)" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "exceptiongroup-1.1.1-py3-none-any.whl", hash = "sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e"}, - {file = "exceptiongroup-1.1.1.tar.gz", hash = "sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785"}, -] - -[package.extras] -test = ["pytest (>=6)"] - -[[package]] -name = "execnet" -version = "1.9.0" -description = "execnet: rapid multi-Python deployment" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -files = [ - {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"}, - {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"}, -] - -[package.extras] -testing = ["pre-commit"] - -[[package]] -name = "filelock" -version = "3.12.0" -description = "A platform independent file lock." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "filelock-3.12.0-py3-none-any.whl", hash = "sha256:ad98852315c2ab702aeb628412cbf7e95b7ce8c3bf9565670b4eaecf1db370a9"}, - {file = "filelock-3.12.0.tar.gz", hash = "sha256:fc03ae43288c013d2ea83c8597001b1129db351aad9c57fe2409327916b8e718"}, -] - -[package.extras] -docs = ["furo (>=2023.3.27)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.2.3)", "diff-cover (>=7.5)", "pytest (>=7.3.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-timeout (>=2.1)"] - -[[package]] -name = "flatdict" -version = "4.0.1" -description = "Python module for interacting with nested dicts as a single level dict with delimited keys." -category = "dev" -optional = false -python-versions = "*" -files = [ - {file = "flatdict-4.0.1.tar.gz", hash = "sha256:cd32f08fd31ed21eb09ebc76f06b6bd12046a24f77beb1fd0281917e47f26742"}, -] - -[[package]] -name = "html5lib" -version = "1.1" -description = "HTML parser based on the WHATWG HTML specification" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -files = [ - {file = "html5lib-1.1-py2.py3-none-any.whl", hash = "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d"}, - {file = "html5lib-1.1.tar.gz", hash = "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"}, -] - -[package.dependencies] -six = ">=1.9" -webencodings = "*" - -[package.extras] -all = ["chardet (>=2.2)", "genshi", "lxml"] -chardet = ["chardet (>=2.2)"] -genshi = ["genshi"] -lxml = ["lxml"] - -[[package]] -name = "httpretty" -version = "1.1.4" -description = "HTTP client mock for Python" -category = "dev" -optional = false -python-versions = ">=3" -files = [ - {file = "httpretty-1.1.4.tar.gz", hash = "sha256:20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68"}, -] - -[[package]] -name = "identify" -version = "2.5.23" -description = "File identification library for Python" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "identify-2.5.23-py2.py3-none-any.whl", hash = "sha256:17d9351c028a781456965e781ed2a435755cac655df1ebd930f7186b54399312"}, - {file = "identify-2.5.23.tar.gz", hash = "sha256:50b01b9d5f73c6b53e5fa2caf9f543d3e657a9d0bbdeb203ebb8d45960ba7433"}, -] - -[package.extras] -license = ["ukkonen"] - -[[package]] -name = "idna" -version = "3.4" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=3.5" -files = [ - {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, - {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, -] - -[[package]] -name = "importlib-metadata" -version = "4.13.0" -description = "Read metadata from Python packages" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "importlib_metadata-4.13.0-py3-none-any.whl", hash = "sha256:8a8a81bcf996e74fee46f0d16bd3eaa382a7eb20fd82445c3ad11f4090334116"}, - {file = "importlib_metadata-4.13.0.tar.gz", hash = "sha256:dd0173e8f150d6815e098fd354f6414b0f079af4644ddfe90c71e2fc6174346d"}, -] - -[package.dependencies] -typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} -zipp = ">=0.5" - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)"] -perf = ["ipython"] -testing = ["flake8 (<5)", "flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)"] - -[[package]] -name = "importlib-resources" -version = "5.12.0" -description = "Read resources from Python packages" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "importlib_resources-5.12.0-py3-none-any.whl", hash = "sha256:7b1deeebbf351c7578e09bf2f63fa2ce8b5ffec296e0d349139d43cca061a81a"}, - {file = "importlib_resources-5.12.0.tar.gz", hash = "sha256:4be82589bf5c1d7999aedf2a45159d10cb3ca4f19b2271f8792bc8e6da7b22f6"}, -] - -[package.dependencies] -zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""} - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["flake8 (<5)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] - -[[package]] -name = "iniconfig" -version = "2.0.0" -description = "brain-dead simple config-ini parsing" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"}, - {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"}, -] - -[[package]] -name = "jaraco-classes" -version = "3.2.3" -description = "Utility functions for Python class constructs" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "jaraco.classes-3.2.3-py3-none-any.whl", hash = "sha256:2353de3288bc6b82120752201c6b1c1a14b058267fa424ed5ce5984e3b922158"}, - {file = "jaraco.classes-3.2.3.tar.gz", hash = "sha256:89559fa5c1d3c34eff6f631ad80bb21f378dbcbb35dd161fd2c6b93f5be2f98a"}, -] - -[package.dependencies] -more-itertools = "*" - -[package.extras] -docs = ["jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)"] -testing = ["flake8 (<5)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] - -[[package]] -name = "jeepney" -version = "0.8.0" -description = "Low-level, pure Python DBus protocol wrapper." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "jeepney-0.8.0-py3-none-any.whl", hash = "sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755"}, - {file = "jeepney-0.8.0.tar.gz", hash = "sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806"}, -] - -[package.extras] -test = ["async-timeout", "pytest", "pytest-asyncio (>=0.17)", "pytest-trio", "testpath", "trio"] -trio = ["async_generator", "trio"] - -[[package]] -name = "jsonschema" -version = "4.17.3" -description = "An implementation of JSON Schema validation for Python" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "jsonschema-4.17.3-py3-none-any.whl", hash = "sha256:a870ad254da1a8ca84b6a2905cac29d265f805acc57af304784962a2aa6508f6"}, - {file = "jsonschema-4.17.3.tar.gz", hash = "sha256:0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d"}, -] - -[package.dependencies] -attrs = ">=17.4.0" -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} -importlib-resources = {version = ">=1.4.0", markers = "python_version < \"3.9\""} -pkgutil-resolve-name = {version = ">=1.3.10", markers = "python_version < \"3.9\""} -pyrsistent = ">=0.14.0,<0.17.0 || >0.17.0,<0.17.1 || >0.17.1,<0.17.2 || >0.17.2" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -format = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3987", "uri-template", "webcolors (>=1.11)"] -format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "uri-template", "webcolors (>=1.11)"] - -[[package]] -name = "keyring" -version = "23.13.1" -description = "Store and access your passwords safely." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "keyring-23.13.1-py3-none-any.whl", hash = "sha256:771ed2a91909389ed6148631de678f82ddc73737d85a927f382a8a1b157898cd"}, - {file = "keyring-23.13.1.tar.gz", hash = "sha256:ba2e15a9b35e21908d0aaf4e0a47acc52d6ae33444df0da2b49d41a46ef6d678"}, -] - -[package.dependencies] -importlib-metadata = {version = ">=4.11.4", markers = "python_version < \"3.12\""} -importlib-resources = {version = "*", markers = "python_version < \"3.9\""} -"jaraco.classes" = "*" -jeepney = {version = ">=0.4.2", markers = "sys_platform == \"linux\""} -pywin32-ctypes = {version = ">=0.2.0", markers = "sys_platform == \"win32\""} -SecretStorage = {version = ">=3.2", markers = "sys_platform == \"linux\""} - -[package.extras] -completion = ["shtab"] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)"] -testing = ["flake8 (<5)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] - -[[package]] -name = "lockfile" -version = "0.12.2" -description = "Platform-independent file locking module" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, - {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"}, -] - -[[package]] -name = "more-itertools" -version = "9.1.0" -description = "More routines for operating on iterables, beyond itertools" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "more-itertools-9.1.0.tar.gz", hash = "sha256:cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d"}, - {file = "more_itertools-9.1.0-py3-none-any.whl", hash = "sha256:d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3"}, -] - -[[package]] -name = "msgpack" -version = "1.0.5" -description = "MessagePack serializer" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "msgpack-1.0.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:525228efd79bb831cf6830a732e2e80bc1b05436b086d4264814b4b2955b2fa9"}, - {file = "msgpack-1.0.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4f8d8b3bf1ff2672567d6b5c725a1b347fe838b912772aa8ae2bf70338d5a198"}, - {file = "msgpack-1.0.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:cdc793c50be3f01106245a61b739328f7dccc2c648b501e237f0699fe1395b81"}, - {file = "msgpack-1.0.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5cb47c21a8a65b165ce29f2bec852790cbc04936f502966768e4aae9fa763cb7"}, - {file = "msgpack-1.0.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e42b9594cc3bf4d838d67d6ed62b9e59e201862a25e9a157019e171fbe672dd3"}, - {file = "msgpack-1.0.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:55b56a24893105dc52c1253649b60f475f36b3aa0fc66115bffafb624d7cb30b"}, - {file = "msgpack-1.0.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:1967f6129fc50a43bfe0951c35acbb729be89a55d849fab7686004da85103f1c"}, - {file = "msgpack-1.0.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20a97bf595a232c3ee6d57ddaadd5453d174a52594bf9c21d10407e2a2d9b3bd"}, - {file = "msgpack-1.0.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d25dd59bbbbb996eacf7be6b4ad082ed7eacc4e8f3d2df1ba43822da9bfa122a"}, - {file = "msgpack-1.0.5-cp310-cp310-win32.whl", hash = "sha256:382b2c77589331f2cb80b67cc058c00f225e19827dbc818d700f61513ab47bea"}, - {file = "msgpack-1.0.5-cp310-cp310-win_amd64.whl", hash = "sha256:4867aa2df9e2a5fa5f76d7d5565d25ec76e84c106b55509e78c1ede0f152659a"}, - {file = "msgpack-1.0.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9f5ae84c5c8a857ec44dc180a8b0cc08238e021f57abdf51a8182e915e6299f0"}, - {file = "msgpack-1.0.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9e6ca5d5699bcd89ae605c150aee83b5321f2115695e741b99618f4856c50898"}, - {file = "msgpack-1.0.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5494ea30d517a3576749cad32fa27f7585c65f5f38309c88c6d137877fa28a5a"}, - {file = "msgpack-1.0.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1ab2f3331cb1b54165976a9d976cb251a83183631c88076613c6c780f0d6e45a"}, - {file = "msgpack-1.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28592e20bbb1620848256ebc105fc420436af59515793ed27d5c77a217477705"}, - {file = "msgpack-1.0.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fe5c63197c55bce6385d9aee16c4d0641684628f63ace85f73571e65ad1c1e8d"}, - {file = "msgpack-1.0.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ed40e926fa2f297e8a653c954b732f125ef97bdd4c889f243182299de27e2aa9"}, - {file = "msgpack-1.0.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:b2de4c1c0538dcb7010902a2b97f4e00fc4ddf2c8cda9749af0e594d3b7fa3d7"}, - {file = "msgpack-1.0.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:bf22a83f973b50f9d38e55c6aade04c41ddda19b00c4ebc558930d78eecc64ed"}, - {file = "msgpack-1.0.5-cp311-cp311-win32.whl", hash = "sha256:c396e2cc213d12ce017b686e0f53497f94f8ba2b24799c25d913d46c08ec422c"}, - {file = "msgpack-1.0.5-cp311-cp311-win_amd64.whl", hash = "sha256:6c4c68d87497f66f96d50142a2b73b97972130d93677ce930718f68828b382e2"}, - {file = "msgpack-1.0.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:a2b031c2e9b9af485d5e3c4520f4220d74f4d222a5b8dc8c1a3ab9448ca79c57"}, - {file = "msgpack-1.0.5-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4f837b93669ce4336e24d08286c38761132bc7ab29782727f8557e1eb21b2080"}, - {file = "msgpack-1.0.5-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1d46dfe3832660f53b13b925d4e0fa1432b00f5f7210eb3ad3bb9a13c6204a6"}, - {file = "msgpack-1.0.5-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:366c9a7b9057e1547f4ad51d8facad8b406bab69c7d72c0eb6f529cf76d4b85f"}, - {file = "msgpack-1.0.5-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:4c075728a1095efd0634a7dccb06204919a2f67d1893b6aa8e00497258bf926c"}, - {file = "msgpack-1.0.5-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:f933bbda5a3ee63b8834179096923b094b76f0c7a73c1cfe8f07ad608c58844b"}, - {file = "msgpack-1.0.5-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:36961b0568c36027c76e2ae3ca1132e35123dcec0706c4b7992683cc26c1320c"}, - {file = "msgpack-1.0.5-cp36-cp36m-win32.whl", hash = "sha256:b5ef2f015b95f912c2fcab19c36814963b5463f1fb9049846994b007962743e9"}, - {file = "msgpack-1.0.5-cp36-cp36m-win_amd64.whl", hash = "sha256:288e32b47e67f7b171f86b030e527e302c91bd3f40fd9033483f2cacc37f327a"}, - {file = "msgpack-1.0.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:137850656634abddfb88236008339fdaba3178f4751b28f270d2ebe77a563b6c"}, - {file = "msgpack-1.0.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0c05a4a96585525916b109bb85f8cb6511db1c6f5b9d9cbcbc940dc6b4be944b"}, - {file = "msgpack-1.0.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56a62ec00b636583e5cb6ad313bbed36bb7ead5fa3a3e38938503142c72cba4f"}, - {file = "msgpack-1.0.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef8108f8dedf204bb7b42994abf93882da1159728a2d4c5e82012edd92c9da9f"}, - {file = "msgpack-1.0.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:1835c84d65f46900920b3708f5ba829fb19b1096c1800ad60bae8418652a951d"}, - {file = "msgpack-1.0.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:e57916ef1bd0fee4f21c4600e9d1da352d8816b52a599c46460e93a6e9f17086"}, - {file = "msgpack-1.0.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:17358523b85973e5f242ad74aa4712b7ee560715562554aa2134d96e7aa4cbbf"}, - {file = "msgpack-1.0.5-cp37-cp37m-win32.whl", hash = "sha256:cb5aaa8c17760909ec6cb15e744c3ebc2ca8918e727216e79607b7bbce9c8f77"}, - {file = "msgpack-1.0.5-cp37-cp37m-win_amd64.whl", hash = "sha256:ab31e908d8424d55601ad7075e471b7d0140d4d3dd3272daf39c5c19d936bd82"}, - {file = "msgpack-1.0.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b72d0698f86e8d9ddf9442bdedec15b71df3598199ba33322d9711a19f08145c"}, - {file = "msgpack-1.0.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:379026812e49258016dd84ad79ac8446922234d498058ae1d415f04b522d5b2d"}, - {file = "msgpack-1.0.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:332360ff25469c346a1c5e47cbe2a725517919892eda5cfaffe6046656f0b7bb"}, - {file = "msgpack-1.0.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:476a8fe8fae289fdf273d6d2a6cb6e35b5a58541693e8f9f019bfe990a51e4ba"}, - {file = "msgpack-1.0.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9985b214f33311df47e274eb788a5893a761d025e2b92c723ba4c63936b69b1"}, - {file = "msgpack-1.0.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:48296af57cdb1d885843afd73c4656be5c76c0c6328db3440c9601a98f303d87"}, - {file = "msgpack-1.0.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:addab7e2e1fcc04bd08e4eb631c2a90960c340e40dfc4a5e24d2ff0d5a3b3edb"}, - {file = "msgpack-1.0.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:916723458c25dfb77ff07f4c66aed34e47503b2eb3188b3adbec8d8aa6e00f48"}, - {file = "msgpack-1.0.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:821c7e677cc6acf0fd3f7ac664c98803827ae6de594a9f99563e48c5a2f27eb0"}, - {file = "msgpack-1.0.5-cp38-cp38-win32.whl", hash = "sha256:1c0f7c47f0087ffda62961d425e4407961a7ffd2aa004c81b9c07d9269512f6e"}, - {file = "msgpack-1.0.5-cp38-cp38-win_amd64.whl", hash = "sha256:bae7de2026cbfe3782c8b78b0db9cbfc5455e079f1937cb0ab8d133496ac55e1"}, - {file = "msgpack-1.0.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:20c784e66b613c7f16f632e7b5e8a1651aa5702463d61394671ba07b2fc9e025"}, - {file = "msgpack-1.0.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:266fa4202c0eb94d26822d9bfd7af25d1e2c088927fe8de9033d929dd5ba24c5"}, - {file = "msgpack-1.0.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:18334484eafc2b1aa47a6d42427da7fa8f2ab3d60b674120bce7a895a0a85bdd"}, - {file = "msgpack-1.0.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:57e1f3528bd95cc44684beda696f74d3aaa8a5e58c816214b9046512240ef437"}, - {file = "msgpack-1.0.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:586d0d636f9a628ddc6a17bfd45aa5b5efaf1606d2b60fa5d87b8986326e933f"}, - {file = "msgpack-1.0.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a740fa0e4087a734455f0fc3abf5e746004c9da72fbd541e9b113013c8dc3282"}, - {file = "msgpack-1.0.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3055b0455e45810820db1f29d900bf39466df96ddca11dfa6d074fa47054376d"}, - {file = "msgpack-1.0.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:a61215eac016f391129a013c9e46f3ab308db5f5ec9f25811e811f96962599a8"}, - {file = "msgpack-1.0.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:362d9655cd369b08fda06b6657a303eb7172d5279997abe094512e919cf74b11"}, - {file = "msgpack-1.0.5-cp39-cp39-win32.whl", hash = "sha256:ac9dd47af78cae935901a9a500104e2dea2e253207c924cc95de149606dc43cc"}, - {file = "msgpack-1.0.5-cp39-cp39-win_amd64.whl", hash = "sha256:06f5174b5f8ed0ed919da0e62cbd4ffde676a374aba4020034da05fab67b9164"}, - {file = "msgpack-1.0.5.tar.gz", hash = "sha256:c075544284eadc5cddc70f4757331d99dcbc16b2bbd4849d15f8aae4cf36d31c"}, -] - -[[package]] -name = "mypy" -version = "1.2.0" -description = "Optional static typing for Python" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "mypy-1.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:701189408b460a2ff42b984e6bd45c3f41f0ac9f5f58b8873bbedc511900086d"}, - {file = "mypy-1.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fe91be1c51c90e2afe6827601ca14353bbf3953f343c2129fa1e247d55fd95ba"}, - {file = "mypy-1.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d26b513225ffd3eacece727f4387bdce6469192ef029ca9dd469940158bc89e"}, - {file = "mypy-1.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:3a2d219775a120581a0ae8ca392b31f238d452729adbcb6892fa89688cb8306a"}, - {file = "mypy-1.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:2e93a8a553e0394b26c4ca683923b85a69f7ccdc0139e6acd1354cc884fe0128"}, - {file = "mypy-1.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3efde4af6f2d3ccf58ae825495dbb8d74abd6d176ee686ce2ab19bd025273f41"}, - {file = "mypy-1.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:695c45cea7e8abb6f088a34a6034b1d273122e5530aeebb9c09626cea6dca4cb"}, - {file = "mypy-1.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d0e9464a0af6715852267bf29c9553e4555b61f5904a4fc538547a4d67617937"}, - {file = "mypy-1.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8293a216e902ac12779eb7a08f2bc39ec6c878d7c6025aa59464e0c4c16f7eb9"}, - {file = "mypy-1.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:f46af8d162f3d470d8ffc997aaf7a269996d205f9d746124a179d3abe05ac602"}, - {file = "mypy-1.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:031fc69c9a7e12bcc5660b74122ed84b3f1c505e762cc4296884096c6d8ee140"}, - {file = "mypy-1.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:390bc685ec209ada4e9d35068ac6988c60160b2b703072d2850457b62499e336"}, - {file = "mypy-1.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:4b41412df69ec06ab141808d12e0bf2823717b1c363bd77b4c0820feaa37249e"}, - {file = "mypy-1.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4e4a682b3f2489d218751981639cffc4e281d548f9d517addfd5a2917ac78119"}, - {file = "mypy-1.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a197ad3a774f8e74f21e428f0de7f60ad26a8d23437b69638aac2764d1e06a6a"}, - {file = "mypy-1.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c9a084bce1061e55cdc0493a2ad890375af359c766b8ac311ac8120d3a472950"}, - {file = "mypy-1.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eaeaa0888b7f3ccb7bcd40b50497ca30923dba14f385bde4af78fac713d6d6f6"}, - {file = "mypy-1.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bea55fc25b96c53affab852ad94bf111a3083bc1d8b0c76a61dd101d8a388cf5"}, - {file = "mypy-1.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:4c8d8c6b80aa4a1689f2a179d31d86ae1367ea4a12855cc13aa3ba24bb36b2d8"}, - {file = "mypy-1.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:70894c5345bea98321a2fe84df35f43ee7bb0feec117a71420c60459fc3e1eed"}, - {file = "mypy-1.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4a99fe1768925e4a139aace8f3fb66db3576ee1c30b9c0f70f744ead7e329c9f"}, - {file = "mypy-1.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:023fe9e618182ca6317ae89833ba422c411469156b690fde6a315ad10695a521"}, - {file = "mypy-1.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4d19f1a239d59f10fdc31263d48b7937c585810288376671eaf75380b074f238"}, - {file = "mypy-1.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:2de7babe398cb7a85ac7f1fd5c42f396c215ab3eff731b4d761d68d0f6a80f48"}, - {file = "mypy-1.2.0-py3-none-any.whl", hash = "sha256:d8e9187bfcd5ffedbe87403195e1fc340189a68463903c39e2b63307c9fa0394"}, - {file = "mypy-1.2.0.tar.gz", hash = "sha256:f70a40410d774ae23fcb4afbbeca652905a04de7948eaf0b1789c8d1426b72d1"}, -] - -[package.dependencies] -mypy-extensions = ">=1.0.0" -tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} -typed-ast = {version = ">=1.4.0,<2", markers = "python_version < \"3.8\""} -typing-extensions = ">=3.10" - -[package.extras] -dmypy = ["psutil (>=4.0)"] -install-types = ["pip"] -python2 = ["typed-ast (>=1.4.0,<2)"] -reports = ["lxml"] - -[[package]] -name = "mypy-extensions" -version = "1.0.0" -description = "Type system extensions for programs checked with the mypy type checker." -category = "dev" -optional = false -python-versions = ">=3.5" -files = [ - {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"}, - {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, -] - -[[package]] -name = "nodeenv" -version = "1.7.0" -description = "Node.js virtual environment builder" -category = "dev" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*" -files = [ - {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"}, - {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"}, -] - -[package.dependencies] -setuptools = "*" - -[[package]] -name = "ordered-set" -version = "4.1.0" -description = "An OrderedSet is a custom MutableSet that remembers its order, so that every" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "ordered-set-4.1.0.tar.gz", hash = "sha256:694a8e44c87657c59292ede72891eb91d34131f6531463aab3009191c77364a8"}, - {file = "ordered_set-4.1.0-py3-none-any.whl", hash = "sha256:046e1132c71fcf3330438a539928932caf51ddbc582496833e23de611de14562"}, -] - -[package.extras] -dev = ["black", "mypy", "pytest"] - -[[package]] -name = "packaging" -version = "23.1" -description = "Core utilities for Python packages" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "packaging-23.1-py3-none-any.whl", hash = "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61"}, - {file = "packaging-23.1.tar.gz", hash = "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"}, -] - -[[package]] -name = "pexpect" -version = "4.8.0" -description = "Pexpect allows easy control of interactive console applications." -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"}, - {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, -] - -[package.dependencies] -ptyprocess = ">=0.5" - -[[package]] -name = "pkginfo" -version = "1.9.6" -description = "Query metadata from sdists / bdists / installed packages." -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pkginfo-1.9.6-py3-none-any.whl", hash = "sha256:4b7a555a6d5a22169fcc9cf7bfd78d296b0361adad412a346c1226849af5e546"}, - {file = "pkginfo-1.9.6.tar.gz", hash = "sha256:8fd5896e8718a4372f0ea9cc9d96f6417c9b986e23a4d116dda26b62cc29d046"}, -] - -[package.extras] -testing = ["pytest", "pytest-cov"] - -[[package]] -name = "pkgutil-resolve-name" -version = "1.3.10" -description = "Resolve a name to an object." -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pkgutil_resolve_name-1.3.10-py3-none-any.whl", hash = "sha256:ca27cc078d25c5ad71a9de0a7a330146c4e014c2462d9af19c6b828280649c5e"}, - {file = "pkgutil_resolve_name-1.3.10.tar.gz", hash = "sha256:357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174"}, -] - -[[package]] -name = "platformdirs" -version = "2.6.2" -description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"}, - {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"}, -] - -[package.dependencies] -typing-extensions = {version = ">=4.4", markers = "python_version < \"3.8\""} - -[package.extras] -docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"] -test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"] - -[[package]] -name = "pluggy" -version = "1.0.0" -description = "plugin and hook calling mechanisms for python" -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, - {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, -] - -[package.dependencies] -importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} - -[package.extras] -dev = ["pre-commit", "tox"] -testing = ["pytest", "pytest-benchmark"] - -[[package]] -name = "poetry-core" -version = "1.4.0" -description = "Poetry PEP 517 Build Backend" -category = "main" -optional = false -python-versions = ">=3.7,<4.0" -files = [ - {file = "poetry_core-1.4.0-py3-none-any.whl", hash = "sha256:5559ab80384ac021db329ef317086417e140ee1176bcfcb3a3838b544e213c8e"}, - {file = "poetry_core-1.4.0.tar.gz", hash = "sha256:514bd33c30e0bf56b0ed44ee15e120d7e47b61ad908b2b1011da68c48a84ada9"}, -] - -[package.dependencies] -importlib-metadata = {version = ">=1.7.0", markers = "python_version < \"3.8\""} - -[[package]] -name = "poetry-plugin-export" -version = "1.3.1" -description = "Poetry plugin to export the dependencies to various formats" -category = "main" -optional = false -python-versions = ">=3.7,<4.0" -files = [ - {file = "poetry_plugin_export-1.3.1-py3-none-any.whl", hash = "sha256:941d7ba02a59671d6327b16dc6deecc9262477abbc120d728a500cf125bc1e06"}, - {file = "poetry_plugin_export-1.3.1.tar.gz", hash = "sha256:d949742757a8a5f0b5810495bffaf4ed8a767f2e2ffda9887cf72f896deabf84"}, -] - -[package.dependencies] -poetry = ">=1.3.0,<2.0.0" -poetry-core = ">=1.3.0,<2.0.0" - -[[package]] -name = "pre-commit" -version = "2.21.0" -description = "A framework for managing and maintaining multi-language pre-commit hooks." -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"}, - {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"}, -] - -[package.dependencies] -cfgv = ">=2.0.0" -identify = ">=1.0.0" -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} -nodeenv = ">=0.11.1" -pyyaml = ">=5.1" -virtualenv = ">=20.10.0" - -[[package]] -name = "psutil" -version = "5.9.5" -description = "Cross-platform lib for process and system monitoring in Python." -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "psutil-5.9.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:be8929ce4313f9f8146caad4272f6abb8bf99fc6cf59344a3167ecd74f4f203f"}, - {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:ab8ed1a1d77c95453db1ae00a3f9c50227ebd955437bcf2a574ba8adbf6a74d5"}, - {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:4aef137f3345082a3d3232187aeb4ac4ef959ba3d7c10c33dd73763fbc063da4"}, - {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:ea8518d152174e1249c4f2a1c89e3e6065941df2fa13a1ab45327716a23c2b48"}, - {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:acf2aef9391710afded549ff602b5887d7a2349831ae4c26be7c807c0a39fac4"}, - {file = "psutil-5.9.5-cp27-none-win32.whl", hash = "sha256:5b9b8cb93f507e8dbaf22af6a2fd0ccbe8244bf30b1baad6b3954e935157ae3f"}, - {file = "psutil-5.9.5-cp27-none-win_amd64.whl", hash = "sha256:8c5f7c5a052d1d567db4ddd231a9d27a74e8e4a9c3f44b1032762bd7b9fdcd42"}, - {file = "psutil-5.9.5-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:3c6f686f4225553615612f6d9bc21f1c0e305f75d7d8454f9b46e901778e7217"}, - {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a7dd9997128a0d928ed4fb2c2d57e5102bb6089027939f3b722f3a210f9a8da"}, - {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89518112647f1276b03ca97b65cc7f64ca587b1eb0278383017c2a0dcc26cbe4"}, - {file = "psutil-5.9.5-cp36-abi3-win32.whl", hash = "sha256:104a5cc0e31baa2bcf67900be36acde157756b9c44017b86b2c049f11957887d"}, - {file = "psutil-5.9.5-cp36-abi3-win_amd64.whl", hash = "sha256:b258c0c1c9d145a1d5ceffab1134441c4c5113b2417fafff7315a917a026c3c9"}, - {file = "psutil-5.9.5-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:c607bb3b57dc779d55e1554846352b4e358c10fff3abf3514a7a6601beebdb30"}, - {file = "psutil-5.9.5.tar.gz", hash = "sha256:5410638e4df39c54d957fc51ce03048acd8e6d60abc0f5107af51e5fb566eb3c"}, -] - -[package.extras] -test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"] - -[[package]] -name = "ptyprocess" -version = "0.7.0" -description = "Run a subprocess in a pseudo terminal" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, - {file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"}, -] - -[[package]] -name = "py" -version = "1.11.0" -description = "library with cross-python path, ini-parsing, io, code, log facilities" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -files = [ - {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"}, - {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"}, -] - -[[package]] -name = "pycparser" -version = "2.21" -description = "C parser in Python" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, - {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, -] - -[[package]] -name = "pyrsistent" -version = "0.19.3" -description = "Persistent/Functional/Immutable data structures" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pyrsistent-0.19.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:20460ac0ea439a3e79caa1dbd560344b64ed75e85d8703943e0b66c2a6150e4a"}, - {file = "pyrsistent-0.19.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4c18264cb84b5e68e7085a43723f9e4c1fd1d935ab240ce02c0324a8e01ccb64"}, - {file = "pyrsistent-0.19.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4b774f9288dda8d425adb6544e5903f1fb6c273ab3128a355c6b972b7df39dcf"}, - {file = "pyrsistent-0.19.3-cp310-cp310-win32.whl", hash = "sha256:5a474fb80f5e0d6c9394d8db0fc19e90fa540b82ee52dba7d246a7791712f74a"}, - {file = "pyrsistent-0.19.3-cp310-cp310-win_amd64.whl", hash = "sha256:49c32f216c17148695ca0e02a5c521e28a4ee6c5089f97e34fe24163113722da"}, - {file = "pyrsistent-0.19.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:f0774bf48631f3a20471dd7c5989657b639fd2d285b861237ea9e82c36a415a9"}, - {file = "pyrsistent-0.19.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ab2204234c0ecd8b9368dbd6a53e83c3d4f3cab10ecaf6d0e772f456c442393"}, - {file = "pyrsistent-0.19.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e42296a09e83028b3476f7073fcb69ffebac0e66dbbfd1bd847d61f74db30f19"}, - {file = "pyrsistent-0.19.3-cp311-cp311-win32.whl", hash = "sha256:64220c429e42a7150f4bfd280f6f4bb2850f95956bde93c6fda1b70507af6ef3"}, - {file = "pyrsistent-0.19.3-cp311-cp311-win_amd64.whl", hash = "sha256:016ad1afadf318eb7911baa24b049909f7f3bb2c5b1ed7b6a8f21db21ea3faa8"}, - {file = "pyrsistent-0.19.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c4db1bd596fefd66b296a3d5d943c94f4fac5bcd13e99bffe2ba6a759d959a28"}, - {file = "pyrsistent-0.19.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aeda827381f5e5d65cced3024126529ddc4289d944f75e090572c77ceb19adbf"}, - {file = "pyrsistent-0.19.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:42ac0b2f44607eb92ae88609eda931a4f0dfa03038c44c772e07f43e738bcac9"}, - {file = "pyrsistent-0.19.3-cp37-cp37m-win32.whl", hash = "sha256:e8f2b814a3dc6225964fa03d8582c6e0b6650d68a232df41e3cc1b66a5d2f8d1"}, - {file = "pyrsistent-0.19.3-cp37-cp37m-win_amd64.whl", hash = "sha256:c9bb60a40a0ab9aba40a59f68214eed5a29c6274c83b2cc206a359c4a89fa41b"}, - {file = "pyrsistent-0.19.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a2471f3f8693101975b1ff85ffd19bb7ca7dd7c38f8a81701f67d6b4f97b87d8"}, - {file = "pyrsistent-0.19.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc5d149f31706762c1f8bda2e8c4f8fead6e80312e3692619a75301d3dbb819a"}, - {file = "pyrsistent-0.19.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3311cb4237a341aa52ab8448c27e3a9931e2ee09561ad150ba94e4cfd3fc888c"}, - {file = "pyrsistent-0.19.3-cp38-cp38-win32.whl", hash = "sha256:f0e7c4b2f77593871e918be000b96c8107da48444d57005b6a6bc61fb4331b2c"}, - {file = "pyrsistent-0.19.3-cp38-cp38-win_amd64.whl", hash = "sha256:c147257a92374fde8498491f53ffa8f4822cd70c0d85037e09028e478cababb7"}, - {file = "pyrsistent-0.19.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:b735e538f74ec31378f5a1e3886a26d2ca6351106b4dfde376a26fc32a044edc"}, - {file = "pyrsistent-0.19.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99abb85579e2165bd8522f0c0138864da97847875ecbd45f3e7e2af569bfc6f2"}, - {file = "pyrsistent-0.19.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3a8cb235fa6d3fd7aae6a4f1429bbb1fec1577d978098da1252f0489937786f3"}, - {file = "pyrsistent-0.19.3-cp39-cp39-win32.whl", hash = "sha256:c74bed51f9b41c48366a286395c67f4e894374306b197e62810e0fdaf2364da2"}, - {file = "pyrsistent-0.19.3-cp39-cp39-win_amd64.whl", hash = "sha256:878433581fc23e906d947a6814336eee031a00e6defba224234169ae3d3d6a98"}, - {file = "pyrsistent-0.19.3-py3-none-any.whl", hash = "sha256:ccf0d6bd208f8111179f0c26fdf84ed7c3891982f2edaeae7422575f47e66b64"}, - {file = "pyrsistent-0.19.3.tar.gz", hash = "sha256:1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440"}, -] - -[[package]] -name = "pytest" -version = "7.3.1" -description = "pytest: simple powerful testing with Python" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pytest-7.3.1-py3-none-any.whl", hash = "sha256:3799fa815351fea3a5e96ac7e503a96fa51cc9942c3753cda7651b93c1cfa362"}, - {file = "pytest-7.3.1.tar.gz", hash = "sha256:434afafd78b1d78ed0addf160ad2b77a30d35d4bdf8af234fe621919d9ed15e3"}, -] - -[package.dependencies] -colorama = {version = "*", markers = "sys_platform == \"win32\""} -exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} -importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} -iniconfig = "*" -packaging = "*" -pluggy = ">=0.12,<2.0" -tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} - -[package.extras] -testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"] - -[[package]] -name = "pytest-cov" -version = "4.0.0" -description = "Pytest plugin for measuring coverage." -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"}, - {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"}, -] - -[package.dependencies] -coverage = {version = ">=5.2.1", extras = ["toml"]} -pytest = ">=4.6" - -[package.extras] -testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"] - -[[package]] -name = "pytest-forked" -version = "1.6.0" -description = "run tests in isolated forked subprocesses" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pytest-forked-1.6.0.tar.gz", hash = "sha256:4dafd46a9a600f65d822b8f605133ecf5b3e1941ebb3588e943b4e3eb71a5a3f"}, - {file = "pytest_forked-1.6.0-py3-none-any.whl", hash = "sha256:810958f66a91afb1a1e2ae83089d8dc1cd2437ac96b12963042fbb9fb4d16af0"}, -] - -[package.dependencies] -py = "*" -pytest = ">=3.10" - -[[package]] -name = "pytest-github-actions-annotate-failures" -version = "0.1.8" -description = "pytest plugin to annotate failed tests with a workflow command for GitHub Actions" -category = "dev" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*" -files = [ - {file = "pytest-github-actions-annotate-failures-0.1.8.tar.gz", hash = "sha256:2d6e6cb5f8d0aae4a27a20cc4e20fabd3199a121c57f44bc48fe28e372e0be23"}, - {file = "pytest_github_actions_annotate_failures-0.1.8-py2.py3-none-any.whl", hash = "sha256:6a882ff21672fa79deae8d917eb965a6bde2b25191e7632e1adfc23ffac008ab"}, -] - -[package.dependencies] -pytest = ">=4.0.0" - -[[package]] -name = "pytest-mock" -version = "3.10.0" -description = "Thin-wrapper around the mock package for easier use with pytest" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pytest-mock-3.10.0.tar.gz", hash = "sha256:fbbdb085ef7c252a326fd8cdcac0aa3b1333d8811f131bdcc701002e1be7ed4f"}, - {file = "pytest_mock-3.10.0-py3-none-any.whl", hash = "sha256:f4c973eeae0282963eb293eb173ce91b091a79c1334455acfac9ddee8a1c784b"}, -] - -[package.dependencies] -pytest = ">=5.0" - -[package.extras] -dev = ["pre-commit", "pytest-asyncio", "tox"] - -[[package]] -name = "pytest-randomly" -version = "3.12.0" -description = "Pytest plugin to randomly order tests and control random.seed." -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pytest-randomly-3.12.0.tar.gz", hash = "sha256:d60c2db71ac319aee0fc6c4110a7597d611a8b94a5590918bfa8583f00caccb2"}, - {file = "pytest_randomly-3.12.0-py3-none-any.whl", hash = "sha256:f4f2e803daf5d1ba036cc22bf4fe9dbbf99389ec56b00e5cba732fb5c1d07fdd"}, -] - -[package.dependencies] -importlib-metadata = {version = ">=3.6.0", markers = "python_version < \"3.10\""} -pytest = "*" - -[[package]] -name = "pytest-xdist" -version = "2.5.0" -description = "pytest xdist plugin for distributed testing and loop-on-failing modes" -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"}, - {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"}, -] - -[package.dependencies] -execnet = ">=1.1" -psutil = {version = ">=3.0", optional = true, markers = "extra == \"psutil\""} -pytest = ">=6.2.0" -pytest-forked = "*" - -[package.extras] -psutil = ["psutil (>=3.0)"] -setproctitle = ["setproctitle"] -testing = ["filelock"] - -[[package]] -name = "pywin32-ctypes" -version = "0.2.0" -description = "" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "pywin32-ctypes-0.2.0.tar.gz", hash = "sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942"}, - {file = "pywin32_ctypes-0.2.0-py2.py3-none-any.whl", hash = "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"}, -] - -[[package]] -name = "pyyaml" -version = "6.0" -description = "YAML parser and emitter for Python" -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, - {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, - {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, - {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"}, - {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"}, - {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"}, - {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, - {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, - {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, - {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, - {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, - {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, - {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, - {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, - {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, - {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, - {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, - {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, -] - -[[package]] -name = "rapidfuzz" -version = "2.15.1" -description = "rapid fuzzy string matching" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "rapidfuzz-2.15.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:fc0bc259ebe3b93e7ce9df50b3d00e7345335d35acbd735163b7c4b1957074d3"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d59fb3a410d253f50099d7063855c2b95df1ef20ad93ea3a6b84115590899f25"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c525a3da17b6d79d61613096c8683da86e3573e807dfaecf422eea09e82b5ba6"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4deae6a918ecc260d0c4612257be8ba321d8e913ccb43155403842758c46fbe"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2577463d10811386e704a3ab58b903eb4e2a31b24dfd9886d789b0084d614b01"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f67d5f56aa48c0da9de4ab81bffb310683cf7815f05ea38e5aa64f3ba4368339"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d7927722ff43690e52b3145b5bd3089151d841d350c6f8378c3cfac91f67573a"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6534afc787e32c4104f65cdeb55f6abe4d803a2d0553221d00ef9ce12788dcde"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d0ae6ec79a1931929bb9dd57bc173eb5ba4c7197461bf69e3a34b6dd314feed2"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:be7ccc45c4d1a7dfb595f260e8022a90c6cb380c2a346ee5aae93f85c96d362b"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:8ba013500a2b68c64b2aecc5fb56a2dad6c2872cf545a0308fd044827b6e5f6a"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:4d9f7d10065f657f960b48699e7dddfce14ab91af4bab37a215f0722daf0d716"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7e24a1b802cea04160b3fccd75d2d0905065783ebc9de157d83c14fb9e1c6ce2"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-win32.whl", hash = "sha256:dffdf03499e0a5b3442951bb82b556333b069e0661e80568752786c79c5b32de"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:7d150d90a7c6caae7962f29f857a4e61d42038cfd82c9df38508daf30c648ae7"}, - {file = "rapidfuzz-2.15.1-cp310-cp310-win_arm64.whl", hash = "sha256:87c30e9184998ff6eb0fa9221f94282ce7c908fd0da96a1ef66ecadfaaa4cdb7"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:6986413cb37035eb796e32f049cbc8c13d8630a4ac1e0484e3e268bb3662bd1b"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a72f26e010d4774b676f36e43c0fc8a2c26659efef4b3be3fd7714d3491e9957"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b5cd54c98a387cca111b3b784fc97a4f141244bbc28a92d4bde53f164464112e"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da7fac7c3da39f93e6b2ebe386ed0ffe1cefec91509b91857f6e1204509e931f"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f976e76ac72f650790b3a5402431612175b2ac0363179446285cb3c901136ca9"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:abde47e1595902a490ed14d4338d21c3509156abb2042a99e6da51f928e0c117"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ca8f1747007a3ce919739a60fa95c5325f7667cccf6f1c1ef18ae799af119f5e"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c35da09ab9797b020d0d4f07a66871dfc70ea6566363811090353ea971748b5a"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a3a769ca7580686a66046b77df33851b3c2d796dc1eb60c269b68f690f3e1b65"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:d50622efefdb03a640a51a6123748cd151d305c1f0431af762e833d6ffef71f0"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:b7461b0a7651d68bc23f0896bffceea40f62887e5ab8397bf7caa883592ef5cb"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:074ee9e17912e025c72a5780ee4c7c413ea35cd26449719cc399b852d4e42533"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7025fb105a11f503943f17718cdb8241ea3bb4d812c710c609e69bead40e2ff0"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-win32.whl", hash = "sha256:2084d36b95139413cef25e9487257a1cc892b93bd1481acd2a9656f7a1d9930c"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:5a738fcd24e34bce4b19126b92fdae15482d6d3a90bd687fd3d24ce9d28ce82d"}, - {file = "rapidfuzz-2.15.1-cp311-cp311-win_arm64.whl", hash = "sha256:dc3cafa68cfa54638632bdcadf9aab89a3d182b4a3f04d2cad7585ed58ea8731"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3c53d57ba7a88f7bf304d4ea5a14a0ca112db0e0178fff745d9005acf2879f7d"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6ee758eec4cf2215dc8d8eafafcea0d1f48ad4b0135767db1b0f7c5c40a17dd"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2d93ba3ae59275e7a3a116dac4ffdb05e9598bf3ee0861fecc5b60fb042d539e"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7c3ff75e647908ddbe9aa917fbe39a112d5631171f3fcea5809e2363e525a59d"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6d89c421702474c6361245b6b199e6e9783febacdbfb6b002669e6cb3ef17a09"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f69e6199fec0f58f9a89afbbaea78d637c7ce77f656a03a1d6ea6abdc1d44f8"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:41dfea282844d0628279b4db2929da0dacb8ac317ddc5dcccc30093cf16357c1"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:2dd03477feefeccda07b7659dd614f6738cfc4f9b6779dd61b262a73b0a9a178"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:5efe035aa76ff37d1b5fa661de3c4b4944de9ff227a6c0b2e390a95c101814c0"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:ed2cf7c69102c7a0a06926d747ed855bc836f52e8d59a5d1e3adfd980d1bd165"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a0e441d4c2025110ec3eba5d54f11f78183269a10152b3a757a739ffd1bb12bf"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-win32.whl", hash = "sha256:a4a54efe17cc9f53589c748b53f28776dfdfb9bc83619685740cb7c37985ac2f"}, - {file = "rapidfuzz-2.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:bb8318116ecac4dfb84841d8b9b461f9bb0c3be5b616418387d104f72d2a16d1"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e9296c530e544f68858c3416ad1d982a1854f71e9d2d3dcedb5b216e6d54f067"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:49c4bcdb9238f11f8c4eba1b898937f09b92280d6f900023a8216008f299b41a"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ebb40a279e134bb3fef099a8b58ed5beefb201033d29bdac005bddcdb004ef71"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a7381c11cb590bbd4e6f2d8779a0b34fdd2234dfa13d0211f6aee8ca166d9d05"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfdcdedfd12a0077193f2cf3626ff6722c5a184adf0d2d51f1ec984bf21c23c3"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f85bece1ec59bda8b982bd719507d468d4df746dfb1988df11d916b5e9fe19e8"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b1b393f4a1eaa6867ffac6aef58cfb04bab2b3d7d8e40b9fe2cf40dd1d384601"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53de456ef020a77bf9d7c6c54860a48e2e902584d55d3001766140ac45c54bc7"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2492330bc38b76ed967eab7bdaea63a89b6ceb254489e2c65c3824efcbf72993"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:099e4c6befaa8957a816bdb67ce664871f10aaec9bebf2f61368cf7e0869a7a1"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:46599b2ad4045dd3f794a24a6db1e753d23304699d4984462cf1ead02a51ddf3"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:591f19d16758a3c55c9d7a0b786b40d95599a5b244d6eaef79c7a74fcf5104d8"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ed17359061840eb249f8d833cb213942e8299ffc4f67251a6ed61833a9f2ea20"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-win32.whl", hash = "sha256:aa1e5aad325168e29bf8e17006479b97024aa9d2fdbe12062bd2f8f09080acf8"}, - {file = "rapidfuzz-2.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:c2bb68832b140c551dbed691290bef4ee6719d4e8ce1b7226a3736f61a9d1a83"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:3fac40972cf7b6c14dded88ae2331eb50dfbc278aa9195473ef6fc6bfe49f686"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f0e456cbdc0abf39352800309dab82fd3251179fa0ff6573fa117f51f4e84be8"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:22b9d22022b9d09fd4ece15102270ab9b6a5cfea8b6f6d1965c1df7e3783f5ff"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:46754fe404a9a6f5cbf7abe02d74af390038d94c9b8c923b3f362467606bfa28"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:91abb8bf7610efe326394adc1d45e1baca8f360e74187f3fa0ef3df80cdd3ba6"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e40a2f60024f9d3c15401e668f732800114a023f3f8d8c40f1521a62081ff054"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a48ee83916401ac73938526d7bd804e01d2a8fe61809df7f1577b0b3b31049a3"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c71580052f9dbac443c02f60484e5a2e5f72ad4351b84b2009fbe345b1f38422"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:82b86d5b8c1b9bcbc65236d75f81023c78d06a721c3e0229889ff4ed5c858169"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:fc4528b7736e5c30bc954022c2cf410889abc19504a023abadbc59cdf9f37cae"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e1e0e569108a5760d8f01d0f2148dd08cc9a39ead79fbefefca9e7c7723c7e88"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:94e1c97f0ad45b05003806f8a13efc1fc78983e52fa2ddb00629003acf4676ef"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:47e81767a962e41477a85ad7ac937e34d19a7d2a80be65614f008a5ead671c56"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-win32.whl", hash = "sha256:79fc574aaf2d7c27ec1022e29c9c18f83cdaf790c71c05779528901e0caad89b"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:f3dd4bcef2d600e0aa121e19e6e62f6f06f22a89f82ef62755e205ce14727874"}, - {file = "rapidfuzz-2.15.1-cp39-cp39-win_arm64.whl", hash = "sha256:cac095cbdf44bc286339a77214bbca6d4d228c9ebae3da5ff6a80aaeb7c35634"}, - {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b89d1126be65c85763d56e3b47d75f1a9b7c5529857b4d572079b9a636eaa8a7"}, - {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19b7460e91168229768be882ea365ba0ac7da43e57f9416e2cfadc396a7df3c2"}, - {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93c33c03e7092642c38f8a15ca2d8fc38da366f2526ec3b46adf19d5c7aa48ba"}, - {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:040faca2e26d9dab5541b45ce72b3f6c0e36786234703fc2ac8c6f53bb576743"}, - {file = "rapidfuzz-2.15.1-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:6e2a3b23e1e9aa13474b3c710bba770d0dcc34d517d3dd6f97435a32873e3f28"}, - {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:2e597b9dfd6dd180982684840975c458c50d447e46928efe3e0120e4ec6f6686"}, - {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d14752c9dd2036c5f36ebe8db5f027275fa7d6b3ec6484158f83efb674bab84e"}, - {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:558224b6fc6124d13fa32d57876f626a7d6188ba2a97cbaea33a6ee38a867e31"}, - {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c89cfa88dc16fd8c9bcc0c7f0b0073f7ef1e27cceb246c9f5a3f7004fa97c4d"}, - {file = "rapidfuzz-2.15.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:509c5b631cd64df69f0f011893983eb15b8be087a55bad72f3d616b6ae6a0f96"}, - {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0f73a04135a03a6e40393ecd5d46a7a1049d353fc5c24b82849830d09817991f"}, - {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c99d53138a2dfe8ada67cb2855719f934af2733d726fbf73247844ce4dd6dd5"}, - {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f01fa757f0fb332a1f045168d29b0d005de6c39ee5ce5d6c51f2563bb53c601b"}, - {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60368e1add6e550faae65614844c43f8a96e37bf99404643b648bf2dba92c0fb"}, - {file = "rapidfuzz-2.15.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:785744f1270828cc632c5a3660409dee9bcaac6931a081bae57542c93e4d46c4"}, - {file = "rapidfuzz-2.15.1.tar.gz", hash = "sha256:d62137c2ca37aea90a11003ad7dc109c8f1739bfbe5a9a217f3cdb07d7ac00f6"}, -] - -[package.extras] -full = ["numpy"] - -[[package]] -name = "requests" -version = "2.29.0" -description = "Python HTTP for Humans." -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "requests-2.29.0-py3-none-any.whl", hash = "sha256:e8f3c9be120d3333921d213eef078af392fba3933ab7ed2d1cba3b56f2568c3b"}, - {file = "requests-2.29.0.tar.gz", hash = "sha256:f2e34a75f4749019bb0e3effb66683630e4ffeaf75819fb51bebef1bf5aef059"}, -] - -[package.dependencies] -certifi = ">=2017.4.17" -charset-normalizer = ">=2,<4" -idna = ">=2.5,<4" -urllib3 = ">=1.21.1,<1.27" - -[package.extras] -socks = ["PySocks (>=1.5.6,!=1.5.7)"] -use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] - -[[package]] -name = "requests-toolbelt" -version = "0.10.1" -description = "A utility belt for advanced users of python-requests" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "requests-toolbelt-0.10.1.tar.gz", hash = "sha256:62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d"}, - {file = "requests_toolbelt-0.10.1-py2.py3-none-any.whl", hash = "sha256:18565aa58116d9951ac39baa288d3adb5b3ff975c4f25eee78555d89e8f247f7"}, -] - -[package.dependencies] -requests = ">=2.0.1,<3.0.0" - -[[package]] -name = "secretstorage" -version = "3.3.3" -description = "Python bindings to FreeDesktop.org Secret Service API" -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "SecretStorage-3.3.3-py3-none-any.whl", hash = "sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99"}, - {file = "SecretStorage-3.3.3.tar.gz", hash = "sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77"}, -] - -[package.dependencies] -cryptography = ">=2.0" -jeepney = ">=0.6" - -[[package]] -name = "setuptools" -version = "67.7.2" -description = "Easily download, build, install, upgrade, and uninstall Python packages" -category = "dev" -optional = false -python-versions = ">=3.7" -files = [ - {file = "setuptools-67.7.2-py3-none-any.whl", hash = "sha256:23aaf86b85ca52ceb801d32703f12d77517b2556af839621c641fca11287952b"}, - {file = "setuptools-67.7.2.tar.gz", hash = "sha256:f104fa03692a2602fa0fec6c6a9e63b6c8a968de13e17c026957dd1f53d80990"}, -] - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] -testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] -testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] - -[[package]] -name = "shellingham" -version = "1.5.0.post1" -description = "Tool to Detect Surrounding Shell" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "shellingham-1.5.0.post1-py2.py3-none-any.whl", hash = "sha256:368bf8c00754fd4f55afb7bbb86e272df77e4dc76ac29dbcbb81a59e9fc15744"}, - {file = "shellingham-1.5.0.post1.tar.gz", hash = "sha256:823bc5fb5c34d60f285b624e7264f4dda254bc803a3774a147bf99c0e3004a28"}, -] - -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" -files = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] - -[[package]] -name = "tomli" -version = "2.0.1" -description = "A lil' TOML parser" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, -] - -[[package]] -name = "tomlkit" -version = "0.11.8" -description = "Style preserving TOML library" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tomlkit-0.11.8-py3-none-any.whl", hash = "sha256:8c726c4c202bdb148667835f68d68780b9a003a9ec34167b6c673b38eff2a171"}, - {file = "tomlkit-0.11.8.tar.gz", hash = "sha256:9330fc7faa1db67b541b28e62018c17d20be733177d290a13b24c62d1614e0c3"}, -] - -[[package]] -name = "trove-classifiers" -version = "2023.4.29" -description = "Canonical source for classifiers on PyPI (pypi.org)." -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "trove-classifiers-2023.4.29.tar.gz", hash = "sha256:8adcc06f1eb7c495f0bdceb698bd9c044b3e57b0d5767d99ec4b6b17c9bbe957"}, - {file = "trove_classifiers-2023.4.29-py3-none-any.whl", hash = "sha256:c27d168cd341325fb75338ce46e1c4a2f2179b0ff3df3733190ee3662a25a4fa"}, -] - -[[package]] -name = "typed-ast" -version = "1.5.4" -description = "a fork of Python 2 and 3 ast modules with type comment support" -category = "dev" -optional = false -python-versions = ">=3.6" -files = [ - {file = "typed_ast-1.5.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:669dd0c4167f6f2cd9f57041e03c3c2ebf9063d0757dc89f79ba1daa2bfca9d4"}, - {file = "typed_ast-1.5.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:211260621ab1cd7324e0798d6be953d00b74e0428382991adfddb352252f1d62"}, - {file = "typed_ast-1.5.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:267e3f78697a6c00c689c03db4876dd1efdfea2f251a5ad6555e82a26847b4ac"}, - {file = "typed_ast-1.5.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c542eeda69212fa10a7ada75e668876fdec5f856cd3d06829e6aa64ad17c8dfe"}, - {file = "typed_ast-1.5.4-cp310-cp310-win_amd64.whl", hash = "sha256:a9916d2bb8865f973824fb47436fa45e1ebf2efd920f2b9f99342cb7fab93f72"}, - {file = "typed_ast-1.5.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:79b1e0869db7c830ba6a981d58711c88b6677506e648496b1f64ac7d15633aec"}, - {file = "typed_ast-1.5.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a94d55d142c9265f4ea46fab70977a1944ecae359ae867397757d836ea5a3f47"}, - {file = "typed_ast-1.5.4-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:183afdf0ec5b1b211724dfef3d2cad2d767cbefac291f24d69b00546c1837fb6"}, - {file = "typed_ast-1.5.4-cp36-cp36m-win_amd64.whl", hash = "sha256:639c5f0b21776605dd6c9dbe592d5228f021404dafd377e2b7ac046b0349b1a1"}, - {file = "typed_ast-1.5.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cf4afcfac006ece570e32d6fa90ab74a17245b83dfd6655a6f68568098345ff6"}, - {file = "typed_ast-1.5.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed855bbe3eb3715fca349c80174cfcfd699c2f9de574d40527b8429acae23a66"}, - {file = "typed_ast-1.5.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6778e1b2f81dfc7bc58e4b259363b83d2e509a65198e85d5700dfae4c6c8ff1c"}, - {file = "typed_ast-1.5.4-cp37-cp37m-win_amd64.whl", hash = "sha256:0261195c2062caf107831e92a76764c81227dae162c4f75192c0d489faf751a2"}, - {file = "typed_ast-1.5.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2efae9db7a8c05ad5547d522e7dbe62c83d838d3906a3716d1478b6c1d61388d"}, - {file = "typed_ast-1.5.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7d5d014b7daa8b0bf2eaef684295acae12b036d79f54178b92a2b6a56f92278f"}, - {file = "typed_ast-1.5.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:370788a63915e82fd6f212865a596a0fefcbb7d408bbbb13dea723d971ed8bdc"}, - {file = "typed_ast-1.5.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4e964b4ff86550a7a7d56345c7864b18f403f5bd7380edf44a3c1fb4ee7ac6c6"}, - {file = "typed_ast-1.5.4-cp38-cp38-win_amd64.whl", hash = "sha256:683407d92dc953c8a7347119596f0b0e6c55eb98ebebd9b23437501b28dcbb8e"}, - {file = "typed_ast-1.5.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4879da6c9b73443f97e731b617184a596ac1235fe91f98d279a7af36c796da35"}, - {file = "typed_ast-1.5.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3e123d878ba170397916557d31c8f589951e353cc95fb7f24f6bb69adc1a8a97"}, - {file = "typed_ast-1.5.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebd9d7f80ccf7a82ac5f88c521115cc55d84e35bf8b446fcd7836eb6b98929a3"}, - {file = "typed_ast-1.5.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98f80dee3c03455e92796b58b98ff6ca0b2a6f652120c263efdba4d6c5e58f72"}, - {file = "typed_ast-1.5.4-cp39-cp39-win_amd64.whl", hash = "sha256:0fdbcf2fef0ca421a3f5912555804296f0b0960f0418c440f5d6d3abb549f3e1"}, - {file = "typed_ast-1.5.4.tar.gz", hash = "sha256:39e21ceb7388e4bb37f4c679d72707ed46c2fbf2a5609b8b8ebc4b067d977df2"}, -] - -[[package]] -name = "types-html5lib" -version = "1.1.11.13" -description = "Typing stubs for html5lib" -category = "dev" -optional = false -python-versions = "*" -files = [ - {file = "types-html5lib-1.1.11.13.tar.gz", hash = "sha256:2a5ced934bcc7b47800b88ddb2541bbdf5bded7fb6d421693c978228e1fe631d"}, - {file = "types_html5lib-1.1.11.13-py3-none-any.whl", hash = "sha256:d01603307f3bb39af9712e72eda5aa498420fe12179411533a54b2b03f6531eb"}, -] - -[[package]] -name = "types-jsonschema" -version = "4.17.0.7" -description = "Typing stubs for jsonschema" -category = "dev" -optional = false -python-versions = "*" -files = [ - {file = "types-jsonschema-4.17.0.7.tar.gz", hash = "sha256:130e57c5f1ca755f95775d0822ad7a3907294e1461306af54baf804f317fd54c"}, - {file = "types_jsonschema-4.17.0.7-py3-none-any.whl", hash = "sha256:e129b52be6df841d97a98f087631dd558f7812eb91ff7b733c3301bd2446271b"}, -] - -[[package]] -name = "types-requests" -version = "2.29.0.0" -description = "Typing stubs for requests" -category = "dev" -optional = false -python-versions = "*" -files = [ - {file = "types-requests-2.29.0.0.tar.gz", hash = "sha256:c86f4a955d943d2457120dbe719df24ef0924e11177164d10a0373cf311d7b4d"}, - {file = "types_requests-2.29.0.0-py3-none-any.whl", hash = "sha256:4cf6e323e856c779fbe8815bb977a5bf5d6c5034713e4c17ff2a9a20610f5b27"}, -] - -[package.dependencies] -types-urllib3 = "<1.27" - -[[package]] -name = "types-urllib3" -version = "1.26.25.12" -description = "Typing stubs for urllib3" -category = "dev" -optional = false -python-versions = "*" -files = [ - {file = "types-urllib3-1.26.25.12.tar.gz", hash = "sha256:a1557355ce8d350a555d142589f3001903757d2d36c18a66f588d9659bbc917d"}, - {file = "types_urllib3-1.26.25.12-py3-none-any.whl", hash = "sha256:3ba3d3a8ee46e0d5512c6bd0594da4f10b2584b47a470f8422044a2ab462f1df"}, -] - -[[package]] -name = "typing-extensions" -version = "4.5.0" -description = "Backported and Experimental Type Hints for Python 3.7+" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "typing_extensions-4.5.0-py3-none-any.whl", hash = "sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4"}, - {file = "typing_extensions-4.5.0.tar.gz", hash = "sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb"}, -] - -[[package]] -name = "urllib3" -version = "1.26.15" -description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" -files = [ - {file = "urllib3-1.26.15-py2.py3-none-any.whl", hash = "sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42"}, - {file = "urllib3-1.26.15.tar.gz", hash = "sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305"}, -] - -[package.extras] -brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] -secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] - -[[package]] -name = "virtualenv" -version = "20.16.5" -description = "Virtual Python Environment builder" -category = "main" -optional = false -python-versions = ">=3.6" -files = [ - {file = "virtualenv-20.16.5-py3-none-any.whl", hash = "sha256:d07dfc5df5e4e0dbc92862350ad87a36ed505b978f6c39609dc489eadd5b0d27"}, - {file = "virtualenv-20.16.5.tar.gz", hash = "sha256:227ea1b9994fdc5ea31977ba3383ef296d7472ea85be9d6732e42a91c04e80da"}, -] - -[package.dependencies] -distlib = ">=0.3.5,<1" -filelock = ">=3.4.1,<4" -platformdirs = ">=2.4,<3" - -[package.extras] -docs = ["proselint (>=0.13)", "sphinx (>=5.1.1)", "sphinx-argparse (>=0.3.1)", "sphinx-rtd-theme (>=1)", "towncrier (>=21.9)"] -testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"] - -[[package]] -name = "virtualenv" -version = "20.21.1" -description = "Virtual Python Environment builder" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "virtualenv-20.21.1-py3-none-any.whl", hash = "sha256:09ddbe1af0c8ed2bb4d6ed226b9e6415718ad18aef9fa0ba023d96b7a8356049"}, - {file = "virtualenv-20.21.1.tar.gz", hash = "sha256:4c104ccde994f8b108163cf9ba58f3d11511d9403de87fb9b4f52bf33dbc8668"}, -] - -[package.dependencies] -distlib = ">=0.3.6,<1" -filelock = ">=3.4.1,<4" -importlib-metadata = {version = ">=4.8.3", markers = "python_version < \"3.8\""} -platformdirs = ">=2.4,<4" - -[package.extras] -docs = ["furo (>=2023.3.27)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"] -test = ["covdefaults (>=2.3)", "coverage (>=7.2.3)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.3.1)", "pytest-env (>=0.8.1)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.10)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)"] - -[[package]] -name = "webencodings" -version = "0.5.1" -description = "Character encoding aliases for legacy web content" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, - {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, -] - -[[package]] -name = "xattr" -version = "0.10.1" -description = "Python wrapper for extended filesystem attributes" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "xattr-0.10.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:16a660a883e703b311d1bbbcafc74fa877585ec081cd96e8dd9302c028408ab1"}, - {file = "xattr-0.10.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:1e2973e72faa87ca29d61c23b58c3c89fe102d1b68e091848b0e21a104123503"}, - {file = "xattr-0.10.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:13279fe8f7982e3cdb0e088d5cb340ce9cbe5ef92504b1fd80a0d3591d662f68"}, - {file = "xattr-0.10.1-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:1dc9b9f580ef4b8ac5e2c04c16b4d5086a611889ac14ecb2e7e87170623a0b75"}, - {file = "xattr-0.10.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:485539262c2b1f5acd6b6ea56e0da2bc281a51f74335c351ea609c23d82c9a79"}, - {file = "xattr-0.10.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:295b3ab335fcd06ca0a9114439b34120968732e3f5e9d16f456d5ec4fa47a0a2"}, - {file = "xattr-0.10.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:a126eb38e14a2f273d584a692fe36cff760395bf7fc061ef059224efdb4eb62c"}, - {file = "xattr-0.10.1-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:b0e919c24f5b74428afa91507b15e7d2ef63aba98e704ad13d33bed1288dca81"}, - {file = "xattr-0.10.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:e31d062cfe1aaeab6ba3db6bd255f012d105271018e647645941d6609376af18"}, - {file = "xattr-0.10.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:209fb84c09b41c2e4cf16dd2f481bb4a6e2e81f659a47a60091b9bcb2e388840"}, - {file = "xattr-0.10.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c4120090dac33eddffc27e487f9c8f16b29ff3f3f8bcb2251b2c6c3f974ca1e1"}, - {file = "xattr-0.10.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3e739d624491267ec5bb740f4eada93491de429d38d2fcdfb97b25efe1288eca"}, - {file = "xattr-0.10.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2677d40b95636f3482bdaf64ed9138fb4d8376fb7933f434614744780e46e42d"}, - {file = "xattr-0.10.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40039f1532c4456fd0f4c54e9d4e01eb8201248c321c6c6856262d87e9a99593"}, - {file = "xattr-0.10.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:148466e5bb168aba98f80850cf976e931469a3c6eb11e9880d9f6f8b1e66bd06"}, - {file = "xattr-0.10.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0aedf55b116beb6427e6f7958ccd80a8cbc80e82f87a4cd975ccb61a8d27b2ee"}, - {file = "xattr-0.10.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c3024a9ff157247c8190dd0eb54db4a64277f21361b2f756319d9d3cf20e475f"}, - {file = "xattr-0.10.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f1be6e733e9698f645dbb98565bb8df9b75e80e15a21eb52787d7d96800e823b"}, - {file = "xattr-0.10.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:7880c8a54c18bc091a4ce0adc5c6d81da1c748aec2fe7ac586d204d6ec7eca5b"}, - {file = "xattr-0.10.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:89c93b42c3ba8aedbc29da759f152731196c2492a2154371c0aae3ef8ba8301b"}, - {file = "xattr-0.10.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:6b905e808df61b677eb972f915f8a751960284358b520d0601c8cbc476ba2df6"}, - {file = "xattr-0.10.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d1ef954d0655f93a34d07d0cc7e02765ec779ff0b59dc898ee08c6326ad614d5"}, - {file = "xattr-0.10.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:199b20301b6acc9022661412346714ce764d322068ef387c4de38062474db76c"}, - {file = "xattr-0.10.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec0956a8ab0f0d3f9011ba480f1e1271b703d11542375ef73eb8695a6bd4b78b"}, - {file = "xattr-0.10.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ffcb57ca1be338d69edad93cf59aac7c6bb4dbb92fd7bf8d456c69ea42f7e6d2"}, - {file = "xattr-0.10.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1f0563196ee54756fe2047627d316977dc77d11acd7a07970336e1a711e934db"}, - {file = "xattr-0.10.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fc354f086f926a1c7f04886f97880fed1a26d20e3bc338d0d965fd161dbdb8ab"}, - {file = "xattr-0.10.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c0cd2d02ef2fb45ecf2b0da066a58472d54682c6d4f0452dfe7ae2f3a76a42ea"}, - {file = "xattr-0.10.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:49626096ddd72dcc1654aadd84b103577d8424f26524a48d199847b5d55612d0"}, - {file = "xattr-0.10.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ceaa26bef8fcb17eb59d92a7481c2d15d20211e217772fb43c08c859b01afc6a"}, - {file = "xattr-0.10.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8c014c371391f28f8cd27d73ea59f42b30772cd640b5a2538ad4f440fd9190b"}, - {file = "xattr-0.10.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:46c32cd605673606b9388a313b0050ee7877a0640d7561eea243ace4fa2cc5a6"}, - {file = "xattr-0.10.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:772b22c4ff791fe5816a7c2a1c9fcba83f9ab9bea138eb44d4d70f34676232b4"}, - {file = "xattr-0.10.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:183ad611a2d70b5a3f5f7aadef0fcef604ea33dcf508228765fd4ddac2c7321d"}, - {file = "xattr-0.10.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8068df3ebdfa9411e58d5ae4a05d807ec5994645bb01af66ec9f6da718b65c5b"}, - {file = "xattr-0.10.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bc40570155beb85e963ae45300a530223d9822edfdf09991b880e69625ba38a"}, - {file = "xattr-0.10.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:436e1aaf23c07e15bed63115f1712d2097e207214fc6bcde147c1efede37e2c5"}, - {file = "xattr-0.10.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7298455ccf3a922d403339781b10299b858bb5ec76435445f2da46fb768e31a5"}, - {file = "xattr-0.10.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:986c2305c6c1a08f78611eb38ef9f1f47682774ce954efb5a4f3715e8da00d5f"}, - {file = "xattr-0.10.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:5dc6099e76e33fa3082a905fe59df766b196534c705cf7a2e3ad9bed2b8a180e"}, - {file = "xattr-0.10.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:042ad818cda6013162c0bfd3816f6b74b7700e73c908cde6768da824686885f8"}, - {file = "xattr-0.10.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:9d4c306828a45b41b76ca17adc26ac3dc00a80e01a5ba85d71df2a3e948828f2"}, - {file = "xattr-0.10.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a606280b0c9071ef52572434ecd3648407b20df3d27af02c6592e84486b05894"}, - {file = "xattr-0.10.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5b49d591cf34cda2079fd7a5cb2a7a1519f54dc2e62abe3e0720036f6ed41a85"}, - {file = "xattr-0.10.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b8705ac6791426559c1a5c2b88bb2f0e83dc5616a09b4500899bfff6a929302"}, - {file = "xattr-0.10.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a5ea974930e876bc5c146f54ac0f85bb39b7b5de2b6fc63f90364712ae368ebe"}, - {file = "xattr-0.10.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f55a2dd73a12a1ae5113c5d9cd4b4ab6bf7950f4d76d0a1a0c0c4264d50da61d"}, - {file = "xattr-0.10.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:475c38da0d3614cc5564467c4efece1e38bd0705a4dbecf8deeb0564a86fb010"}, - {file = "xattr-0.10.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:925284a4a28e369459b2b7481ea22840eed3e0573a4a4c06b6b0614ecd27d0a7"}, - {file = "xattr-0.10.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa32f1b45fed9122bed911de0fcc654da349e1f04fa4a9c8ef9b53e1cc98b91e"}, - {file = "xattr-0.10.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c5d3d0e728bace64b74c475eb4da6148cd172b2d23021a1dcd055d92f17619ac"}, - {file = "xattr-0.10.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8faaacf311e2b5cc67c030c999167a78a9906073e6abf08eaa8cf05b0416515c"}, - {file = "xattr-0.10.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:cc6b8d5ca452674e1a96e246a3d2db5f477aecbc7c945c73f890f56323e75203"}, - {file = "xattr-0.10.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3725746a6502f40f72ef27e0c7bfc31052a239503ff3eefa807d6b02a249be22"}, - {file = "xattr-0.10.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:789bd406d1aad6735e97b20c6d6a1701e1c0661136be9be862e6a04564da771f"}, - {file = "xattr-0.10.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9a7a807ab538210ff8532220d8fc5e2d51c212681f63dbd4e7ede32543b070f"}, - {file = "xattr-0.10.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3e5825b5fc99ecdd493b0cc09ec35391e7a451394fdf623a88b24726011c950d"}, - {file = "xattr-0.10.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:80638d1ce7189dc52f26c234cee3522f060fadab6a8bc3562fe0ddcbe11ba5a4"}, - {file = "xattr-0.10.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3ff0dbe4a6ce2ce065c6de08f415bcb270ecfd7bf1655a633ddeac695ce8b250"}, - {file = "xattr-0.10.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5267e5f9435c840d2674194150b511bef929fa7d3bc942a4a75b9eddef18d8d8"}, - {file = "xattr-0.10.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b27dfc13b193cb290d5d9e62f806bb9a99b00cd73bb6370d556116ad7bb5dc12"}, - {file = "xattr-0.10.1-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:636ebdde0277bce4d12d2ef2550885804834418fee0eb456b69be928e604ecc4"}, - {file = "xattr-0.10.1-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d60c27922ec80310b45574351f71e0dd3a139c5295e8f8b19d19c0010196544f"}, - {file = "xattr-0.10.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b34df5aad035d0343bd740a95ca30db99b776e2630dca9cc1ba8e682c9cc25ea"}, - {file = "xattr-0.10.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f24a7c04ff666d0fe905dfee0a84bc899d624aeb6dccd1ea86b5c347f15c20c1"}, - {file = "xattr-0.10.1-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a3878e1aff8eca64badad8f6d896cb98c52984b1e9cd9668a3ab70294d1ef92d"}, - {file = "xattr-0.10.1-pp38-pypy38_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4abef557028c551d59cf2fb3bf63f2a0c89f00d77e54c1c15282ecdd56943496"}, - {file = "xattr-0.10.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0e14bd5965d3db173d6983abdc1241c22219385c22df8b0eb8f1846c15ce1fee"}, - {file = "xattr-0.10.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f9be588a4b6043b03777d50654c6079af3da60cc37527dbb80d36ec98842b1e"}, - {file = "xattr-0.10.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bc4ae264aa679aacf964abf3ea88e147eb4a22aea6af8c6d03ebdebd64cfd6"}, - {file = "xattr-0.10.1-pp39-pypy39_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:827b5a97673b9997067fde383a7f7dc67342403093b94ea3c24ae0f4f1fec649"}, - {file = "xattr-0.10.1.tar.gz", hash = "sha256:c12e7d81ffaa0605b3ac8c22c2994a8e18a9cf1c59287a1b7722a2289c952ec5"}, -] - -[package.dependencies] -cffi = ">=1.0" - -[[package]] -name = "zipp" -version = "3.15.0" -description = "Backport of pathlib-compatible object wrapper for zip files" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"}, - {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"}, -] - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] - -[metadata] -lock-version = "2.0" -python-versions = "^3.7" -content-hash = "c1c21f02e493ffbfd622bec8546c83edad08325b957851dd3f9a287867ce24a4" diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml deleted file mode 100644 index 463cc513ff642..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ /dev/null @@ -1,198 +0,0 @@ -[tool.poetry] -name = "poetry" -version = "1.3.2" -description = "Python dependency management and packaging made easy." -authors = [ - "Sébastien Eustace <sebastien@eustace.io>", -] -maintainers = [ - "Arun Babu Neelicattu <arun.neelicattu@gmail.com>", - "Bjorn Neergaard <bjorn@neersighted.com>", - "Branch Vincent <branchevincent@gmail.com>", - "Bryce Drennan <github@accounts.brycedrennan.com>", - "Daniel Eades <danieleades@hotmail.com>", - "Randy Döring <radoering.poetry@gmail.com>", - "Steph Samson <hello@stephsamson.com>", - "finswimmer <finswimmer77@gmail.com>", -] -license = "MIT" - -readme = "README.md" - -packages = [ - { include = "poetry", from = "src" } -] -include = [ - { path = "tests", format = "sdist" } -] - -homepage = "https://python-poetry.org/" -repository = "https://github.com/python-poetry/poetry" -documentation = "https://python-poetry.org/docs" - -keywords = ["packaging", "dependency", "poetry"] - -classifiers = [ - "Topic :: Software Development :: Build Tools", - "Topic :: Software Development :: Libraries :: Python Modules" -] - -[tool.poetry.urls] -Changelog = "https://python-poetry.org/history/" - -[tool.poetry.build] -generate-setup-file = false - -# Requirements -[tool.poetry.dependencies] -python = "^3.7" - -poetry-core = "1.4.0" -poetry-plugin-export = "^1.2.0" -"backports.cached-property" = { version = "^1.0.2", python = "<3.8" } -cachecontrol = { version = "^0.12.9", extras = ["filecache"] } -cleo = "^2.0.0" -crashtest = "^0.4.1" -dulwich = "^0.20.46" -filelock = "^3.8.0" -html5lib = "^1.0" -importlib-metadata = { version = "^4.4", python = "<3.10" } -jsonschema = "^4.10.0" -keyring = "^23.9.0" -# packaging uses calver, so version is unclamped -packaging = ">=20.4" -pexpect = "^4.7.0" -pkginfo = "^1.5" -platformdirs = "^2.5.2" -requests = "^2.18" -requests-toolbelt = ">=0.9.1,<0.11.0" -shellingham = "^1.5" -tomli = { version = "^2.0.1", python = "<3.11" } -# exclude 0.11.2 and 0.11.3 due to https://github.com/sdispater/tomlkit/issues/225 -tomlkit = ">=0.11.1,<1.0.0,!=0.11.2,!=0.11.3" -# trove-classifiers uses calver, so version is unclamped -trove-classifiers = ">=2022.5.19" -# exclude 20.4.5 - 20.4.6 due to https://github.com/pypa/pip/issues/9953 -virtualenv = [ - { version = "^20.4.3,!=20.4.5,!=20.4.6", markers = "sys_platform != 'win32' or python_version != '3.9'" }, - # see https://github.com/python-poetry/poetry/pull/6950 for details - { version = "^20.4.3,!=20.4.5,!=20.4.6,<20.16.6", markers = "sys_platform == 'win32' and python_version == '3.9'" }, -] -xattr = { version = "^0.10.0", markers = "sys_platform == 'darwin'" } -urllib3 = "^1.26.0" - -[tool.poetry.group.dev.dependencies] -pre-commit = "^2.6" - -[tool.poetry.group.test.dependencies] -# Cachy frozen to test backwards compatibility for `poetry.utils.cache`. -cachy = "0.3.0" -deepdiff = "^5.0" -flatdict = "^4.0.1" -httpretty = "^1.0" -pytest = "^7.1" -pytest-cov = "^4.0" -pytest-mock = "^3.9" -pytest-randomly = "^3.12" -pytest-xdist = { version = "^2.5", extras = ["psutil"] } -zipp = { version = "^3.4", python = "<3.8" } - -[tool.poetry.group.typing.dependencies] -mypy = ">=0.990" -types-html5lib = ">=1.1.9" -types-jsonschema = ">=4.9.0" -types-requests = ">=2.28.8" -typing-extensions = { version = "^4.0.0", python = "<3.8" } - -# only used in github actions -[tool.poetry.group.github-actions] -optional = true -[tool.poetry.group.github-actions.dependencies] -pytest-github-actions-annotate-failures = "^0.1.7" - - -[tool.poetry.scripts] -poetry = "poetry.console.application:main" - - -[build-system] -requires = ["poetry-core>=1.1.0"] -build-backend = "poetry.core.masonry.api" - - -[tool.isort] -py_version = 37 -profile = "black" -force_single_line = true -combine_as_imports = true -lines_between_types = 1 -lines_after_imports = 2 -src_paths = ["src", "tests"] -extend_skip = ["setup.py"] -known_third_party = ["poetry.core"] - - -[tool.black] -target-version = ['py37'] -preview = true -force-exclude = ''' -.*/setup\.py$ -''' - - -[tool.mypy] -files = "src" -mypy_path = "src" -namespace_packages = true -explicit_package_bases = true -show_error_codes = true -strict = true -enable_error_code = [ - "ignore-without-code", - "redundant-expr", - "truthy-bool", -] - -# use of importlib-metadata backport at python3.7 makes it impossible to -# satisfy mypy without some ignores: but we get a different set of ignores at -# different python versions. -# -# <https://github.com/python/mypy/issues/8823>, meanwhile suppress that -# warning. -[[tool.mypy.overrides]] -module = [ - 'poetry.console.commands.self.show.plugins', - 'poetry.installation.executor', - 'poetry.mixology.version_solver', - 'poetry.plugins.plugin_manager', - 'poetry.repositories.installed_repository', - 'poetry.utils.env', -] -warn_unused_ignores = false - -[[tool.mypy.overrides]] -module = [ - 'cachecontrol.*', - 'lockfile.*', - 'pexpect.*', - 'pkginfo.*', - 'requests_toolbelt.*', - 'shellingham.*', - 'virtualenv.*', - 'xattr.*', -] -ignore_missing_imports = true - - -[tool.pytest.ini_options] -addopts = "-n auto" -testpaths = [ - "tests" -] - - -[tool.coverage.report] -exclude_lines = [ - "pragma: no cover", - "if TYPE_CHECKING:" -] diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json deleted file mode 100644 index 049ba40b4780b..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "owner": "python-poetry", - "repo": "poetry", - "rev": "1.3.0", - "sha256": "16ng59ykm7zkjizmwb482y0hawpjjr5mvl0ahjd790xzxcc2bbbv", - "fetchSubmodules": true -} - diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix b/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix deleted file mode 100644 index 1c78904b62487..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/plugins.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ pkgs, lib }: -let - inherit (pkgs) stdenv; - - mkPluginDrv = - { self - , plugins - , drv - , postInstall ? "" - , nativeBuildInputs ? [ ] - , buildInputs ? [ ] - }: - let - env = self.python.withPackages (ps: plugins); - in - stdenv.mkDerivation { - pname = drv.pname + "-with-plugins"; - - inherit (drv) src version meta; - - buildInputs = drv.buildInputs ++ drv.propagatedBuildInputs ++ buildInputs; - nativeBuildInputs = builtins.filter (x: x.name != "python-output-dist-hook") (drv.nativeBuildInputs ++ nativeBuildInputs); - - dontConfigure = true; - dontBuild = true; - dontUsePythonRecompileBytecode = true; - - passthru = { - inherit (drv.passthru) withPlugins; - inherit plugins; - }; - - # Link bin/ from environment, but only if it's in a plugin - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - for bindir in ${lib.concatStringsSep " " (map (d: "${lib.getBin d}/bin") plugins)}; do - for bin in $bindir/*; do - ln -s ${env}/bin/$(basename $bin) $out/bin/ - done - done - - runHook postInstall - ''; - - inherit postInstall; - }; - -in -{ - - # Provide the `withPlugins` function - toPluginAble = self: { drv - , finalDrv - , postInstall ? "" - , nativeBuildInputs ? [ ] - , buildInputs ? [ ] - }: drv.overridePythonAttrs (old: { - passthru = old.passthru // { - withPlugins = pluginFn: mkPluginDrv { - plugins = [ finalDrv ] ++ pluginFn self; - inherit self postInstall nativeBuildInputs buildInputs; - drv = finalDrv; - }; - }; - }); - -} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix deleted file mode 100644 index 0ef1d4c316ac4..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib, ireplace }: -let - inherit (builtins) elemAt match; - operators = - let - matchWildCard = s: match "([^*])(\\.[*])" s; - mkComparison = ret: version: v: builtins.compareVersions version v == ret; - mkIdxComparison = idx: version: v: - let - ver = builtins.splitVersion v; - minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); - upper = builtins.concatStringsSep "." (ireplace idx minor ver); - in - operators.">=" version v && operators."<" version upper; - dropWildcardPrecision = f: version: constraint: - let - m = matchWildCard constraint; - hasWildcard = m != null; - c = if hasWildcard then (elemAt m 0) else constraint; - v = - if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) - else version; - in - f v c; - in - { - # Prefix operators - "==" = dropWildcardPrecision (mkComparison 0); - ">" = dropWildcardPrecision (mkComparison 1); - "<" = dropWildcardPrecision (mkComparison (-1)); - "!=" = v: c: ! operators."==" v c; - ">=" = v: c: operators."==" v c || operators.">" v c; - "<=" = v: c: operators."==" v c || operators."<" v c; - # Semver specific operators - "~" = mkIdxComparison 1; - "^" = mkIdxComparison 0; - "~=" = v: c: - let - # Prune constraint - parts = builtins.splitVersion c; - pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); - upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); - in - operators.">=" v c && operators."<" v upperConstraint; - # Infix operators - "-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu; - # Arbitrary equality clause, just run simple comparison - "===" = v: c: v == c; - # - }; - re = { - operators = "([=><!~^]+)"; - version = "([0-9.*x]+)"; - }; - parseConstraint = constraint: - let - constraintStr = builtins.replaceStrings [ " " ] [ "" ] constraint; - # The common prefix operators - mPre = match "${re.operators} *${re.version}" constraintStr; - # There is also an infix operator to match ranges - mIn = match "${re.version} *(-) *${re.version}" constraintStr; - in - ( - if mPre != null then { - op = elemAt mPre 0; - v = elemAt mPre 1; - } - # Infix operators are range matches - else if mIn != null then { - op = elemAt mIn 1; - v = { - vl = (elemAt mIn 0); - vu = (elemAt mIn 2); - }; - } - else throw "Constraint \"${constraintStr}\" could not be parsed" - ); - satisfiesSemver = version: constraint: - let - inherit (parseConstraint constraint) op v; - in - if constraint == "*" then true else operators."${op}" version v; -in -{ inherit satisfiesSemver; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/shell-scripts.nix b/pkgs/development/tools/poetry2nix/poetry2nix/shell-scripts.nix deleted file mode 100644 index 23362a2e2376b..0000000000000 --- a/pkgs/development/tools/poetry2nix/poetry2nix/shell-scripts.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, scripts -, python -}: -let - mkScript = bin: entrypoint: - let - elem = builtins.elemAt (builtins.split ":" entrypoint); - module = elem 0; - fn = elem 2; - in - '' - cat << EOF >> $out/bin/${bin} - #!${python.interpreter} - import sys - import re - - # Insert "" to add CWD to import path - sys.path.insert(0, "") - - from ${module} import ${fn} - - if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', "", sys.argv[0]) - sys.exit(${fn}()) - EOF - chmod +x $out/bin/${bin} - ''; -in -python.pkgs.buildPythonPackage { - name = "poetry2nix-env-scripts"; - dontUnpack = true; - dontUseSetuptoolsBuild = true; - dontConfigure = true; - dontUseSetuptoolsCheck = true; - - format = "poetry2nix"; - - installPhase = '' - mkdir -p $out/bin - ${lib.concatStringsSep "\n" (lib.mapAttrsToList mkScript scripts)} - ''; -} diff --git a/pkgs/development/tools/poetry2nix/update b/pkgs/development/tools/poetry2nix/update deleted file mode 100755 index 047f7a8fea65d..0000000000000 --- a/pkgs/development/tools/poetry2nix/update +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail -pwd=$(pwd) -workdir=$(mktemp -d) - -function cleanup { - cd "$pwd" - rm -rf $workdir -} -trap cleanup EXIT - -cd "$workdir" - -curl -L -s https://github.com/nix-community/poetry2nix/archive/master.tar.gz | tar -xz -mv poetry2nix-master/* . - -mkdir build -cp *.* build/ -cp -r overrides pkgs hooks bin build/ -rm build/shell.nix build/generate.py build/overlay.nix build/flake.* build/check-fmt.nix build/pkgs/poetry/update* - -cat > build/README.md << EOF -Dont change these files here, they are maintained at https://github.com/nix-community/poetry2nix - -The update procedure is as-follows: -1. Send your change to the upstream poetry2nix repository -2. Get it approved with tests passing -3. Run the update script in pkgs/development/tools/poetry2nix -EOF - -rm -rf "$pwd/poetry2nix" -mv build "$pwd/poetry2nix" diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix index 3528d689df2f6..6a611503ff18e 100644 --- a/pkgs/development/tools/pulumictl/default.nix +++ b/pkgs/development/tools/pulumictl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.44"; + version = "0.0.45"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-7Q+1shNZ18BZ6W6CslwUZhX0LtxPdTXOSNH5VhBHFxE="; + sha256 = "sha256-DDuzJcYfa0zHqLdyoZ/Vi14+0C6ucgkmb5ndrhTlOik="; }; vendorHash = "sha256-XOgHvOaHExazQfsu1brYDq1o2fUh6dZeJlpVhCQX9ns="; diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix index 5cef44df99012..54badbaddc604 100644 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-IfcX7DLRAsBMXitEgsEOjKtiXnX4bX03Md8/14gv3aY="; + sha256 = "sha256-5+Cyw1cLgBkTePNNFoNAF2oHnLQDHr4vHiaZHJrewug="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index 81969db7771a5..8a0bbe36ab3ce 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.5.2"; + version = "0.5.3"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-PC3eHTmhjNjf3ENeP3ODrR2Ynlzg4FqJL6L8cKvD67A="; + sha256 = "sha256-cYfQ27QPdx3TA7zUZ7x0+kIr//EXL+a2APK5pnlupJM="; }; - vendorHash = "sha256-OPB/xGdaq1yv4ATrKbLcqqJj84s0cYrJdmKFHZ3EkHY="; + vendorHash = "sha256-UbzMkHpmIfJoCToAT1vOYJvqkhxSGogohT2aemegZ94="; outputs = [ "out" ] ++ bins; diff --git a/pkgs/development/tools/roswell/default.nix b/pkgs/development/tools/roswell/default.nix index 2d1b2ffa0810d..0ec1dc8fe574c 100644 --- a/pkgs/development/tools/roswell/default.nix +++ b/pkgs/development/tools/roswell/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "roswell"; - version = "22.12.14.113"; + version = "23.10.14.114"; src = fetchFromGitHub { owner = "roswell"; repo = pname; rev = "v${version}"; - hash = "sha256-tNOkZcdjwvrsleWMtcQ76KMBnssnuYQU3gqXnBVPN6w="; + hash = "sha256-70BSwRKj1WPvWxQzWPrs8ECkcVosAUaX5cK7FaDUhRc="; }; patches = [ diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 8b42bfbe85c55..15998a7520ae2 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -11,22 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.292"; + version = "0.1.3"; src = fetchFromGitHub { owner = "astral-sh"; - repo = pname; - rev = "v${version}"; - hash = "sha256-4D7p5ZMdyemDBaWcCO62bhuPPcIypegqP0YZeX+GJRQ="; + repo = "ruff"; + rev = "refs/tags/v${version}"; + hash = "sha256-AHnEvDzuQd6W+n9wXhMt6TJwoH1rZEY5UXbhFGwl8+g="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "libcst-0.1.0" = "sha256-f4lR1vf0iL6WS7yXUzWUt/tax+xjU6rylG1EgeLex88="; - "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; - }; - }; + cargoHash = "sha256-E4alnDonG45JBAKdLI2eaI+fXW2xOo21HI2UtBEVTx0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index d27f17bfac2fc..5805d605835a5 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-codspeed"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; rev = "v${version}"; - hash = "sha256-oI6IfKvX+Zn3tYPXQVxHRQymVz4bBvXfg3mcrjClbY4="; + hash = "sha256-QEqWSCqX00aMF9kM6xyClJjMiEGmscEWZu0W/MmSj2M="; }; - cargoHash = "sha256-ZZhYmyWoqZ8SbRpXCA5XsKCdeqAKAcE1NdNlrHhBiYI="; + cargoHash = "sha256-kZjQFoP5aZyVt0EcMtUUXc1wUZQxUwONMzzN6iLUAbM="; nativeBuildInputs = [ curl diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index 6b02e7b812d51..b17c6e8adc7b8 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-zXpV5BkZTcvrDNt0rj1IvIuCQuxJW3tDr3h0PaBMMcg="; + hash = "sha256-XJKychPpBYMzFlW9jUPaBWuNAlcbqUQwxy+cMW2Ivyg="; }; - cargoHash = "sha256-nUtE7Uk0Gf+zQBlbnBPWstMonnJYBJZKb+ML9doYOFo="; + cargoHash = "sha256-cEmbXitYGztfBS5M9uczgmFPKRktP4skFETx8SJah2A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 18842a94a9976..36f13c7fc8900 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -5,18 +5,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.32.0"; + version = "1.33.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = "refs/tags/${version}"; - hash = "sha256-s6d0q4K2UTG+BWzvH5KOAllzYAkEapEuDoiI9KQW31I="; + hash = "sha256-w/dxIQ7KRrn86PwiE/g5L9Gn8KszPF9u/zlwE/FYDu4="; }; sourceRoot = "${src.name}/cargo-insta"; - cargoHash = "sha256-ZQUzoKE3OGaY22VYiku7GqjGN9jUNx09a0EcgCRzzcM="; + cargoHash = "sha256-mEtmZ+wFo1WI1IMNYsVqSVScFDLdiXBbghH7c0l/3NQ="; meta = with lib; { description = "A Cargo subcommand for snapshot testing"; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index f057155988c8a..fe02f0b78e0a7 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.2"; + version = "0.37.3"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-uYMPRbh2stIkNxehPnJPryIo+bGxDG7g+l4bTkEQWoY="; + hash = "sha256-7xWxIvMaoKZ1TVgfdBUDvK8VJzW6alrO8xFvSlMusOY="; }; - cargoHash = "sha256-CXGar3Xp6iBldBGOxjXRBGBwjNh4Kv6SwIkaNKEnkQs="; + cargoHash = "sha256-2I+VZD4KLTtoTIb2NNpfLcFH/lmD6Z/TTPJrr3FcZzI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 8b902499bf737..7712e9c9ffe53 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.9.4"; + version = "0.10.2"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - hash = "sha256-BFASEf9WUVJHsakujjeBBxfxPYlsuzonqFuDLXmLgwc="; + hash = "sha256-71NRaIDWPbhDn6cfYhyZZzO2huQlj1vkKdBV6WJqI9s="; }; - cargoHash = "sha256-FojpC4RMrW0hZ0jvXxznxR6rKDDxrNMPoLoHEscOPEo="; + cargoHash = "sha256-lgqe9pXg/PE9WrXVpSJWYE6FUMGBgUDpEyJ31RSEj5A="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/development/tools/rust/cargo-run-bin/default.nix index aa710f493cd9c..91d914422277e 100644 --- a/pkgs/development/tools/rust/cargo-run-bin/default.nix +++ b/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-run-bin"; - version = "1.4.1"; + version = "1.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-imp7TzSVWo6l23tQu2oMMdVj/3sT9mU+lIBc0cVwO+s="; + hash = "sha256-FPkZk5qKHrRR3V8s04yLgOVOKj+Rln3Cu/VW2bnr2fE="; }; - cargoHash = "sha256-TQOFXFdfD4iVy4K9IjcX0L7zLeNw9RAHb2WE5rERP/0="; + cargoHash = "sha256-aFHuIEDpGCel1FC7D0hTUmzHbEj7wVarsE0wNZ/3Khw="; # multiple impurities in tests doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index d608f6775b1ae..6af361a12d2d9 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , stdenv , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { @@ -20,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; preCheck = "HOME=$(mktemp -d)"; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 8625bdcff3346..a80cb9ac1b6e4 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-szoeGv8U8M4Wai1GFUkgE8Rn+URRrlkZvzMBxCcqvGI="; + hash = "sha256-Ng+JMhGnbZEum+nmuA/omgDhg5U1UpcOZ9+avUZeTK8="; }; vendorHash = null; diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index 8fac2f9aa0c4b..f5fcdd7623636 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.16.7"; + version = "0.16.9"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-y28dn/LhqQxbszKwOjpiU93oP1tq/H0NL9vonhERLzw="; + hash = "sha256-Y4H8tPUHaRMMZaZt1VjkZT5JJgEIY/dhocNccvoHf1Y="; }; proxyVendor = true; - vendorHash = "sha256-ugLjaKCVgVl2jhH/blQ44y/c8hxQpbdlxUC4u+FgMGM="; + vendorHash = "sha256-Qn10+uTAo68OTQp592H/T7D99LNIvG76aG/ye+xx2sk="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/development/tools/squawk/default.nix index 15072d9568840..8e7dc13393f07 100644 --- a/pkgs/development/tools/squawk/default.nix +++ b/pkgs/development/tools/squawk/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "sbdchd"; repo = pname; rev = "v${version}"; - hash = "sha256-eic5j/mD4PBCMcATTSTJSKazZFJOxQuW7NyiYPjKCcM="; + hash = "sha256-XQU/1uAas1bT7FSgBzJSPRe4ET9ysjpFGhV+qi23AAY="; }; - cargoHash = "sha256-kzb00W9IlshhiV+vUIOlO6BnprHr2XPf8P207WYFP5I="; + cargoHash = "sha256-Qg2VcsAqXpYamO35t/lvlXUPTdjAqZ4z3Nm0hYdhjEM="; nativeBuildInputs = [ pkg-config @@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://squawkhq.com/"; changelog = "https://github.com/sbdchd/squawk/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with lib.maintainers; [ andrewsmith ]; + maintainers = with lib.maintainers; [ andrewsmith marsam ]; }; } diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index c7807fc9c6d05..ccdd0ff05cba4 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.102.2"; + version = "1.107.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-EhGGqBJdAnlccUFDUqzbujaVnQ8VggjY6vlGjI80TN8="; + hash = "sha256-uR7Iu1PdnzWp9+IJ5szUR6r+qKckyD6LFgsY5YQxT5c="; }; - vendorHash = "sha256-AiYLSXDmTrswAd64PjF0OH0/z4blAP68HfWlwL48fww="; + vendorHash = "sha256-gWGoRKlSo0C1gFU/kC4DcgOl0Mp5LCTpSZ1Yav0ZL9c="; ldflags = [ "-s" diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 4024aa4f7272e..c92c47ad8ac09 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.20"; + version = "1.16.21"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-in9MCQEO3Bqzsjkz5FtV4sn3t9CXEKqukZkSSoA/CT4="; + hash = "sha256-tXrkKDrWqhckb0TS/wvx1L5aGYRltPIJIPLKvbQk2l8="; }; - cargoHash = "sha256-7fFhBsOpVYD/Z3EhGSYn64ebsYevowkCePCOlmbUpP8="; + cargoHash = "sha256-Zcrx/HSYhHFgDmlbaVy1L7sCbRUeG8XgDWE0OrQdajs="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/development/tools/upbound/default.nix index 04b4e45500b5e..c4b2a421b4310 100644 --- a/pkgs/development/tools/upbound/default.nix +++ b/pkgs/development/tools/upbound/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.19.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-Dr6EKpKVy2DLhivJ42Bx+WJL2L710sQlXroaAm66Gpo="; + sha256 = "sha256-SvnmdpsdXbPSC+4inoMvu55az33Zucqf4c3yQ0g6EMw="; }; - vendorHash = "sha256-J7rZAvEx0jgkhJIEE19rV2WdBCIvkqYzB72ZiABs56U="; + vendorHash = "sha256-ai+Mro/ooUElJJq8BbnCo9PupIAwlanDeh+oe5otJJ4="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 5c71762bd3860..64b8f4dd474c7 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.33"; + version = "1.0.34"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-zSgV+lrNpQcR+V6Icyf3cPMeAdRDfsL2EErF8pxev5c="; + sha256 = "sha256-KlaMc3k1y6KviMDrMbKPcJOywJasrPZrnvSos8hgu+8="; fetchSubmodules = true; }; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 86ef8a4759f2f..946ead2a18dea 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "minify"; - version = "2.19.10"; + version = "2.20.0"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-/OfNHhWbRZI7nRhBnjXfxL4Gf011ydlwEMDadCptFJY="; + hash = "sha256-E29bXPfQekp/X7yAvcEWHERO3aSCRa41csZqbZ3wOno="; }; - vendorHash = "sha256-ZtQbhhdt9mGRbTpgm6O4wnSPoKF9bAEswppmK+Urqhs="; + vendorHash = "sha256-hgxYk76M2vplOY63vvaWzErNCo7knmMrbenJcoa/t0U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/games/brogue-ce/default.nix b/pkgs/games/brogue-ce/default.nix new file mode 100644 index 0000000000000..7532be8d1957f --- /dev/null +++ b/pkgs/games/brogue-ce/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, SDL2 +, SDL2_image +}: + +stdenv.mkDerivation rec { + pname = "brogue-ce"; + version = "1.13"; + + src = fetchFromGitHub { + owner = "tmewett"; + repo = "BrogueCE"; + rev = "v${version}"; + hash = "sha256-FUIdi1Ytn+INeD9550MW41qXtLb6in0QS3Snt8QaXUA="; + }; + + postPatch = '' + substituteInPlace linux/brogue-multiuser.sh \ + --replace broguedir= "broguedir=$out/opt/brogue-ce #" + ''; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + buildInputs = [ + SDL2 + SDL2_image + ]; + + makeFlags = [ "DATADIR=$(out)/opt/brogue-ce" ]; + + desktopItems = [(makeDesktopItem { + name = "brogue-ce"; + desktopName = "Brogue CE"; + genericName = "Roguelike"; + comment = "Brave the Dungeons of Doom!"; + icon = "brogue-ce"; + exec = "brogue-ce"; + categories = [ "Game" "AdventureGame" ]; + })]; + + installPhase = '' + runHook preInstall + mkdir -p $out/opt + cp -r bin $out/opt/brogue-ce + install -Dm755 linux/brogue-multiuser.sh $out/bin/brogue-ce + install -Dm 644 bin/assets/icon.png $out/share/icons/hicolor/256x256/apps/brogue-ce.png + runHook postInstall + ''; + + meta = with lib; { + description = "A community-lead fork of the minimalist roguelike game Brogue"; + homepage = "https://github.com/tmewett/BrogueCE"; + license = licenses.agpl3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/games/doom-ports/slade/git.nix b/pkgs/games/doom-ports/slade/git.nix index 1df734af5e009..7ecc5d5d1b6a1 100644 --- a/pkgs/games/doom-ports/slade/git.nix +++ b/pkgs/games/doom-ports/slade/git.nix @@ -15,17 +15,18 @@ , glew , lua , mpg123 +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "slade"; - version = "unstable-2022-08-15"; + version = "unstable-2023-09-30"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "1a0d25eec54f9ca2eb3667676d93fb0b6b6aea26"; - sha256 = "sha256-mtaJr4HJbp2UnzwaLq12V69DqPYDmSNqMGiuPpMlznI="; + rev = "d05af4bd3a9a655dfe17d02760bab3542cc0b909"; + sha256 = "sha256-lzTSE0WH+4fOad9E/pL3LDc4L151W0hFEmD0zsS0gpQ="; }; postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' @@ -58,6 +59,10 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/sirjuddington/SLADE.git"; + }; + meta = with lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix index ceb3d74816a0d..57766c2e8446d 100644 --- a/pkgs/games/endgame-singularity/default.nix +++ b/pkgs/games/endgame-singularity/default.nix @@ -54,6 +54,7 @@ python3.pkgs.buildPythonApplication rec { free # earth images from NASA, some fonts cc0 # cick0.wav ]; + mainProgram = "singularity"; maintainers = with lib.maintainers; [ fgaz ]; }; } diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index 142ef4e51c5d3..67d2f4cab635a 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.20": { - "url": "https://piston-data.mojang.com/v1/objects/84194a2f286ef7c14ed7ce0090dba59902951553/server.jar", - "sha1": "84194a2f286ef7c14ed7ce0090dba59902951553", - "version": "1.20.1", + "url": "https://piston-data.mojang.com/v1/objects/5b868151bd02b41319f54c8d4061b8cae84e665c/server.jar", + "sha1": "5b868151bd02b41319f54c8d4061b8cae84e665c", + "version": "1.20.2", "javaVersion": 17 }, "1.19": { diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 683288260d900..eccc2146d28b8 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,21 +7,21 @@ let pname = "osu-lazer-bin"; - version = "2023.1008.1"; + version = "2023.1026.0"; name = "${pname}-${version}"; osu-lazer-bin-src = { aarch64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - sha256 = "sha256-eL5UVZqAH7Ta442xIDjaOPu3NXJmck+lS+BoD/qnOMs="; + sha256 = "sha256-6IaN189cV/ORP77zrjdcCPwPzNR/W6JmrZXVasCx8MQ="; }; x86_64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - sha256 = "sha256-x/HL73Fao11GVj7uMFpx4uOKv8Gmiy1PEgee2sP1fvg="; + sha256 = "sha256-XrlajKT3GLjfj800mULj9iwkF9Bvx9Rlz56K6welq2U="; }; x86_64-linux = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-QqyymPkeRcedK75O9S0zO8DrUmPKuC7Mp4SbXT+QM9I="; + sha256 = "sha256-yr7PtBUBE0tB0giAE8aQCNJvxS/tMzlLWpJ3NyosQZk="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 0e9a782403c69..e2365f9ad2de1 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free multiplayer & singleplayer first person shooter, the successor of the Cube FPS"; + homepage = "http://sauerbraten.org"; maintainers = with maintainers; [ raskin ajs124 ]; mainProgram = "sauerbraten_client"; hydraPlatforms = diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index 9d598798defe0..8d1078a8a01f2 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -31,7 +31,7 @@ , gdk-pixbuf }: let - version = "0.22.1"; + version = "0.24.0"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -44,7 +44,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-I+Kj8amgFxT6yEXI5s1y0n1rgfzIrLtMOkYjguu6wpo="; + hash = "sha256-n0OiNxw9QDibX5HBSzq6jdOxyUd0bPkjKd+mtb/S/BY="; fetchSubmodules = true; }; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index a3e7516c6f812..0d0ebded72381 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.0"; + version = "3.7.4"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-GmqPnay/K36cJgP622ht18csaohcUYZpvMD8LaOH4eM="; + sha256 = "sha256-G9h5U5jlLOFCAKXdwzK+J8er3pUL4AUq5FLcvbUN93A="; }; buildInputs = [ diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 22a2be3083482..61df2e54c2283 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , cmake , ninja , p7zip @@ -53,6 +54,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-AdYI9vljjhTXyFffQK0znBv8IHoF2q/nFXrYZSo0BcM="; }; + patches = [ + # Upstream patch for curl-8.4 support, + # TODO: remove on next release. + (fetchpatch { + name = "curl-8.4.patch"; + url = "https://github.com/Warzone2100/warzone2100/commit/db1cf70950d4fa6630f37a7bf85f548b48ed53cd.patch"; + hash = "sha256-/jRan5pi7CamZaCaRdfugFmtCbWTKmCt63q0NBuTrFk="; + }) + ]; + buildInputs = [ SDL2 libtheora diff --git a/pkgs/misc/cups/drivers/kyodialog/default.nix b/pkgs/misc/cups/drivers/kyodialog/default.nix index 7137b5df56bf0..ad2d113465ce7 100644 --- a/pkgs/misc/cups/drivers/kyodialog/default.nix +++ b/pkgs/misc/cups/drivers/kyodialog/default.nix @@ -23,8 +23,8 @@ assert region == "Global" || region == "EU"; let - kyodialog_version = "9.2"; - date = "20220928"; + kyodialog_version = "9.3"; + date = "20230720"; in stdenv.mkDerivation rec { pname = "cups-kyodialog"; @@ -33,11 +33,15 @@ stdenv.mkDerivation rec { dontStrip = true; src = fetchzip { + # Steps to find the release download URL: + # 1. Go to https://www.kyoceradocumentsolutions.us/en/support/downloads.html + # 2. Search for printer model, e.g. "TASKalfa 6053ci" + # 3. Locate e.g. "Linux Print Driver (9.3)" in the list urls = [ "https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz" - "https://web.archive.org/web/20221122230412/https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz" + "https://web.archive.org/web/20231021143259/https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz" ]; - sha256 = "sha256-WCHuAQO2T6S8JtRsI2Yf/ypeCLMH365Ax/qX+Ah2s3k="; + hash = "sha256-3h2acOmaQIiqe2Fd9QiqEfre5TrxzRrll6UlUruwj1o="; extension = "tar.gz"; stripRoot = false; postFetch = '' diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 9202d899faaee..2d927f872c1f1 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.5.0"; + version = "10.5.1"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-aLO48gExo8rIFp20Yf4LwN+0wROnn6dzQDqzveYPg2E="; + hash = "sha256-YNXsO0iuVyITgvYwLUm83BA2Y+hUcQe9pK9ppy8pVRQ="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-H1cD4FZr1612/O1GjHZrKrUQi5H/EkDA3Tkqio95UdY="; + vendorHash = "sha256-oB71R7MUBG7EgVhaWx5oNGLHVGQWhkxO7jJD9eFsc3Y="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index dfbe3998c9192..5add4a5b530fe 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "9.0.3"; + version = "9.0.4"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "sha256-g8MQFhDBBUuEDGsJ14rHGsaGEznOtCMVOv+5kljXByY="; + sha256 = "sha256-WBbJ6e2I7SGqvZo3yH8L1ZbNPkyA6zTGS12Gq186DL4="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix index 0fa670faf61e3..02c4025ba463e 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/misc/vencord/default.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.5.8"; - gitHash = "544edce"; + version = "1.6.0"; + gitHash = "ffe6bb1"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-cJ+8CKCET7Z2MebyrW5OQr50tvbDM3mkvEQQm3zSbdU="; + hash = "sha256-t4+8ybPzqcCtTSukBBgvbD7HiKG4K51WPVnJg0RQbs8="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-JeJjjrCfJMuxP9sVVkKJQ7bRCGu0jbGfiw78jS0r2Sg="; + npmDepsHash = "sha256-H2f6xdAa7fNETbQhIv+InCB7+O4nq0bx+RILjGjqXdY="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; diff --git a/pkgs/misc/vencord/package-lock.json b/pkgs/misc/vencord/package-lock.json index 3c06525bb5bbd..ad21cfc0c8581 100644 --- a/pkgs/misc/vencord/package-lock.json +++ b/pkgs/misc/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.5.8", + "version": "1.6.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.5.8", + "version": "1.6.0", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -694,9 +694,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz", - "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" @@ -893,10 +893,13 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.18.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.6.tgz", - "integrity": "sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==", - "dev": true + "version": "18.18.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.7.tgz", + "integrity": "sha512-bw+lEsxis6eqJYW8Ql6+yTqkE6RuFtsQPSe5JxXbqYRFQEER5aJA9a5UH9igqDWm3X4iLHIKOHlnAXLM4mi7uQ==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/normalize-package-data": { "version": "2.4.3", @@ -911,9 +914,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.31", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.31.tgz", - "integrity": "sha512-c2UnPv548q+5DFh03y8lEDeMfDwBn9G3dRwfkrxQMo/dOtRHUUO57k6pHvBIfH/VF4Nh+98mZ5aaSe+2echD5g==", + "version": "18.2.33", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.33.tgz", + "integrity": "sha512-v+I7S+hu3PIBoVkKGpSYYpiBT1ijqEzWpzQD62/jm4K74hPpSP7FF9BnKG6+fg2+62weJYkkBWDJlZt5JO/9hg==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -5549,6 +5552,12 @@ "through": "^2.3.8" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/union-value": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index 60eb45558469c..702da5a1718b7 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , AppKit +, Carbon , CoreAudio , CoreWLAN , CoreVideo @@ -21,17 +22,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; - version = "2.17.1"; + version = "2.18.0"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${finalAttrs.version}"; - hash = "sha256-QilZurp4QkwOo4jbYXMs4SesqyXXsEgF8dDwt/Kv94s="; + hash = "sha256-GeFB+eE/NW9ZopwVSmSfMK3WiJLCJNXOdmQpYc3m8WE="; }; buildInputs = [ AppKit + Carbon CoreAudio CoreWLAN CoreVideo diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index f2ea933bd5c52..d2b24855b0b28 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "akvcam"; - version = "1.2.2"; + version = "1.2.4"; src = fetchFromGitHub { owner = "webcamoid"; repo = "akvcam"; rev = version; - sha256 = "1f0vjia2d7zj3y5c63lx1r537bdjx6821yxy29ilbrvsbjq2szj8"; + sha256 = "sha256-zvMPwgItp1bTq64DZcUbYls60XhgufOeEKaAoAFf64M="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ceb34fe0c76fa..0f59d3ac7aad7 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -558,6 +558,8 @@ let PERSISTENT_KEYRINGS = yes; # enable temporary caching of the last request_key() result KEYS_REQUEST_CACHE = whenAtLeast "5.3" yes; + # randomized slab caches + RANDOM_KMALLOC_CACHES = whenAtLeast "6.6" yes; } // optionalAttrs stdenv.hostPlatform.isx86_64 { # Enable Intel SGX X86_SGX = whenAtLeast "5.11" yes; @@ -572,6 +574,8 @@ let KVM_AMD_SEV = yes; # AMD SEV-SNP SEV_GUEST = whenAtLeast "5.19" module; + # Shadow stacks + X86_USER_SHADOW_STACK = whenAtLeast "6.6" yes; }; microcode = { diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 926a172a72405..ab2775ab922d7 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -34,5 +34,9 @@ "4.14": { "version": "4.14.328", "hash": "sha256:1igcpvnhwwrczfdsafmszvi0456k7f6j4cgpfw6v6afw09p95d8x" + }, + "6.6": { + "version": "6.6", + "hash": "sha256:1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr" } } diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d938f361c8576..43969919fb0fc 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,14 +3,14 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.57"; - hash = "sha256-ZzZj1Ij9L6WtjEJRcOdNtZ18oFRybNPV4uID6umC2Zg="; + version = "6.1.60"; + hash = "sha256-KYCeONJxyFPee4pvBLRw/MBTzPU7D2oZCrAVr3t/yPM="; variant = "lts"; }; mainVariant = { - version = "6.5.7"; - hash = "sha256-D4DMyBSaBZXHScmpkC3/fKlDylO1xVSZhar2F5bMjkY="; + version = "6.5.9"; + hash = "sha256-5SFPBsDTmq7tA6pyM7rbIjBPAtPbqhUl6VfA2z5baPA="; variant = "main"; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index f978cb429df5f..07f95884aa749 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.5.8"; #zen - suffix = "zen1"; #zen - sha256 = "0pg5q5alsxrbbf8hzbcgmwsyirs86715qijdzaldyw9sf74h4z1l"; #zen + version = "6.5.9"; #zen + suffix = "zen2"; #zen + sha256 = "07dxxs4bz4d6bahymzjzg42ic09wkvd8ynwvv9z19zjh6mk70vr2"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.5.8"; #lqx + version = "6.5.9"; #lqx suffix = "lqx1"; #lqx - sha256 = "1f10p7mriwjrgmdfz10vs48xiipdk9ljj884fsj63r5n1g7pz4bf"; #lqx + sha256 = "0z5mfcblwqzsw2d98npv1aa32bni46xmsvwc1ijad1c54iimsk9a"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/os-specific/linux/lenovo-legion/app.nix index fe5535eea8db9..a409ad2fbf4d7 100644 --- a/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "lenovo-legion-app"; - version = "0.0.5"; + version = "0.0.9"; src = fetchFromGitHub { owner = "johnfanv2"; repo = "LenovoLegionLinux"; - rev = "v${version}-prerelease"; - sha256 = "sha256-s4JFFmawokdC4qoqNvZDhuJSinhQ3YKSIfAYi79VTTA="; + rev = "v${version}-prerelese"; + hash = "sha256-P4vqzNX2nF4LnoQDOV8WEiXAICQCyjj9xPpFNvMu93k="; }; sourceRoot = "${src.name}/python/legion_linux"; @@ -19,15 +19,22 @@ python3.pkgs.buildPythonApplication rec { pyqt5 argcomplete pyyaml + darkdetect xorg.libxcb libsForQt5.qtbase ]; - postInstall = '' - cp -r ./{legion.py,legion_cli.py,legion_gui.py} $out/${python3.sitePackages} - cp ./legion_logo.png $out/${python3.sitePackages}/legion_logo.png + postPatch = '' + substituteInPlace ./setup.cfg \ + --replace "_VERSION" "${version}" + substituteInPlace ../../extra/service/fancurve-set \ + --replace "FOLDER=/etc/legion_linux/" "FOLDER=$out/share/legion_linux" + substituteInPlace ./legion_linux/legion.py \ + --replace "/etc/legion_linux" "$out/share/legion_linux" + ''; - rm -rf $out/data + postInstall = '' + cp ./legion_linux/legion_logo.png $out/${python3.sitePackages}/legion_logo.png ''; dontWrapQtApps = true; diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix index fa7af44298a07..564fa4537c8f4 100644 --- a/pkgs/os-specific/linux/libnvme/default.nix +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -11,27 +11,34 @@ , stdenv , swig , systemd +, fetchpatch # ImportError: cannot import name 'mlog' from 'mesonbuild' , withDocs ? stdenv.hostPlatform.canExecute stdenv.buildPlatform }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnvme"; - version = "1.4"; + version = "1.6"; outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ]; src = fetchFromGitHub { owner = "linux-nvme"; repo = "libnvme"; - rev = "v${version}"; - sha256 = "sha256-8DlEQ4LH6UhIHr0znJGqkuCosLHqA6hkJjmiCawNE1k="; + rev = "v${finalAttrs.version}"; + hash = "sha256-7bvjsmt16/6RycSDKIECtJ4ES7NTaspU6IMpUw0sViA="; }; + patches = [ + # included in next release + (fetchpatch { + url = "https://github.com/linux-nvme/libnvme/commit/ff742e792725c316ba6de0800188bf36751bd1d1.patch"; + hash = "sha256-IUjPUBmGQC4oAKFFlBrjonqD2YdyNPC9siK4t/t2slE="; + }) + ]; + postPatch = '' - patchShebangs meson-vcs-tag.sh - chmod +x doc/kernel-doc-check - patchShebangs doc/kernel-doc doc/kernel-doc-check doc/list-man-pages.sh + patchShebangs scripts ''; nativeBuildInputs = [ @@ -53,6 +60,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=man" + (lib.mesonBool "tests" finalAttrs.doCheck) (lib.mesonBool "docs-build" withDocs) ]; @@ -60,13 +68,14 @@ stdenv.mkDerivation rec { export KBUILD_BUILD_TIMESTAMP="$(date -u -d @$SOURCE_DATE_EPOCH)" ''; - doCheck = true; + # mocked ioctl conflicts with the musl one: https://github.com/NixOS/nixpkgs/pull/263768#issuecomment-1782877974 + doCheck = !stdenv.hostPlatform.isMusl; meta = with lib; { description = "C Library for NVM Express on Linux"; homepage = "https://github.com/linux-nvme/libnvme"; - maintainers = [ maintainers.fogti ]; + maintainers = with maintainers; [ fogti vifino ]; license = with licenses; [ lgpl21Plus ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix index da26a13c404e8..aadecf3f72a8b 100644 --- a/pkgs/os-specific/linux/nsncd/default.nix +++ b/pkgs/os-specific/linux/nsncd/default.nix @@ -7,16 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "nsncd"; - version = "unstable-2022-11-14"; + version = "unstable-2023-10-26"; + # https://github.com/twosigma/nsncd/pull/71 has not been upstreamed + # to twosigma/nsncd yet. Using the nix-community fork in the + # meantime. src = fetchFromGitHub { owner = "nix-community"; repo = "nsncd"; - rev = "47e580f1db99603df6e212a2e62f18cc970cef40"; - hash = "sha256-Nv3MYZcuYgD66BAGs3Tg37s086HAGsaDBFvELqQF3Tk="; + rev = "d6513421f420e407248c6d0aee39ae2f861a7cec"; + hash = "sha256-PykzwpPxMDHJOr2HubXuw+Krk9Jbi0E3M2lEAOXhx2M="; }; - cargoSha256 = "sha256-c1L6nEUBHw1YegmoRrI3WU/bF80Nzbz13hsGlNyBR9o="; + cargoSha256 = "sha256-cUM7rYXWpJ0aMiurXBp15IlxAmf/x5uiodxEqBPCQT0="; meta = with lib; { description = "the name service non-caching daemon"; diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index d267a12266bd8..e0d0372fd6ff2 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -4,18 +4,19 @@ , libnvme , json_c , zlib +, libhugetlbfs , python3Packages }: stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "2.4"; + version = "2.6"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - hash = "sha256-vnhvVVfEDnmEIdIkfTRoiLB7dZ1rJV3U4PmUUoaxTUs="; + hash = "sha256-MFyBkwTNOBQdHWj7In1OquRIAsjsd4/DHYfUyFA9YDQ="; }; mesonFlags = [ @@ -32,6 +33,8 @@ stdenv.mkDerivation rec { libnvme json_c zlib + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libhugetlbfs) [ + libhugetlbfs ]; meta = with lib; { @@ -47,7 +50,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ mic92 vifino ]; mainProgram = "nvme"; }; } diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix index 30f8da7d5f4c5..4517cb29e75ae 100644 --- a/pkgs/os-specific/linux/r8125/default.nix +++ b/pkgs/os-specific/linux/r8125/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "r8125"; # On update please verify (using `diff -r`) that the source matches the # realtek version. - version = "9.004.01"; + version = "9.011.01"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "louistakepillz"; repo = "r8125"; rev = version; - sha256 = "0h2y4mzydhc7var5281bk2jj1knig6i64k11ii4b94az3g9dbq24"; + sha256 = "sha256-QV1DKkWVtqcnuqgAdJnPpj6Z6ch+lw61zpouXKlyfqQ="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 3a47d3dc849ce..3cbda3a7ebdd9 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -28,12 +28,19 @@ rec { generate = ...; }); + + Please note that `pkgs` may not always be available for use due to the split + options doc build introduced in fc614c37c653, so lazy evaluation of only the + 'type' field is required. + */ inherit (import ./formats/java-properties/default.nix { inherit lib pkgs; }) javaProperties; + libconfig = (import ./formats/libconfig/default.nix { inherit lib pkgs; }).format; + json = {}: { type = with lib.types; let diff --git a/pkgs/pkgs-lib/formats/libconfig/default.nix b/pkgs/pkgs-lib/formats/libconfig/default.nix new file mode 100644 index 0000000000000..7433a72853533 --- /dev/null +++ b/pkgs/pkgs-lib/formats/libconfig/default.nix @@ -0,0 +1,121 @@ +{ lib +, pkgs +}: +let + inherit (pkgs) buildPackages callPackage; + # Implementation notes: + # Libconfig spec: https://hyperrealm.github.io/libconfig/libconfig_manual.html + # + # Since libconfig does not allow setting names to start with an underscore, + # this is used as a prefix for both special types and include directives. + # + # The difference between 32bit and 64bit values became optional in libconfig + # 1.5, so we assume 64bit values for all numbers. + + libconfig-generator = buildPackages.rustPlatform.buildRustPackage { + name = "libconfig-generator"; + version = "0.1.0"; + src = ./src; + + passthru.updateScript = ./update.sh; + + cargoLock.lockFile = ./src/Cargo.lock; + }; + + libconfig-validator = buildPackages.runCommandCC "libconfig-validator" + { + buildInputs = with buildPackages; [ libconfig ]; + } + '' + mkdir -p "$out/bin" + $CC -lconfig -x c - -o "$out/bin/libconfig-validator" ${./validator.c} + ''; +in +{ + format = { generator ? libconfig-generator, validator ? libconfig-validator }: { + inherit generator; + + type = with lib.types; + let + valueType = (oneOf [ + bool + int + float + str + path + (attrsOf valueType) + (listOf valueType) + ]) // { + description = "libconfig value"; + }; + in + attrsOf valueType; + + lib = { + mkHex = value: { + _type = "hex"; + inherit value; + }; + mkOctal = value: { + _type = "octal"; + inherit value; + }; + mkFloat = value: { + _type = "float"; + inherit value; + }; + mkArray = value: { + _type = "array"; + inherit value; + }; + mkList = value: { + _type = "list"; + inherit value; + }; + }; + + generate = name: value: + callPackage + ({ + stdenvNoCC + , libconfig-generator + , libconfig-validator + , writeText + }: stdenvNoCC.mkDerivation rec { + inherit name; + + dontUnpack = true; + + json = builtins.toJSON value; + passAsFile = [ "json" ]; + + strictDeps = true; + nativeBuildInputs = [ libconfig-generator ]; + buildPhase = '' + runHook preBuild + libconfig-generator < $jsonPath > output.cfg + runHook postBuild + ''; + + doCheck = true; + nativeCheckInputs = [ libconfig-validator ]; + checkPhase = '' + runHook preCheck + libconfig-validator output.cfg + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + mv output.cfg $out + runHook postInstall + ''; + + passthru.json = writeText "${name}.json" json; + }) + { + libconfig-generator = generator; + libconfig-validator = validator; + }; + }; +} diff --git a/pkgs/pkgs-lib/formats/libconfig/src/Cargo.lock b/pkgs/pkgs-lib/formats/libconfig/src/Cargo.lock new file mode 100644 index 0000000000000..f8f921f996f92 --- /dev/null +++ b/pkgs/pkgs-lib/formats/libconfig/src/Cargo.lock @@ -0,0 +1,40 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "libconfig-generator" +version = "0.1.0" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "serde" +version = "1.0.183" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" + +[[package]] +name = "serde_json" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +dependencies = [ + "itoa", + "ryu", + "serde", +] diff --git a/pkgs/pkgs-lib/formats/libconfig/src/Cargo.toml b/pkgs/pkgs-lib/formats/libconfig/src/Cargo.toml new file mode 100644 index 0000000000000..20ad44d221945 --- /dev/null +++ b/pkgs/pkgs-lib/formats/libconfig/src/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "libconfig-generator" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +serde = "1.0.178" +serde_json = "1.0.104" diff --git a/pkgs/pkgs-lib/formats/libconfig/src/src/main.rs b/pkgs/pkgs-lib/formats/libconfig/src/src/main.rs new file mode 100644 index 0000000000000..4da45f647d46f --- /dev/null +++ b/pkgs/pkgs-lib/formats/libconfig/src/src/main.rs @@ -0,0 +1,271 @@ +use serde_json::Value; +use std::mem::discriminant; + +#[derive(Debug)] +enum LibConfigIntNumber { + Oct(i64), + Hex(i64), + Int(i64), +} + +#[derive(Debug)] +enum LibConfigValue { + Bool(bool), + Int(LibConfigIntNumber), + Float(f64), + String(String), + Array(Vec<LibConfigValue>), + List(Vec<LibConfigValue>), + Group(Vec<String>, Vec<(String, LibConfigValue)>), +} + +fn validate_setting_name(key: &str) -> bool { + let first_char = key.chars().next().expect("Empty setting name"); + (first_char.is_alphabetic() || first_char == '*') + && key[1..] + .chars() + .all(|c| c.is_alphanumeric() || c == '_' || c == '*') +} + +const SPECIAL_TYPES: [&str; 5] = ["octal", "hex", "float", "list", "array"]; + +fn object_is_special_type(o: &serde_json::Map<String, Value>) -> Option<&str> { + o.get("_type").and_then(|x| x.as_str()).and_then(|x| { + if SPECIAL_TYPES.contains(&x) { + Some(x) + } else { + None + } + }) +} + +fn vec_is_array(v: &Vec<LibConfigValue>) -> bool { + if v.is_empty() { + return true; + } + + let first_item = v.first().unwrap(); + + if match first_item { + LibConfigValue::Array(_) => true, + LibConfigValue::List(_) => true, + LibConfigValue::Group(_, _) => true, + _ => false, + } { + return false; + }; + + v[1..] + .iter() + .all(|item| discriminant(first_item) == discriminant(item)) +} + +fn json_to_libconfig(v: &Value) -> LibConfigValue { + match v { + Value::Null => panic!("Null value not allowed in libconfig"), + Value::Bool(b) => LibConfigValue::Bool(b.clone()), + Value::Number(n) => { + if n.is_i64() { + LibConfigValue::Int(LibConfigIntNumber::Int(n.as_i64().unwrap())) + } else if n.is_f64() { + LibConfigValue::Float(n.as_f64().unwrap()) + } else { + panic!("{} is not i64 or f64, cannot be represented as number in libconfig", n); + } + } + Value::String(s) => LibConfigValue::String(s.to_string()), + Value::Array(a) => { + let items = a + .iter() + .map(|item| json_to_libconfig(item)) + .collect::<Vec<LibConfigValue>>(); + LibConfigValue::List(items) + } + Value::Object(o) => { + if let Some(_type) = object_is_special_type(o) { + let value = o + .get("value") + .expect(format!("Missing value for special type: {}", &_type).as_str()); + + return match _type { + "octal" => { + let str_value = value + .as_str() + .expect( + format!("Value is not a string for special type: {}", &_type) + .as_str(), + ) + .to_owned(); + + LibConfigValue::Int(LibConfigIntNumber::Oct( + i64::from_str_radix(&str_value, 8) + .expect(format!("Invalid octal value: {}", value).as_str()), + )) + } + "hex" => { + let str_value = value + .as_str() + .expect( + format!("Value is not a string for special type: {}", &_type) + .as_str(), + ) + .to_owned(); + + LibConfigValue::Int(LibConfigIntNumber::Hex( + i64::from_str_radix(&str_value[2..], 16) + .expect(format!("Invalid hex value: {}", value).as_str()), + )) + } + "float" => { + let str_value = value + .as_str() + .expect( + format!("Value is not a string for special type: {}", &_type) + .as_str(), + ) + .to_owned(); + + LibConfigValue::Float( + str_value + .parse::<f64>() + .expect(format!("Invalid float value: {}", value).as_str()), + ) + } + "list" => { + let items = value + .as_array() + .expect( + format!("Value is not an array for special type: {}", &_type) + .as_str(), + ) + .to_owned() + .iter() + .map(|item| json_to_libconfig(item)) + .collect::<Vec<LibConfigValue>>(); + + LibConfigValue::List(items) + } + "array" => { + let items = value + .as_array() + .expect( + format!("Value is not an array for special type: {}", &_type) + .as_str(), + ) + .to_owned() + .iter() + .map(|item| json_to_libconfig(item)) + .collect::<Vec<LibConfigValue>>(); + + if !vec_is_array(&items) { + panic!( + "This can not be an array because of its contents: {:#?}", + items + ); + } + + LibConfigValue::Array(items) + } + _ => panic!("Invalid type: {}", _type), + }; + } + + let mut items = o + .iter() + .filter(|(key, _)| key.as_str() != "_includes") + .map(|(key, value)| (key.clone(), json_to_libconfig(value))) + .collect::<Vec<(String, LibConfigValue)>>(); + items.sort_by(|(a,_),(b,_)| a.partial_cmp(b).unwrap()); + + let includes = o + .get("_includes") + .map(|x| { + x.as_array() + .expect("_includes is not an array") + .iter() + .map(|x| { + x.as_str() + .expect("_includes item is not a string") + .to_owned() + }) + .collect::<Vec<String>>() + }) + .unwrap_or(vec![]); + + for (key,_) in items.iter() { + if !validate_setting_name(key) { + panic!("Invalid setting name: {}", key); + } + } + LibConfigValue::Group(includes, items) + } + } +} + +impl ToString for LibConfigValue { + fn to_string(&self) -> String { + match self { + LibConfigValue::Bool(b) => b.to_string(), + LibConfigValue::Int(i) => match i { + LibConfigIntNumber::Oct(n) => format!("0{:o}", n), + LibConfigIntNumber::Hex(n) => format!("0x{:x}", n), + LibConfigIntNumber::Int(n) => n.to_string(), + }, + LibConfigValue::Float(n) => format!("{:?}", n), + LibConfigValue::String(s) => { + format!("\"{}\"", s.replace("\\", "\\\\").replace("\"", "\\\"")) + } + LibConfigValue::Array(a) => { + let items = a + .iter() + .map(|item| item.to_string()) + .collect::<Vec<String>>() + .join(", "); + format!("[{}]", items) + } + LibConfigValue::List(a) => { + let items = a + .iter() + .map(|item| item.to_string()) + .collect::<Vec<String>>() + .join(", "); + format!("({})", items) + } + LibConfigValue::Group(i, o) => { + let includes = i + .iter() + .map(|x| x.replace("\\", "\\\\").replace("\"", "\\\"")) + .map(|x| format!("@include \"{}\"", x)) + .collect::<Vec<String>>() + .join("\n"); + let items = o + .iter() + .map(|(key, value)| format!("{}={};", key, value.to_string())) + .collect::<Vec<String>>() + .join(""); + if includes.is_empty() { + format!("{{{}}}", items) + } else { + format!("{{\n{}\n{}}}", includes, items) + } + } + } + } +} + +fn main() { + let stdin = std::io::stdin().lock(); + let json = serde_json::Deserializer::from_reader(stdin) + .into_iter::<Value>() + .next() + .expect("Could not read content from stdin") + .expect("Could not parse JSON from stdin"); + + for (key, value) in json + .as_object() + .expect("Top level of JSON file is not an object") + { + print!("{}={};", key, json_to_libconfig(value).to_string()); + } + print!("\n\n"); +} diff --git a/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix new file mode 100644 index 0000000000000..3715e2e840d26 --- /dev/null +++ b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix @@ -0,0 +1,76 @@ +{ lib, formats, stdenvNoCC, writeText, ... }: +let + libconfig = formats.libconfig { }; + + include_expr = { + val = 1; + }; + + include_file = (writeText "libconfig-test-include" '' + val=1; + '').overrideAttrs { + outputHashAlgo = "sha256"; + outputHashMode = "flat"; + }; + + expression = { + simple_top_level_attr = "1.0"; + nested.attrset.has.a.integer.value = 100; + some_floaty = 29.95; + ## Same syntax here on these two, but they should get serialized differently: + # > A list may have zero or more elements, each of which can be a scalar value, an array, a group, or another list. + list1d = libconfig.lib.mkList [ 1 "mixed!" 5 2 ]; + # You might also omit the mkList, as a list will be a list (in contrast to an array) by default. + list2d = [ 1 [ 1 1.2 "foo" ] [ "bar" 1.2 1 ] ]; + # > An array may have zero or more elements, but the elements must all be scalar values of the same type. + array1d = libconfig.lib.mkArray [ 1 5 2 ]; + array2d = [ + (libconfig.lib.mkArray [ 1 2 ]) + (libconfig.lib.mkArray [ 2 1 ]) + ]; + nasty_string = "\"@\n\\\t^*\b\f\n\0\";'''$"; + + weirderTypes = { + _includes = [ include_file ]; + pi = 3.141592654; + bigint = 9223372036854775807; + hex = libconfig.lib.mkHex "0x1FC3"; + octal = libconfig.lib.mkOctal "0027"; + float = libconfig.lib.mkFloat "1.2E-3"; + array_of_ints = libconfig.lib.mkArray [ + (libconfig.lib.mkOctal "0732") + (libconfig.lib.mkHex "0xA3") + 1234 + ]; + list_of_weird_types = [ + 3.141592654 + 9223372036854775807 + (libconfig.lib.mkHex "0x1FC3") + (libconfig.lib.mkOctal "0027") + (libconfig.lib.mkFloat "1.2E-32") + (libconfig.lib.mkFloat "1") + ]; + }; + }; + + libconfig-test-cfg = libconfig.generate "libconfig-test.cfg" expression; +in + stdenvNoCC.mkDerivation { + name = "pkgs.formats.libconfig-test-comprehensive"; + + dontUnpack = true; + dontBuild = true; + + doCheck = true; + checkPhase = '' + diff -U3 ${./expected.txt} ${libconfig-test-cfg} + ''; + + installPhase = '' + mkdir $out + cp ${./expected.txt} $out/expected.txt + cp ${libconfig-test-cfg} $out/libconfig-test.cfg + cp ${libconfig-test-cfg.passthru.json} $out/libconfig-test.json + ''; + } + diff --git a/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt new file mode 100644 index 0000000000000..3e9b1af821f18 --- /dev/null +++ b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt @@ -0,0 +1,6 @@ +array1d=[1, 5, 2];array2d=([1, 2], [2, 1]);list1d=(1, "mixed!", 5, 2);list2d=(1, (1, 1.2, "foo"), ("bar", 1.2, 1));nasty_string="\"@ +\\ ^*bf +0\";'''$";nested={attrset={has={a={integer={value=100;};};};};};simple_top_level_attr="1.0";some_floaty=29.95;weirderTypes={ +@include "/nix/store/jdz5yhzbbj4j77yrr7l20x1cs4kbwkj2-libconfig-test-include" +array_of_ints=[0732, 0xa3, 1234];bigint=9223372036854775807;float=0.0012;hex=0x1fc3;list_of_weird_types=(3.141592654, 9223372036854775807, 0x1fc3, 027, 1.2e-32, 1.0);octal=027;pi=3.141592654;}; + diff --git a/pkgs/pkgs-lib/formats/libconfig/test/default.nix b/pkgs/pkgs-lib/formats/libconfig/test/default.nix new file mode 100644 index 0000000000000..6cd03fe4854f5 --- /dev/null +++ b/pkgs/pkgs-lib/formats/libconfig/test/default.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + comprehensive = pkgs.callPackage ./comprehensive { }; +} diff --git a/pkgs/pkgs-lib/formats/libconfig/update.sh b/pkgs/pkgs-lib/formats/libconfig/update.sh new file mode 100755 index 0000000000000..ffc5ad3917f71 --- /dev/null +++ b/pkgs/pkgs-lib/formats/libconfig/update.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p cargo -i bash +cd "$(dirname "$0")" +cargo update diff --git a/pkgs/pkgs-lib/formats/libconfig/validator.c b/pkgs/pkgs-lib/formats/libconfig/validator.c new file mode 100644 index 0000000000000..738be0b774b5a --- /dev/null +++ b/pkgs/pkgs-lib/formats/libconfig/validator.c @@ -0,0 +1,21 @@ +// Copyright (C) 2005-2023 Mark A Lindner, ckie +// SPDX-License-Identifier: LGPL-2.1-or-later +#include <stdio.h> +#include <libconfig.h> +int main(int argc, char **argv) +{ + config_t cfg; + config_init(&cfg); + if (argc != 2) + { + fprintf(stderr, "USAGE: validator <path-to-validate>"); + } + if(! config_read_file(&cfg, argv[1])) + { + fprintf(stderr, "[libconfig] %s:%d - %s\n", config_error_file(&cfg), + config_error_line(&cfg), config_error_text(&cfg)); + config_destroy(&cfg); + return 1; + } + printf("[libconfig] validation ok\n"); +} \ No newline at end of file diff --git a/pkgs/pkgs-lib/tests/default.nix b/pkgs/pkgs-lib/tests/default.nix index ae91e15aa9efa..289780f57650a 100644 --- a/pkgs/pkgs-lib/tests/default.nix +++ b/pkgs/pkgs-lib/tests/default.nix @@ -17,6 +17,7 @@ let jdk11 = pkgs.callPackage ../formats/java-properties/test { jdk = pkgs.jdk11_headless; }; jdk17 = pkgs.callPackage ../formats/java-properties/test { jdk = pkgs.jdk17_headless; }; }; + libconfig = recurseIntoAttrs (import ../formats/libconfig/test { inherit pkgs; }); }; flatten = prefix: as: diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index d3dd96cc23a63..a8bd3ba5a7a1b 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.12.6"; + version = "3.12.7"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-QBDgRpYlOaROIbgmpOHW2wzULgXrIW1IxJ14jvy/YR4="; + hash = "sha256-EX7+f6R1dfU2hYt2ftEjpevmaUtAJ1wHcr+X30z5Bb8="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index f59ebb6fe20fa..160435802957c 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -25,13 +25,13 @@ let in python.pkgs.buildPythonApplication rec { pname = "calibre-web"; - version = "0.6.20"; + version = "0.6.21"; src = fetchFromGitHub { owner = "janeczku"; repo = "calibre-web"; rev = version; - hash = "sha256-0lArY1aTpO4sgIVDSqClYMGlip92f9hE/L2UouTLK8Q="; + hash = "sha256-tRrOquetn3P2NmrXq7DQHRGP1sWnLR7bV2Lw0W/lUPQ="; }; propagatedBuildInputs = with python.pkgs; [ @@ -64,8 +64,6 @@ python.pkgs.buildPythonApplication rec { # and exit. This is gonna be used to configure calibre-web declaratively, as most of its configuration parameters # are stored in the DB. ./db-migrations.patch - # environ in tornado.wsgi.WSGIContainer no longer a static method from 6.3 version - ./static_environ.patch ]; # calibre-web doesn't follow setuptools directory structure. The following is taken from the script diff --git a/pkgs/servers/calibre-web/static_environ.patch b/pkgs/servers/calibre-web/static_environ.patch deleted file mode 100644 index 4f94283a4e664..0000000000000 --- a/pkgs/servers/calibre-web/static_environ.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cps/tornado_wsgi.py b/cps/tornado_wsgi.py -index af93219c..cf302042 100644 ---- a/cps/tornado_wsgi.py -+++ b/cps/tornado_wsgi.py -@@ -53,7 +53,7 @@ class MyWSGIContainer(WSGIContainer): - return response.append - - app_response = self.wsgi_application( -- MyWSGIContainer.environ(request), start_response -+ self.environ(request), start_response - ) - try: - response.extend(app_response) -@@ -86,9 +86,8 @@ class MyWSGIContainer(WSGIContainer): - request.connection.finish() - self._log(status_code, request) - -- @staticmethod -- def environ(request: httputil.HTTPServerRequest) -> Dict[Text, Any]: -- environ = WSGIContainer.environ(request) -+ def environ(self, request: httputil.HTTPServerRequest) -> Dict[Text, Any]: -+ environ = super().environ(request) - environ['RAW_URI'] = request.path - return environ - diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 3f77c88b19c34..2c4e1c5d4f474 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "confluent-platform"; - version = "7.4.1"; + version = "7.5.0"; src = fetchurl { url = "https://packages.confluent.io/archive/${lib.versions.majorMinor finalAttrs.version}/confluent-${finalAttrs.version}.tar.gz"; - hash = "sha256-dJwG+QRplXX7etxG/e1kzcRMJppF6TYofio8FO1p+aI="; + hash = "sha256-HaK3Do6oRGm6ovvNNGvZE34rYNRQnrmt1GKglTSZ9ls="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Confluent event streaming platform based on Apache Kafka"; homepage = "https://www.confluent.io/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ zoedsoupe ]; + maintainers = with lib.maintainers; [ zoedsoupe autophagy ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 82ee6d59547a2..d722f6beb0ab1 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-wM9ayB3L9pc3696Ze5hVZPKGwrB5fD+64Wf8DUIjf1k="; + hash = "sha256-Hy3QuwAHmZSsjy5A/1mrmrxdtle466HsQtDat3tYS8s="; }; - vendorHash = "sha256-COljILLiAFoX8IShpAmLrxkw6yw7YQE4lpe8IR92j6g="; + vendorHash = "sha256-M7ogR1ya+sqlWVQpaXlvJy9YwhdM4XBDw8e2ZBPvEGY="; subPackages = [ # The server diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index bf241ce961eef..7b33435a9dbe6 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-qqMYmAIi+lWR6LHnwk4u6qqjhNStLRzXG7cWu3XknLM="; + sha256 = "sha256-ep/Je83rUE2mcRqIBbgNH+7uFYf0EoHuRo7JOgT2aIs="; }; # don't do anything? diff --git a/pkgs/servers/fastnetmon-advanced/default.nix b/pkgs/servers/fastnetmon-advanced/default.nix index f08e4662c93e8..ac3069d94f022 100644 --- a/pkgs/servers/fastnetmon-advanced/default.nix +++ b/pkgs/servers/fastnetmon-advanced/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "fastnetmon-advanced"; - version = "2.0.351"; + version = "2.0.352"; src = fetchurl { url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; - hash = "sha256-gLR4Z5VZyyt6CmoWcqDT75o50KyEJsfsx67Sqpiwh04="; + hash = "sha256-XYb1W3NYT8C9Jfs66NnqD2gRdYZFR5jzFLAIzx8a2Ck="; }; nativeBuildInputs = [ @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high performance DDoS detector / sensor - commercial edition"; homepage = "https://fastnetmon.com"; + changelog = "https://github.com/FastNetMon/fastnetmon-advanced-releases/releases/tag/v${version}"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = teams.wdz.members; license = licenses.unfree; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1be1169c77862..5f4ee05a73275 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -117,6 +117,25 @@ let }; }); + intellifire4py = super.intellifire4py.overridePythonAttrs (oldAttrs: rec { + version = "2.2.2"; + src = fetchFromGitHub { + owner = "jeeftor"; + repo = "intellifire4py"; + rev = "refs/tags/${version}"; + hash = "sha256-iqlKfpnETLqQwy5sNcK2x/TgmuN2hCfYoHEFK2WWVXI="; + }; + nativeBuildInputs = with super; [ + setuptools + ]; + propagatedBuildInputs = with super; [ + aenum + aiohttp + pydantic + ]; + doCheck = false; # requires asynctest, which does not work on python 3.11 + }); + jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec { version = "3.3.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 8666f906fa958..ac49da29b5402 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,5 +1,5 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub , fetchNpmDeps , cacert @@ -14,15 +14,15 @@ , stdenv }: -buildGo121Module rec { +buildGoModule rec { pname = "evcc"; - version = "0.121.2"; + version = "0.121.5"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-WGce6HszjS/AVwlEmT8KZnFHZieaGzT+yyzxOtqf/zg="; + hash = "sha256-KEJh/JhTlSrio4JRQwxz8NbmjzaqW4MUlzAXGvanMmo="; }; vendorHash = "sha256-dBJsPv3tOWxLvVlkTG0npKalH2RWfwR3vJRjqb4TYQE="; diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index cda0d0a4daeb6..0b1d88e43e0d9 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -14,7 +14,7 @@ , linuxHeaders , nixosTests -# v8 (upstream default), wavm, wamr, wasmtime, disabled + # v8 (upstream default), wavm, wamr, wasmtime, disabled , wasmRuntime ? "wamr" }: @@ -83,8 +83,8 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { - x86_64-linux = "sha256-bBi+3sAwtj5qu1npFpNMK2C99Q0ZI3zaSmMsTcreD8Y="; - aarch64-linux = "sha256-piIekotpxB02COglAon9w7a+1jXlHX29/VkrgKFsQ3c="; + x86_64-linux = "sha256-OQ4vg4S3DpM+Zo+igncx3AXJnL8FkJbwh7KnBhbnCUM="; + aarch64-linux = "sha256-/X8i1vzQ4QvFxi1+5rc1/CGHmRhhu5F3X5A3PgbW+Mc="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index ff68d09bbe9dd..1ebd33f51d6f4 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "12.0.1"; + version = "12.0.2"; src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - hash = "sha256-7nCai6S3eNly83aUQf0tiLTe+k3ih0cJnGqQvi143LI="; + hash = "sha256-DtlHTXjbr31RmK6ycDdiWOL7jIpbWNh0la90OnOhzvM="; }; dontBuild = true; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index c81449aa762e0..e1ef395f9d926 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -11,10 +11,11 @@ , curl , expat , fdk_aac -, ffmpeg +, ffmpeg-headless , geoip , libbsd , libiconv +, libjpeg , libkrb5 , libmaxminddb , libmodsecurity @@ -959,17 +960,18 @@ let self = { }; }; - video-thumbextractor = { + video-thumbextractor = rec { name = "video-thumbextractor"; + version = "1.0.0"; src = fetchFromGitHub { name = "video-thumbextractor"; owner = "wandenberg"; repo = "nginx-video-thumbextractor-module"; - rev = "92b80642538eec4cfc98114dec5917b8d820e912"; - sha256 = "0a8d9ifryhhnll7k7jcsf9frshk5yhpsgz7zgxdmw81wbz5hxklc"; + rev = "refs/tags/${version}"; + hash = "sha256-F2cuzCbJdGYX0Zmz9MSXTB7x8+FBR6pPpXtLlDRCcj8="; }; - inputs = [ ffmpeg ]; + inputs = [ ffmpeg-headless libjpeg ]; meta = with lib; { description = "Extract thumbs from a video file"; @@ -985,11 +987,15 @@ let self = { name = "vod"; owner = "kaltura"; repo = "nginx-vod-module"; - rev = "1.31"; - hash = "sha256-ZpeO8QWQ+fGkz08u/zFOq7vj4aHcodzSHNrc1SgGUyc="; + rev = "1.32"; + hash = "sha256-ZpG0oj60D3o7/7uyE8AybCiOtncVe1Jnjaz22sIFypk="; + postFetch = '' + substituteInPlace $out/vod/media_set.h \ + --replace "MAX_CLIPS (128)" "MAX_CLIPS (1024)" + ''; }; - inputs = [ ffmpeg fdk_aac openssl libxml2 libiconv ]; + inputs = [ ffmpeg-headless fdk_aac openssl libxml2 libiconv ]; meta = with lib; { description = "VOD packager"; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 057942259282f..e7df0fb7190f6 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.993"; + version = "0.21.1096"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-LpP4BH0EJxjy4pDYpIGs9l2obxfFMLMsTEn3weJPnPRgeeAlavkACCymQxrpfG3aP1oPbaZRn6Zs/9dyohV3kQ=="; + hash = "sha512-j9PQa54Gv6kdCHZ9/WPnKYkxD4N0eu0KtMPpATSYVDo0mP9pXdQxSoCrKdmW2gOveuo5Z/wPW4BB4r3gvFxcOg=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 6428e7510c440..0a6f0f1391e27 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-09-10"; + version = "unstable-2023-10-21"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "8ef0f7d7e3d3b2ac7bc1e80ed3295ceca6bba4e7"; - sha256 = "sha256-f/fPnZvtnASphYtvM9NBae0on8GWSwQPykukZ3XCy3M="; + rev = "f7567a0db954eabe4c6b8da3f73ce68693698646"; + sha256 = "sha256-zOXoHTySTtq2fR7ujU6aiKAgvw11ogM8K+HJF1RoWEQ="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index 1225fe4b360f1..fbb8b38d5ee0b 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.5.1"; + version = "1.6.4"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-mEeeMMTZlAfBxp44gV8OLjyGrzcp+XCMPJLJ/sFELHs="; + sha256 = "sha256-tqrC3l2njYGRVIdvt86JVKTCVaAK7GPoYacx3hFRggg="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mail/mailpit/default.nix b/pkgs/servers/mail/mailpit/default.nix index 9c8b683373c31..69a2dc7ce6f25 100644 --- a/pkgs/servers/mail/mailpit/default.nix +++ b/pkgs/servers/mail/mailpit/default.nix @@ -11,13 +11,13 @@ let - version = "1.7.1"; + version = "1.9.9"; src = fetchFromGitHub { owner = "axllent"; repo = "mailpit"; rev = "v${version}"; - hash = "sha256-jT9QE0ikp9cJlT8qtfPPjKOUuqWyQk94D3UbkyaGXa8="; + hash = "sha256-WPfr1LHOgOFsF2g3junJ0km0gOk/LC52jekJ8BXlqP0="; }; # Separate derivation, because if we mix this in buildGoModule, the separate @@ -29,7 +29,7 @@ let npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-6VCs8125fTJkZW+eZgK56j7ccK8tcGhIXiq2HkYp4XM="; + hash = "sha256-RaXD+WfNywItveKzc+KWOw38H1EZ2yukgbMrtOfPSJc="; }; nativeBuildInputs = [ nodejs python3 libtool npmHooks.npmConfigHook ]; @@ -49,7 +49,7 @@ buildGoModule { pname = "mailpit"; inherit src version; - vendorHash = "sha256-XBYIO7fdo5EahJB7EcAuY9SGKZb8dsvoJHp/D5LO5Qo="; + vendorHash = "sha256-akt72aBoiQKp1Hxf3NgzSmfgmsnjpheIh62lPCTyHBs="; CGO_ENABLED = 0; @@ -65,5 +65,6 @@ buildGoModule { changelog = "https://github.com/axllent/mailpit/releases/tag/v${version}"; maintainers = with maintainers; [ stephank ]; license = licenses.mit; + mainProgram = "mailpit"; }; } diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 004490c8687ad..3d1afd389ee1d 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -28,13 +28,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - hash = "sha256-emxvSqtpTcv0LZjzhMncvnApRLXFDeyFVmkoeSVp6f4="; + hash = "sha256-Kr6Y1ePgBeH+WhkfEYqmoBZ9AJ54G+OVgrY73aV0+OU="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 995b58476d783..fc6c899e75691 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -8,7 +8,7 @@ applyPatches { src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; - rev = "${version}"; + rev = "v${version}"; hash = "sha256-xpE/mg2AeioW6NThUjLS+SBxGavG4w1xtp3BOMADfYo="; }; patches = []; diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh index 6955f9e618050..b79e8d3063100 100755 --- a/pkgs/servers/mastodon/update.sh +++ b/pkgs/servers/mastodon/update.sh @@ -90,7 +90,7 @@ applyPatches { src = fetchFromGitHub { owner = "$OWNER"; repo = "$REPO"; - rev = "\${version}"; + rev = "v\${version}"; hash = "$HASH"; }; patches = [$PATCHES]; diff --git a/pkgs/servers/matrix-hebbot/default.nix b/pkgs/servers/matrix-hebbot/default.nix index 83b1ff007032f..59e4ca1b19168 100644 --- a/pkgs/servers/matrix-hebbot/default.nix +++ b/pkgs/servers/matrix-hebbot/default.nix @@ -39,6 +39,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/haecker-felix/hebbot"; changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v${version}"; license = with licenses; [ agpl3 ]; + mainProgram = "hebbot"; maintainers = with maintainers; [ a-kenji ]; }; } diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix index b522dc0636f63..41a72eec05956 100644 --- a/pkgs/servers/mautrix-googlechat/default.nix +++ b/pkgs/servers/mautrix-googlechat/default.nix @@ -7,13 +7,13 @@ , enableSqlite ? true }: python3.pkgs.buildPythonApplication rec { pname = "mautrix-googlechat"; - version = "unstable-2023-07-16"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "googlechat"; - rev = "f4cddafd474b12be09efd15c6652c04d0650458e"; - sha256 = "sha256-WMJVAX5oUdYYuXoJKk7OoERR0LJM0Er5444xwqIUTm8="; + rev = "refs/tags/v${version}"; + hash = "sha256-a/EWz/aCkBE6XdDpmZcx2Q7/xKNwGCiZUhZc9YIIDhU="; }; patches = [ diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 3baacb2fc8d5e..95f95cda68e70 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.21"; + version = "1.6.22"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-x4iYDvxBfdXZPEQrHIuHafsgGIlsKd44h9IqLxQ9ou4="; + sha256 = "sha256-NHg6kKTM90xBBwhf2Stoh0nSOyds/a2fBOT3JaBdHKc="; }; configureFlags = [ diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index b9505f15da4c6..5d572c18e253a 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -12,6 +12,12 @@ let splitTS = builtins.elemAt (builtins.split "(.*)(T.*)" version) 1; in builtins.concatStringsSep "" [ (builtins.elemAt splitTS 0) (builtins.replaceStrings [ "-" ] [ ":" ] (builtins.elemAt splitTS 1)) ]; + + # CopyrightYear will be printed to the CLI UI. + # Example: + # versionToYear "2021-04-22T15-44-28Z" + # => "2021" + versionToYear = version: builtins.elemAt (lib.splitString "-" version) 0; in buildGoModule rec { pname = "minio"; @@ -35,7 +41,12 @@ buildGoModule rec { tags = [ "kqueue" ]; ldflags = let t = "github.com/minio/minio/cmd"; in [ - "-s" "-w" "-X ${t}.Version=${versionToTimestamp version}" "-X ${t}.ReleaseTag=RELEASE.${version}" "-X ${t}.CommitID=${src.rev}" + "-s" + "-w" + "-X ${t}.Version=${versionToTimestamp version}" + "-X ${t}.CopyrightYear=${versionToYear version}" + "-X ${t}.ReleaseTag=RELEASE.${version}" + "-X ${t}.CommitID=${src.rev}" ]; passthru.tests.minio = nixosTests.minio; diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index 9beb2b095c078..8a1a1aca85a9d 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-tbM2JWoub789s3YanT/lqCKl6JkY+FahSYb+lHvF7W8="; }; + separateDebugInfo = true; + cargoHash = "sha256-l2rWR9HAXTuNEarj2hWaZxpTdUNGoCnNfsZs8Y+of+s="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 96ec5a8d21d68..91c595a8255d2 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.37.2"; + version = "0.37.3"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-LeXJ//WbvlOtlomzws3Aa2FE9D4D4KF5iCjPyFyExig="; + hash = "sha256-mu1kkC6bfsUIdDdMC5s6F+YN7dc+pwaZ+9hHHNl5nj4="; }; - vendorHash = "sha256-DKFXJ+1EE/92BOoGVit7ZK6U2HL8JyG9HqcA8ww3mtA="; + vendorHash = "sha256-emtSRn/xT9RSEdGrkfaa+IuP5yF+tVLP1j+bzOoNHXg="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 4d6351c5edf07..e988bc7f0ba77 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.8.3"; + version = "3.8.4"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-3CaIVOzya0euQEpFAqqwy9L6Dn6qxPzpYFjJOL80Ka0="; + hash = "sha256-YfqIWPciFyPIpQypSDNEK2yXV1Ah9TiLiEzEFA/KcMw="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-GQ4dV3tyyKSYDA1tUgB+VaUBKIktdbx0o6GgBLQQkFc="; + hash = "sha256-HgUHxfFchqarVMmxbEg1gRN9vSkEx48aSy1yreux9fs="; }; packageJSON = ./package.json; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 0e0d9fd49d543..8e32a849b69b3 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -69,7 +69,7 @@ "typescript": "4.8.3" }, "resolutions": { - "jpeg-js": "^0.4.4" + "xml2js": "^0.6.2" }, "lint-staged": { "*.ts": [ diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index a496b578d88cc..c4c9c75903a2c 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "10.1.5"; + version = "10.2.0"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - hash = "sha256-/caja157OKe9atqZLDzw2oTwhWLNa5DxcgO1iueKow4="; + hash = "sha256-PNKvu7DfVHzBaRGM/Zej0oI5pbi6gPta+ZzVEXXmTsI="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - hash = "sha256-7LGs/8pbZMEwXHBSPac+guJ3GcYBS3qIRz7JeqZuVQ0="; + hash = "sha256-KE026VWxlJYzRqTqry4h8vm1NIXB7sJUucz+W/s1eoE="; }; - vendorHash = "sha256-KXgGtNHUi+k41GC3Wc5hbJw4k5fxq/p0Je6Q6UZwhtw="; + vendorHash = "sha256-Mybo7ZVP7fwmBwloC3jHJnqPmhbj1DQSwz8T2onkL3Y="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix index 15a5fbfa2d76f..f61e400d860f9 100644 --- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bird-exporter"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "czerwonk"; repo = "bird_exporter"; rev = version; - sha256 = "sha256-XGHOEnAichQEir0k8wj/OSuj1zk8UsLYi9azg6lgpws="; + sha256 = "sha256-aClwJ+J83iuZbfNP+Y1vKEjBULD5wh/R3TMceCccacc="; }; - vendorHash = "sha256-X6zrCTGZaSdQS9bwzjbSGkmNs38JBxZMtrqajQxkzK0="; + vendorHash = "sha256-0EXRpehdpOYpq6H9udmNnQ24EucvAcPUKOlFSAAewbE="; passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; }; diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/servers/monitoring/prometheus/exportarr/default.nix index a7649ba17bb86..27e5da34efcf3 100644 --- a/pkgs/servers/monitoring/prometheus/exportarr/default.nix +++ b/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "exportarr"; - version = "1.5.5"; + version = "1.6.0"; src = fetchFromGitHub { owner = "onedr0p"; repo = "exportarr"; rev = "v${version}"; - hash = "sha256-qe3i/sukAkE3DNiSc5BsY9OFWoAVuLsuYStlPfpVZQQ="; + hash = "sha256-jmvVhNaE0cVLHTLH6qKIi4ETr7Q8CTEhXPwzjWyfx5k="; }; - vendorHash = "sha256-M+XDd2ubF4HLpFNPlhn++YXWwPwL6+5TMU+BDdkP+k0="; + vendorHash = "sha256-AYuyOAU7T9YluX77zPu4o377L4wCQzVUrQunt0UIZlU="; subPackages = [ "cmd/exportarr" ]; diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix index b5c8d994bd0f2..2b50c7850702a 100644 --- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "junos-czerwonk-exporter"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "czerwonk"; repo = "junos_exporter"; rev = version; - sha256 = "sha256-9Oh1GsqoIml/SKCmLHuJSnz0k2szEYkb6ArEsU5p198="; + sha256 = "sha256-KdVyRddAr2gqiFyIGBfWbi4DHAaiey4p4OBFND/2u7U="; }; - vendorHash = "sha256-cQChRpjhL3plUk/J+8z2cg3u9IhMo6aTAbY8M/qlXSQ="; + vendorHash = "sha256-fytDr56ZhhO5u6u9CRIEKXGqgnzntSVqEVItibpLyPM="; meta = with lib; { description = "Exporter for metrics from devices running JunOS"; diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 5f102f1c4162c..4f683b83a5719 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -6,13 +6,13 @@ buildGo121Module rec { pname = "ferretdb"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-3fLTiI13Mm+G6EEEOzCuJ9KVebCq5O54hyH6JiCRRL8="; + hash = "sha256-D1iMYh76a9H38tiZWByuJZrABWfjQFCkyxtbtLM/DMw="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGo121Module rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-l45KFDpqprBWnsVRhOJkCWolZapArRvjUb52R5hc5zs="; + vendorHash = "sha256-WrnACseWo+bLn0IJhGY/DFsrMFAyy7J02cjO4FvE2xA="; CGO_ENABLED = 0; diff --git a/pkgs/servers/nosql/janusgraph/default.nix b/pkgs/servers/nosql/janusgraph/default.nix index 16b2ca404246d..36385fd46cca4 100644 --- a/pkgs/servers/nosql/janusgraph/default.nix +++ b/pkgs/servers/nosql/janusgraph/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "janusgraph"; - version = "0.6.3"; + version = "0.6.4"; src = fetchzip { url = "https://github.com/JanusGraph/janusgraph/releases/download/v${version}/janusgraph-${version}.zip"; - sha256 = "sha256-KpGvDfQExU6pHheqmcOFoAhHdF4P+GBQu779h+/L5mE="; + sha256 = "sha256-rfqZE7HYgudVjrz+Ij+ggltaBXvYbczgRwCqsNTojTg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index f2bbf4b9a2501..d989d125b2fb2 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "7.3.2"; + version = "7.3.3"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-JiMY4TICsf7OQPXYCOqlQ+av0InR10EptXHm/QXEpGI="; + hash = "sha256-THQGgvSxij1xpAsOj3oCYYDfhoe/ji3jZ6PMT+5UThc="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/osmocom/osmo-bts/default.nix b/pkgs/servers/osmocom/osmo-bts/default.nix index 3aa14e1f56f69..6ba3e2f8f0cab 100644 --- a/pkgs/servers/osmocom/osmo-bts/default.nix +++ b/pkgs/servers/osmocom/osmo-bts/default.nix @@ -8,19 +8,15 @@ , libosmo-netif }: -let - inherit (stdenv) isLinux; -in - stdenv.mkDerivation rec { pname = "osmo-bts"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-bts"; rev = version; - hash = "sha256-tg6SxTSmPAkmoWsA0U69/EESlziR4cnq/+PWLavS3mk="; + hash = "sha256-Y972aa98bNU3IhuGMV80nh4ZjQKUdK6of1Q8H75Ips8="; }; postPatch = '' diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/servers/pr-tracker/default.nix index 33ce80cdaaf59..1c07a56a7e3ae 100644 --- a/pkgs/servers/pr-tracker/default.nix +++ b/pkgs/servers/pr-tracker/default.nix @@ -1,6 +1,6 @@ { rustPlatform , lib -, fetchurl +, fetchzip , openssl , pkg-config , systemd @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "pr-tracker"; - version = "1.2.0"; + version = "1.3.0"; - src = fetchurl { + src = fetchzip { url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz"; - sha256 = "sha256-Tru9DsitRQLiO4Ln70J9LvkEqcj2i4A+eArBvIhd/ls="; + hash = "sha256-JetfcA7Pn6nsCxCkgxP4jS6tijx89any/0GrmLa+DR0="; }; - cargoSha256 = "0q3ibxnzw8gngvrgfkv4m64dr411c511xkvb6j9k63vhy9vwarz7"; + cargoSha256 = "sha256-QUr0IHmzbhFNd6rBDEX8RZul/d1TLv0t+ySCQYMlpmE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl systemd ]; diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 7321c04700b36..9e43e30559dbe 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-oYO6XXy+x4+YxgpwpiTG/3AxrEKQdBlWDZ7yDI1Q7iY="; - aarch64-linux = "sha256-5A7Rk/3U+GvDmAX/bWBRZCY2t2AFKGORlL60dtzuaOI="; - x86_64-darwin = "sha256-E4921TAKduFMph7I4uxL354G1dqO+Nb94W9nMmB3hKs="; - x86_64-linux = "sha256-KcFtQmmjfHfI38en83vTcIGXoli2S13JfO2U2tW01pc="; + aarch64-darwin = "sha256-5K18Vd0Ly/2YSmAvTbgiSQR8ifaz9wMs3vI0WFtB90g="; + aarch64-linux = "sha256-QI4+TVW/Zj1sI4yoxTGpzYNPufKnp68fLgDmajzD+6Y="; + x86_64-darwin = "sha256-qofWOMJIen8dI1wDFwNWeYuV9Ett3KvaTLfuK/v2USs="; + x86_64-linux = "sha256-qqAoXPdsjpn6Al5CLcvqfsZe9PRp8Swg1Wiy0w20hHs="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.8.6.3946"; + version = "1.9.4.4039"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 686b68c6c6744..6b62f066211d4 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config +{ lib, stdenv, fetchurl, pkg-config , libsndfile, libtool, makeWrapper, perlPackages , xorg, libcap, alsa-lib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus @@ -88,45 +88,47 @@ stdenv.mkDerivation rec { ); mesonFlags = [ - "-Dalsa=${if !libOnly && alsaSupport then "enabled" else "disabled"}" - "-Dasyncns=${if !libOnly then "enabled" else "disabled"}" - "-Davahi=${if zeroconfSupport then "enabled" else "disabled"}" - "-Dbluez5=${if !libOnly && bluetoothSupport then "enabled" else "disabled"}" + (lib.mesonEnable "alsa" (!libOnly && alsaSupport)) + (lib.mesonEnable "asyncns" (!libOnly)) + (lib.mesonEnable "avahi" zeroconfSupport) + (lib.mesonEnable "bluez5" (!libOnly && bluetoothSupport)) # advanced bluetooth audio codecs are provided by gstreamer - "-Dbluez5-gstreamer=${if (!libOnly && bluetoothSupport && advancedBluetoothCodecs) then "enabled" else "disabled"}" - "-Ddatabase=simple" - "-Ddoxygen=false" - "-Delogind=disabled" + (lib.mesonEnable "bluez5-gstreamer" (!libOnly && bluetoothSupport && advancedBluetoothCodecs)) + (lib.mesonOption "database" "simple") + (lib.mesonBool "doxygen" false) + (lib.mesonEnable "elogind" false) # gsettings does not support cross-compilation - "-Dgsettings=${if stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" - "-Dgstreamer=disabled" - "-Dgtk=disabled" - "-Djack=${if jackaudioSupport && !libOnly then "enabled" else "disabled"}" - "-Dlirc=${if remoteControlSupport then "enabled" else "disabled"}" - "-Dopenssl=${if airtunesSupport then "enabled" else "disabled"}" - "-Dorc=disabled" - "-Dsystemd=${if useSystemd && !libOnly then "enabled" else "disabled"}" - "-Dtcpwrap=disabled" - "-Dudev=${if !libOnly && udevSupport then "enabled" else "disabled"}" - "-Dvalgrind=disabled" - "-Dwebrtc-aec=${if !libOnly then "enabled" else "disabled"}" - "-Dx11=${if x11Support then "enabled" else "disabled"}" - - "-Dlocalstatedir=/var" - "-Dsysconfdir=/etc" - "-Dsysconfdir_install=${placeholder "out"}/etc" - "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" + (lib.mesonEnable "gsettings" (stdenv.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform))) + (lib.mesonEnable "gstreamer" false) + (lib.mesonEnable "gtk" false) + (lib.mesonEnable "jack" (jackaudioSupport && !libOnly)) + (lib.mesonEnable "lirc" remoteControlSupport) + (lib.mesonEnable "openssl" airtunesSupport) + (lib.mesonEnable "orc" false) + (lib.mesonEnable "systemd" (useSystemd && !libOnly)) + (lib.mesonEnable "tcpwrap" false) + (lib.mesonEnable "udev" (!libOnly && udevSupport)) + (lib.mesonEnable "valgrind" false) + (lib.mesonEnable "webrtc-aec" (!libOnly)) + (lib.mesonEnable "x11" x11Support) + + (lib.mesonOption "localstatedir" "/var") + (lib.mesonOption "sysconfdir" "/etc") + (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc") + (lib.mesonOption "udevrulesdir" "${placeholder "out"}/lib/udev/rules.d") # pulseaudio complains if its binary is moved after installation; # this is needed so that wrapGApp can operate *without* # renaming the unwrapped binaries (see below) "--bindir=${placeholder "out"}/.bin-unwrapped" ] - ++ lib.optional (stdenv.isLinux && useSystemd) "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + ++ lib.optionals (stdenv.isLinux && useSystemd) [ + (lib.mesonOption "systemduserunitdir" "${placeholder "out"}/lib/systemd/user") + ] ++ lib.optionals stdenv.isDarwin [ - "-Ddbus=disabled" - "-Dglib=disabled" - "-Doss-output=disabled" + (lib.mesonEnable "dbus" false) + (lib.mesonEnable "glib" false) + (lib.mesonEnable "oss-output" false) ]; # tests fail on Darwin because of timeouts diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 74dc9acfc9825..a2efdb1e1be7e 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-H48WjqRAG7I+IPhCANuJ137IwCXkTa5vrfh5Wm4tOyE="; - arm64-linux_hash = "sha256-lBclZfdYuI/ICgEpnekxNdMB6lvsJfK6Wzf/mMmtafU="; - x64-osx_hash = "sha256-1UUK0xU0WdLMjkbIEWVqpwa74tir9CkTSq63uqq9ygY="; + x64-linux_hash = "sha256-1EdDMSlC6hh1iNmra63DTLG6TAkmpZ/lIjvdfLJuC74="; + arm64-linux_hash = "sha256-CZj/zg6SkHmpiIbEIpxYMtlSLsDTFLBJYqr2pUpSu94="; + x64-osx_hash = "sha256-NRMbHLffx093gEb24I/fdp2fYioDehQ5gBMpZciX+ts="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.6.2232"; + version = "0.3.8.2267"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock index 2fc31649d2f4d..ddb34d1095bea 100644 --- a/pkgs/servers/search/qdrant/Cargo.lock +++ b/pkgs/servers/search/qdrant/Cargo.lock @@ -457,7 +457,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "api" -version = "1.5.1" +version = "1.6.1" dependencies = [ "chrono", "common", @@ -842,11 +842,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.78" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -913,9 +914,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", @@ -985,9 +986,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" dependencies = [ "clap_builder", "clap_derive", @@ -995,9 +996,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" dependencies = [ "anstream", "anstyle", @@ -1050,6 +1051,7 @@ dependencies = [ "futures", "hashring", "indicatif", + "io", "itertools 0.11.0", "log", "merge", @@ -1099,13 +1101,18 @@ dependencies = [ [[package]] name = "common" -version = "0.1.0" +version = "0.0.0" dependencies = [ + "ordered-float 3.9.1", "serde", "validator", ] [[package]] +name = "common-workspace-stub" +version = "0.0.0" + +[[package]] name = "config" version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2113,7 +2120,7 @@ dependencies = [ "atomic-polyfill", "hash32", "rustc_version", - "spin 0.9.4", + "spin 0.9.8", "stable_deref_trait", ] @@ -2361,6 +2368,17 @@ dependencies = [ ] [[package]] +name = "io" +version = "0.0.0" +dependencies = [ + "atomicwrites", + "bincode", + "serde", + "serde_json", + "thiserror", +] + +[[package]] name = "io-lifetimes" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2379,9 +2397,9 @@ dependencies = [ [[package]] name = "io-uring" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141a0f4546a50b2ed637c7a6df0d7dff45c9f41523254996764461c8ae0d9424" +checksum = "460648e47a07a43110fbfa2e0b14afb2be920093c31e5dccc50e49568e099762" dependencies = [ "bitflags 1.3.2", "libc", @@ -2894,6 +2912,16 @@ dependencies = [ ] [[package]] +name = "memory" +version = "0.0.0" +dependencies = [ + "log", + "memmap2 0.7.1", + "parking_lot", + "serde", +] + +[[package]] name = "merge" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3681,7 +3709,7 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.5.1" +version = "1.6.1" dependencies = [ "actix-cors", "actix-files", @@ -3690,7 +3718,6 @@ dependencies = [ "actix-web-validator", "anyhow", "api", - "atty", "chrono", "clap", "collection", @@ -3703,6 +3730,7 @@ dependencies = [ "futures-util", "itertools 0.11.0", "log", + "memory", "num-traits", "num_cpus", "parking_lot", @@ -4349,9 +4377,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161" +checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" dependencies = [ "chrono", "dyn-clone", @@ -4365,9 +4393,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.13" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" +checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" dependencies = [ "proc-macro2", "quote", @@ -4448,10 +4476,12 @@ dependencies = [ "futures", "geo", "geohash", + "io", "io-uring", "itertools 0.11.0", "log", "memmap2 0.7.1", + "memory", "num-derive", "num-traits", "num_cpus", @@ -4474,6 +4504,7 @@ dependencies = [ "serde_cbor", "serde_json", "smol_str", + "sparse", "sysinfo", "tar", "tempfile", @@ -4544,9 +4575,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4718,6 +4749,19 @@ dependencies = [ ] [[package]] +name = "sparse" +version = "0.1.0" +dependencies = [ + "common", + "io", + "memmap2 0.7.1", + "memory", + "serde", + "serde_json", + "tempfile", +] + +[[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4725,9 +4769,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -4757,8 +4801,10 @@ dependencies = [ "env_logger", "futures", "http", + "io", "itertools 0.11.0", "log", + "memory", "num_cpus", "parking_lot", "proptest", @@ -5281,9 +5327,9 @@ dependencies = [ [[package]] name = "tracing-tracy" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3edd27f53bc0e55aefa9223f68eb44354060103d3e34635f6e27627fe0227f" +checksum = "fc6c7bf057d67aa107e076129a4f331aaac47ec379952d9f0775c6b1d838ee97" dependencies = [ "tracing-core", "tracing-subscriber", @@ -5292,9 +5338,9 @@ dependencies = [ [[package]] name = "tracy-client" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c78458aa3759647e0399e959a06f9f6dc61450a1caaa4f1632a3df8e8c55af7" +checksum = "546e6c86bca7bd67b86437eade85e98b327de24cdb8429c701a98af755034572" dependencies = [ "loom", "once_cell", @@ -5303,9 +5349,9 @@ dependencies = [ [[package]] name = "tracy-client-sys" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d99f5fc382239d08b6bf05bb6206a585bfdb988c878f2499081d0f285ef7819" +checksum = "2cb915ea3af048554640d76dd6f1492589a6401a41a30d789b983c1ec280455a" dependencies = [ "cc", ] diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index 6d70b5e4b3dac..a3aee4fc59360 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-CWE3tCeLJjtuFcvnGLdODtx0mvVSl2ULIcxgf3X3SPU="; + sha256 = "sha256-G9nA0F3KKl6mLgcpuMW1uikOyBcBsJ1qd2IlMhW4vhg="; }; cargoLock = { diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index ae37dab2e945d..197e9b48d18b8 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.28.4"; + version = "2.29.1"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-tXP7jxpqBASNShNe9rHiewSgdW/KgkH80V24VgJlXZE="; + sha256 = "sha256-ZE17VCrpHlZ4GMc7+DaUyuehKtYWMr7NJFV1hGQ+UsA="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index cc3853624706a..d0d4aba42a929 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "zed"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-+u8qrF/P8a19Bc085upT65xVPGIVR3My/k/enhdUJmQ="; + hash = "sha256-+YgGxqnHkdPbRbQj5o1+Hx259Ih07x0sdt6AHoD1UvI="; }; vendorHash = "sha256-f0UNUOi0WXm06dko+7O00C0dla/JlfGlXaZ00TMX0WU="; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index cd1a03ff04c64..7500c0ca4ff2b 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.18.1"; + version = "1.21.4"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-fjiKUKI+NH825Pb0jCE4AN1ZU075J8jk3avWe0oYAWI="; + sha256 = "sha256-pa9xsbO/d5/3wCx2XKn4dzlqPlO3Ie/cGJiwfWTEUKc="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-wjZ28ttrKaumQXhU/BUYUxXfsdM1QqlKVt9NKglVyjU="; + vendorHash = "sha256-1Cy0PmDmMPpPZ2PLDP6sywb39MuExv2yabqSeP3Of9M="; proxyVendor = true; doCheck = false; diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 69a7893ed7c2b..5b048cdddd44b 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, ant, unzip }: +{ lib, stdenv, fetchurl, ant, unzip, gitUpdater }: stdenv.mkDerivation rec { pname = "mysql-connector-java"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip"; - sha256 = "sha256-xFYvNbb5cj6xrMHAnTzGLC8v5fxqRcmZhf4haK3wtUk="; + hash = "sha256-N0emBuTaYlyL1SS0wDOR8uiz4yGUOMllKR7LC60eFEg="; }; installPhase = '' @@ -18,11 +18,17 @@ stdenv.mkDerivation rec { buildInputs = [ ant ]; + passthru.updateScript = gitUpdater { + url = "https://github.com/mysql/mysql-connector-j.git"; + }; + meta = with lib; { description = "MySQL Connector/J"; - homepage = "https://dev.mysql.com/doc/connector-j/8.1/en/"; + homepage = "https://dev.mysql.com/doc/connector-j/en/"; + changelog = "https://dev.mysql.com/doc/relnotes/connector-j/en/"; maintainers = with maintainers; [ ]; platforms = platforms.unix; license = licenses.gpl2; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 1eefb5099aa9f..02c6e6435ae75 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_cron"; - version = "1.6.1"; + version = "1.6.2"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = pname; rev = "v${version}"; - hash = "sha256-GvxlaSfsqOiF1mrGo9jVv/K3xVInutkRN3AJHXKUBHQ="; + hash = "sha256-/dD1gX0+RRsBFIjSV9TVk+ppPw0Jrzssl+rRZ2qAp4w="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index a37556436e740..83acc0804eee1 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - hash = "sha256-IR1x1duROt3IHYQx8CYXqUxTmFgB1sbia93k3oBfEkw="; + hash = "sha256-fahL+8aq4rUGYgEq6ri5wzVprDqvMmZCNkxwKtcPO68="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix new file mode 100644 index 0000000000000..f62eae5b6a3e2 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/tsja.nix @@ -0,0 +1,45 @@ +{ lib +, fetchzip +, nixosTests +, stdenv + +, mecab +, postgresql +}: + +stdenv.mkDerivation rec { + pname = "tsja"; + version = "0.5.0"; + + src = fetchzip { + url = "https://www.amris.jp/tsja/tsja-${version}.tar.xz"; + hash = "sha256-h59UhUG/7biN8NaDiGK6kXDqfhR9uMzt8CpwbJ+PpEM="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace /usr/local/pgsql ${postgresql} \ + --replace -L/usr/local/lib "" \ + --replace -I/usr/local/include "" + substituteInPlace tsja.c --replace /usr/local/lib/mecab ${mecab}/lib/mecab + ''; + + buildInputs = [ mecab postgresql ]; + + installPhase = '' + mkdir -p $out/lib $out/share/postgresql/extension + mv libtsja.so $out/lib + mv dbinit_libtsja.txt $out/share/postgresql/extension/libtsja_dbinit.sql + ''; + + passthru.tests.tsja = nixosTests.tsja; + + meta = with lib; { + description = "PostgreSQL extension implementing Japanese text search"; + homepage = "https://www.amris.jp/tsja/index.html"; + maintainers = with maintainers; [ chayleaf ]; + # GNU-specific linker options are used + platforms = platforms.gnu; + license = licenses.gpl2Only; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 69309d0c4824e..d9d9ce8b09d98 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -87,5 +87,7 @@ self: super: { rum = super.callPackage ./ext/rum.nix { }; + tsja = super.callPackage ./ext/tsja.nix { }; + wal2json = super.callPackage ./ext/wal2json.nix { }; } diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 6add47454c2f6..97ec06306fc4a 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -1,22 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, libcap, libconfig, perl, tcp_wrappers, pcre2, nixosTests }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, libcap, libev, libconfig, perl, tcp_wrappers, pcre2, nixosTests }: stdenv.mkDerivation rec { pname = "sslh"; - version = "1.22c"; + version = "2.0.0"; src = fetchFromGitHub { owner = "yrutschle"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A+nUWiOPoz/T5afZUzt5In01e049TgHisTF8P5Vj180="; + hash = "sha256-KfNQWSmAf86AFoInKlNZoiSuSwVLaJVnfo7SjZVY/VU="; }; postPatch = "patchShebangs *.sh"; - buildInputs = [ libcap libconfig perl tcp_wrappers pcre2 ]; + buildInputs = [ libcap libev libconfig perl tcp_wrappers pcre2 ]; makeFlags = [ "USELIBCAP=1" "USELIBWRAP=1" ]; + postInstall = '' + # install all flavours + install -p sslh-fork "$out/sbin/sslh-fork" + install -p sslh-select "$out/sbin/sslh-select" + install -p sslh-ev "$out/sbin/sslh-ev" + ln -sf sslh-fork "$out/sbin/sslh" + ''; + installFlags = [ "PREFIX=$(out)" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index bf3f4fa30058f..b5b855a4b6983 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -1,8 +1,6 @@ { lib , stdenv -, callPackage , fetchFromGitHub -, fetchurl , autoPatchelfHook , makeWrapper , buildNpmPackage @@ -14,7 +12,6 @@ , libxcb , openssl , libopus -, ffmpeg_5-full , boost , pkg-config , libdrm @@ -23,47 +20,45 @@ , libcap , mesa , curl +, pcre +, pcre2 +, libuuid +, libselinux +, libsepol +, libthai +, libdatrie +, libxkbcommon +, libepoxy , libva , libvdpau , numactl , amf-headers +, intel-media-sdk , svt-av1 , vulkan-loader , libappindicator +, libnotify , config , cudaSupport ? config.cudaSupport , cudaPackages ? {} }: -let - libcbs = callPackage ./libcbs.nix { }; - # get cmake file used to find external ffmpeg from previous sunshine version - findFfmpeg = fetchurl { - url = "https://raw.githubusercontent.com/LizardByte/Sunshine/6702802829869547708dfec98db5b8cbef39be89/cmake/FindFFMPEG.cmake"; - sha256 = "sha256:1hl3sffv1z8ghdql5y9flk41v74asvh23y6jmaypll84f1s6k1xa"; - }; -in stdenv.mkDerivation rec { pname = "sunshine"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "LizardByte"; repo = "Sunshine"; rev = "v${version}"; - sha256 = "sha256-/ceN44PAEtXzrAUi4AEldW1FBhJqIXah1Zd0S6fiV3s="; + sha256 = "sha256-uvQAJkoKazFLz5iTpYSAGYJQZ2EprQ+p9+tryqorFHM="; fetchSubmodules = true; }; - # remove pre-built ffmpeg; use ffmpeg from nixpkgs - patches = [ - ./ffmpeg.diff - ]; - # fetch node_modules needed for webui ui = buildNpmPackage { inherit src version; pname = "sunshine-ui"; - npmDepsHash = "sha256-pwmkpZjDwluKJjcY0ehetQbAlFnj1tsW100gRjolboc="; + npmDepsHash = "sha256-+T1XAf4SThoJLOFpnVxDa2qiKFLIKQPGewjA83GQovM="; dontNpmBuild = true; @@ -88,9 +83,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libcbs avahi - ffmpeg_5-full libevdev libpulseaudio xorg.libX11 @@ -109,6 +102,16 @@ stdenv.mkDerivation rec { libcap libdrm curl + pcre + pcre2 + libuuid + libselinux + libsepol + libthai + libdatrie + xorg.libXdmcp + libxkbcommon + libepoxy libva libvdpau numactl @@ -116,8 +119,11 @@ stdenv.mkDerivation rec { amf-headers svt-av1 libappindicator + libnotify ] ++ lib.optionals cudaSupport [ cudaPackages.cudatoolkit + ] ++ lib.optionals stdenv.isx86_64 [ + intel-media-sdk ]; runtimeDependencies = [ @@ -132,16 +138,13 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # fix hardcoded libevdev and icon path - substituteInPlace CMakeLists.txt \ - --replace '/usr/include/libevdev-1.0' '${libevdev}/include/libevdev-1.0' \ - --replace '/usr/share' "$out/share" + # fix hardcoded libevdev path + substituteInPlace cmake/compile_definitions/linux.cmake \ + --replace '/usr/include/libevdev-1.0' '${libevdev}/include/libevdev-1.0' substituteInPlace packaging/linux/sunshine.desktop \ - --replace '@PROJECT_NAME@' 'Sunshine' - - # add FindFFMPEG to source tree - cp ${findFfmpeg} cmake/FindFFMPEG.cmake + --replace '@PROJECT_NAME@' 'Sunshine' \ + --replace '@PROJECT_DESCRIPTION@' 'Self-hosted game stream host for Moonlight' ''; preBuild = '' @@ -163,7 +166,7 @@ stdenv.mkDerivation rec { passthru.updateScript = ./updater.sh; meta = with lib; { - description = "Sunshine is a Game stream host for Moonlight."; + description = "Sunshine is a Game stream host for Moonlight"; homepage = "https://github.com/LizardByte/Sunshine"; license = licenses.gpl3Only; maintainers = with maintainers; [ devusb ]; diff --git a/pkgs/servers/sunshine/ffmpeg.diff b/pkgs/servers/sunshine/ffmpeg.diff deleted file mode 100644 index ea028df59563c..0000000000000 --- a/pkgs/servers/sunshine/ffmpeg.diff +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ccca6fc..8789a4a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -349,6 +349,8 @@ else() - set(WAYLAND_FOUND OFF) - endif() - -+ find_package(FFMPEG REQUIRED) -+ - if(X11_FOUND) - add_compile_definitions(SUNSHINE_BUILD_X11) - include_directories(SYSTEM ${X11_INCLUDE_DIR}) -@@ -547,43 +549,7 @@ set_source_files_properties(third-party/nanors/rs.c - - list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_TRAY=${SUNSHINE_TRAY}) - --# Pre-compiled binaries --if(WIN32) -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64") -- set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid mfx) --elseif(APPLE) -- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-aarch64") -- else() -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-x86_64") -- endif() --else() - set(FFMPEG_PLATFORM_LIBRARIES va va-drm va-x11 vdpau X11) -- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-aarch64") -- else() -- set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-linux-x86_64") -- list(APPEND FFMPEG_PLATFORM_LIBRARIES mfx) -- set(CPACK_DEB_PLATFORM_PACKAGE_DEPENDS "libmfx1,") -- set(CPACK_RPM_PLATFORM_PACKAGE_REQUIRES "intel-mediasdk >= 22.3.0,") -- endif() --endif() --set(FFMPEG_INCLUDE_DIRS -- ${FFMPEG_PREPARED_BINARIES}/include) --if(EXISTS ${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a) -- set(HDR10_PLUS_LIBRARY -- ${FFMPEG_PREPARED_BINARIES}/lib/libhdr10plus.a) --endif() --set(FFMPEG_LIBRARIES -- ${FFMPEG_PREPARED_BINARIES}/lib/libavcodec.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libavutil.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libcbs.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libSvtAv1Enc.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libswscale.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libx264.a -- ${FFMPEG_PREPARED_BINARIES}/lib/libx265.a -- ${HDR10_PLUS_LIBRARY} -- ${FFMPEG_PLATFORM_LIBRARIES}) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - -@@ -593,7 +559,6 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/third-party/moonlight-common-c/enet/include - ${CMAKE_CURRENT_SOURCE_DIR}/third-party/nanors - ${CMAKE_CURRENT_SOURCE_DIR}/third-party/nanors/deps/obl -- ${FFMPEG_INCLUDE_DIRS} - ${PLATFORM_INCLUDE_DIRS} - ) - -@@ -627,7 +592,9 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES - ${CMAKE_THREAD_LIBS_INIT} - enet - opus -+ cbs - ${FFMPEG_LIBRARIES} -+ ${FFMPEG_PLATFORM_LIBRARIES} - ${Boost_LIBRARIES} - ${OPENSSL_LIBRARIES} - ${CURL_LIBRARIES} diff --git a/pkgs/servers/sunshine/libcbs.nix b/pkgs/servers/sunshine/libcbs.nix deleted file mode 100644 index 566c28123ae46..0000000000000 --- a/pkgs/servers/sunshine/libcbs.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv -, fetchFromGitHub -, cmake -, nasm -}: -stdenv.mkDerivation { - pname = "libcbs"; - version = "unstable-2022-02-07"; - - src = fetchFromGitHub { - owner = "LizardByte"; - repo = "build-deps"; - # repo is not versioned -- used latest commit combined with sunshine release - rev = "d6e889188ca10118d769ee1ee3cddf9cf485642b"; - fetchSubmodules = true; - sha256 = "sha256-6xQDJey5JrZXyZxS/yhUBvFi6UD5MsQ3uVtUFrG09Vc="; - }; - - nativeBuildInputs = [ - cmake - nasm - ]; - - # modify paths to allow patches to be applied directly by derivation - prePatch = '' - substituteInPlace ffmpeg_patches/cbs/* \ - --replace 'a/libavcodec' 'a/ffmpeg_sources/ffmpeg/libavcodec' \ - --replace 'b/libavcodec' 'b/ffmpeg_sources/ffmpeg/libavcodec' \ - --replace 'a/libavutil' 'a/ffmpeg_sources/ffmpeg/libavutil' \ - --replace 'b/libavutil' 'b/ffmpeg_sources/ffmpeg/libavutil' - - substituteInPlace cmake/ffmpeg_cbs.cmake \ - --replace '--enable-static' '--enable-shared --enable-pic' \ - --replace 'add_library(cbs' 'add_library(cbs SHARED' \ - --replace 'libcbs.a' 'libcbs.so' - ''; - - patches = [ - "ffmpeg_patches/cbs/01-explicit-intmath.patch" - "ffmpeg_patches/cbs/02-include-cbs-config.patch" - "ffmpeg_patches/cbs/03-remove-register.patch" - "ffmpeg_patches/cbs/04-size-specifier.patch" - ]; - - CFLAGS = [ - "-Wno-format-security" - ]; -} diff --git a/pkgs/servers/sunshine/package-lock.json b/pkgs/servers/sunshine/package-lock.json index 975ebadbf187b..0af94fdd8a106 100644 --- a/pkgs/servers/sunshine/package-lock.json +++ b/pkgs/servers/sunshine/package-lock.json @@ -5,15 +5,15 @@ "packages": { "": { "dependencies": { - "@fortawesome/fontawesome-free": "6.4.0", - "bootstrap": "5.2.3", + "@fortawesome/fontawesome-free": "6.4.2", + "bootstrap": "5.3.2", "vue": "2.6.12" } }, "node_modules/@fortawesome/fontawesome-free": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz", - "integrity": "sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz", + "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==", "hasInstallScript": true, "engines": { "node": ">=6" @@ -30,9 +30,9 @@ } }, "node_modules/bootstrap": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", - "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz", + "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==", "funding": [ { "type": "github", @@ -44,7 +44,7 @@ } ], "peerDependencies": { - "@popperjs/core": "^2.11.6" + "@popperjs/core": "^2.11.8" } }, "node_modules/vue": { diff --git a/pkgs/servers/syncstorage-rs/Cargo.lock b/pkgs/servers/syncstorage-rs/Cargo.lock index 0f91937acb17d..059eca302cc55 100644 --- a/pkgs/servers/syncstorage-rs/Cargo.lock +++ b/pkgs/servers/syncstorage-rs/Cargo.lock @@ -14,8 +14,8 @@ dependencies = [ "futures-sink", "log", "pin-project 0.4.30", - "tokio", - "tokio-util", + "tokio 0.2.25", + "tokio-util 0.3.1", ] [[package]] @@ -77,7 +77,7 @@ dependencies = [ "futures-core", "futures-util", "fxhash", - "h2", + "h2 0.2.7", "http", "httparse", "indexmap", @@ -90,7 +90,7 @@ dependencies = [ "pin-project 1.1.3", "rand 0.7.3", "regex", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "serde_urlencoded", "sha-1", @@ -118,7 +118,7 @@ dependencies = [ "http", "log", "regex", - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -133,7 +133,7 @@ dependencies = [ "futures-channel", "futures-util", "smallvec", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -149,7 +149,7 @@ dependencies = [ "futures-channel", "futures-util", "log", - "mio", + "mio 0.6.23", "mio-uds", "num_cpus", "slab", @@ -257,7 +257,7 @@ dependencies = [ "mime", "pin-project 1.1.3", "regex", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "serde_urlencoded", "socket2 0.3.19", @@ -294,9 +294,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -364,19 +364,19 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" dependencies = [ - "serde 1.0.188", + "serde 1.0.189", "serde_json", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -415,7 +415,7 @@ dependencies = [ "mime", "percent-encoding 2.3.0", "rand 0.7.3", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "serde_urlencoded", ] @@ -469,7 +469,7 @@ dependencies = [ "cexpr", "clang-sys", "clap", - "env_logger", + "env_logger 0.9.3", "lazy_static", "lazycell", "log", @@ -490,24 +490,24 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] -name = "bitmaps" -version = "2.1.0" +name = "block-buffer" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "typenum", + "generic-array", ] [[package]] name = "block-buffer" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -523,9 +523,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -534,9 +534,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -550,9 +550,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[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" @@ -623,8 +623,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.16", - "serde 1.0.188", + "num-traits 0.2.17", "wasm-bindgen", "windows-targets", ] @@ -683,7 +682,7 @@ checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" dependencies = [ "lazy_static", "nom 5.1.3", - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -695,7 +694,7 @@ dependencies = [ "lazy_static", "nom 5.1.3", "rust-ini", - "serde 1.0.188", + "serde 1.0.189", "serde-hjson", "serde_json", "toml", @@ -807,13 +806,13 @@ dependencies = [ ] [[package]] -name = "crypto-mac" -version = "0.11.1" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "subtle", + "typenum", ] [[package]] @@ -833,9 +832,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.66+curl-8.3.0" +version = "0.4.68+curl-8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c44a72e830f0e40ad90dda8a6ab6ed6314d39776599a58a2e5e37fbc6db5b9" +checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" dependencies = [ "cc", "libc", @@ -855,25 +854,28 @@ dependencies = [ "config 0.10.1", "crossbeam-queue", "num_cpus", - "serde 1.0.188", - "tokio", + "serde 1.0.189", + "tokio 0.2.25", ] [[package]] name = "debugid" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ee87af31d84ef885378aebca32be3d682b0e0dc119d5b4860a2c5bb5046730" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "serde 1.0.188", - "uuid", + "serde 1.0.189", + "uuid 1.5.0", ] [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] [[package]] name = "derive_more" @@ -948,6 +950,17 @@ dependencies = [ ] [[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", + "subtle", +] + +[[package]] name = "dirs-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -982,7 +995,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.188", + "serde 1.0.189", "strsim 0.10.0", ] @@ -1033,68 +1046,60 @@ dependencies = [ ] [[package]] -name = "erased-serde" -version = "0.3.31" +name = "env_logger" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "serde 1.0.188", + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", ] [[package]] -name = "errno" -version = "0.3.3" +name = "erased-serde" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", + "serde 1.0.189", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "cc", "libc", + "windows-sys", ] [[package]] -name = "failure" -version = "0.1.8" +name = "fastrand" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] -name = "failure_derive" -version = "0.1.8" +name = "findshlibs" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", + "cc", + "lazy_static", + "libc", + "winapi 0.3.9", ] [[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1208,7 +1213,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1297,9 +1302,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "google-cloud-rust-raw" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1887de8efd052e35bf75e4ed4bc78de35b69447a4b6d9f2e7ede52579512f318" +checksum = "fbabcfb0bcc5e3222191c3f0fba962b0cbf4242d2effe2a865090eee492ffc9c" dependencies = [ "futures 0.3.28", "grpcio", @@ -1351,13 +1356,32 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", - "tokio-util", + "tokio 0.2.25", + "tokio-util 0.3.1", "tracing", "tracing-futures", ] [[package]] +name = "h2" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes 1.5.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio 1.33.0", + "tokio-util 0.7.9", + "tracing", +] + +[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1407,22 +1431,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" dependencies = [ - "digest", "hmac", ] [[package]] name = "hmac" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "crypto-mac", - "digest", + "digest 0.10.7", ] [[package]] @@ -1467,6 +1489,17 @@ dependencies = [ ] [[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes 1.5.0", + "http", + "pin-project-lite 0.2.13", +] + +[[package]] name = "httparse" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1479,6 +1512,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1494,15 +1533,39 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.2.7", "http", - "http-body", + "http-body 0.3.1", "httparse", - "httpdate", + "httpdate 0.3.2", "itoa 0.4.8", "pin-project 1.1.3", "socket2 0.3.19", - "tokio", + "tokio 0.2.25", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes 1.5.0", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.21", + "http", + "http-body 0.4.5", + "httparse", + "httpdate 1.0.3", + "itoa 1.0.9", + "pin-project-lite 0.2.13", + "socket2 0.4.9", + "tokio 1.33.0", "tower-service", "tracing", "want", @@ -1516,10 +1579,10 @@ checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" dependencies = [ "bytes 0.5.6", "futures-util", - "hyper", + "hyper 0.13.10", "log", "rustls", - "tokio", + "tokio 0.2.25", "tokio-rustls", "webpki", ] @@ -1531,24 +1594,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ "bytes 0.5.6", - "hyper", + "hyper 0.13.10", "native-tls", - "tokio", + "tokio 0.2.25", "tokio-tls", ] [[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes 1.5.0", + "hyper 0.14.27", + "native-tls", + "tokio 1.33.0", + "tokio-native-tls", +] + +[[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1599,20 +1675,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] -name = "im" -version = "14.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "696059c87b83c5a258817ecd67c3af915e3ed141891fc35a1e79908801cf0ce7" -dependencies = [ - "bitmaps", - "rand_core 0.5.1", - "rand_xoshiro", - "sized-chunks", - "typenum", - "version_check", -] - -[[package]] name = "indexmap" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1756,9 +1818,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -1790,15 +1852,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "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", @@ -1839,9 +1901,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "migrations_internals" @@ -1915,6 +1977,17 @@ dependencies = [ ] [[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + +[[package]] name = "mio-uds" version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1922,7 +1995,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] @@ -2021,14 +2094,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -2079,7 +2152,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types", "libc", @@ -2096,7 +2169,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2118,6 +2191,17 @@ dependencies = [ ] [[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "serde 1.0.189", + "winapi 0.3.9", +] + +[[package]] name = "parking_lot" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2135,7 +2219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -2154,13 +2238,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 1.0.0", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets", ] @@ -2239,7 +2323,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2267,6 +2351,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2304,9 +2394,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -2463,28 +2553,28 @@ dependencies = [ ] [[package]] -name = "rand_xoshiro" -version = "0.4.0" +name = "redox_syscall" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fcdd2e881d02f1d9390ae47ad8e5696a9e4be7b547a1da2afbc61973217004" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "rand_core 0.5.1", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] @@ -2502,9 +2592,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -2514,9 +2604,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -2525,9 +2615,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" @@ -2541,10 +2631,10 @@ dependencies = [ "futures-core", "futures-util", "http", - "http-body", - "hyper", + "http-body 0.3.1", + "hyper 0.13.10", "hyper-rustls", - "hyper-tls", + "hyper-tls 0.4.3", "ipnet", "js-sys", "lazy_static", @@ -2555,10 +2645,10 @@ dependencies = [ "percent-encoding 2.3.0", "pin-project-lite 0.2.13", "rustls", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.25", "tokio-rustls", "tokio-tls", "url 2.4.1", @@ -2570,6 +2660,44 @@ dependencies = [ ] [[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "base64 0.21.4", + "bytes 1.5.0", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.21", + "http", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding 2.3.0", + "pin-project-lite 0.2.13", + "serde 1.0.189", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio 1.33.0", + "tokio-native-tls", + "tower-service", + "url 2.4.1", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.50.0", +] + +[[package]] name = "resolv-conf" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2627,16 +2755,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.20", ] [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -2745,9 +2873,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "semver-parser" @@ -2757,94 +2885,111 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "sentry" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd0927ec4a785fc4328abe9089afbe074b3874983b3373fc328a73a9f8310cb" +checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc" dependencies = [ "curl", - "httpdate", - "reqwest", + "httpdate 1.0.3", + "native-tls", + "reqwest 0.11.22", "sentry-backtrace", "sentry-contexts", "sentry-core", - "sentry-failure", + "sentry-debug-images", "sentry-panic", - "serde_json", + "sentry-tracing", + "tokio 1.33.0", + "ureq", ] [[package]] name = "sentry-backtrace" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4585422b92435a04569441aef8dc3417eb9d7547fd591b67fdf6fdfe204232c9" +checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670" dependencies = [ "backtrace", - "lazy_static", + "once_cell", "regex", "sentry-core", ] [[package]] name = "sentry-contexts" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d607b3be0593e026f1c089f0086c244429fe3026eca8e075e8f9e834703ee4c0" +checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147" dependencies = [ "hostname", - "lazy_static", "libc", - "regex", - "rustc_version 0.2.3", + "os_info", + "rustc_version 0.4.0", "sentry-core", "uname", ] [[package]] name = "sentry-core" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9c118347dc0958e66f8b0f3866f0d85bbf8a63bffe64603baebe3f989e929e6" +checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053" dependencies = [ - "im", - "lazy_static", - "rand 0.7.3", + "once_cell", + "rand 0.8.5", "sentry-types", + "serde 1.0.189", + "serde_json", ] [[package]] -name = "sentry-failure" -version = "0.19.1" +name = "sentry-debug-images" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8599d375040329e106653a133a1d876af53df8b504cff1de7b6f4471fd41eec3" +checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd" dependencies = [ - "failure", - "sentry-backtrace", + "findshlibs", + "once_cell", "sentry-core", ] [[package]] name = "sentry-panic" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3943c3fc7fff39244158b625bb2235a27e7e4d0b862b5e52cb57db51e6a6e6e" +checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa" dependencies = [ "sentry-backtrace", "sentry-core", ] [[package]] +name = "sentry-tracing" +version = "0.31.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac" +dependencies = [ + "sentry-backtrace", + "sentry-core", + "tracing-core", + "tracing-subscriber", +] + +[[package]] name = "sentry-types" -version = "0.19.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87b41bac48a3586249431fa9efb88cd1414c3455117eb57c02f5bda9634e158d" +checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740" dependencies = [ - "chrono", "debugid", - "serde 1.0.188", + "hex", + "rand 0.8.5", + "serde 1.0.189", "serde_json", "thiserror", + "time 0.3.30", "url 2.4.1", - "uuid", + "uuid 1.5.0", ] [[package]] @@ -2855,9 +3000,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -2876,13 +3021,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2893,7 +3038,7 @@ checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa 1.0.9", "ryu", - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -2905,7 +3050,7 @@ dependencies = [ "form_urlencoded", "itoa 1.0.9", "ryu", - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -2914,10 +3059,10 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] @@ -2938,15 +3083,13 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" [[package]] name = "sha2" -version = "0.9.9" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "block-buffer", "cfg-if 1.0.0", "cpufeatures", - "digest", - "opaque-debug", + "digest 0.10.7", ] [[package]] @@ -2965,16 +3108,6 @@ dependencies = [ ] [[package]] -name = "sized-chunks" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59044ea371ad781ff976f7b06480b9f0180e834eda94114f2afb4afc12b7718" -dependencies = [ - "bitmaps", - "typenum", -] - -[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3026,7 +3159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f400f1c5db96f1f52065e8931ca0c524cceb029f7537c9e6d5424488ca137ca0" dependencies = [ "chrono", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "slog", ] @@ -3063,7 +3196,7 @@ dependencies = [ "slog", "term", "thread_local", - "time 0.3.28", + "time 0.3.30", ] [[package]] @@ -3094,6 +3227,16 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3136,7 +3279,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ "proc-macro2", "quote", - "serde 1.0.188", + "serde 1.0.189", "serde_derive", "syn 1.0.109", ] @@ -3150,7 +3293,7 @@ dependencies = [ "base-x", "proc-macro2", "quote", - "serde 1.0.188", + "serde 1.0.189", "serde_derive", "serde_json", "sha1", @@ -3177,9 +3320,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -3194,9 +3337,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -3205,7 +3348,7 @@ dependencies = [ [[package]] name = "syncserver" -version = "0.14.0" +version = "0.14.1" dependencies = [ "actix-cors", "actix-http", @@ -3218,7 +3361,7 @@ dependencies = [ "chrono", "docopt", "dyn-clone", - "env_logger", + "env_logger 0.10.0", "futures 0.3.28", "hawk", "hex", @@ -3228,10 +3371,10 @@ dependencies = [ "mime", "rand 0.8.5", "regex", - "reqwest", + "reqwest 0.10.10", "sentry", "sentry-backtrace", - "serde 1.0.188", + "serde 1.0.189", "serde_derive", "serde_json", "sha2", @@ -3248,12 +3391,12 @@ dependencies = [ "syncstorage-db", "syncstorage-settings", "thiserror", - "time 0.3.28", + "time 0.3.30", "tokenserver-auth", "tokenserver-common", "tokenserver-db", "tokenserver-settings", - "tokio", + "tokio 0.2.25", "urlencoding", "validator", "validator_derive", @@ -3262,13 +3405,13 @@ dependencies = [ [[package]] name = "syncserver-common" -version = "0.14.0" +version = "0.14.1" dependencies = [ "actix-web", "cadence", "futures 0.3.28", "hkdf", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "sha2", "slog", @@ -3277,7 +3420,7 @@ dependencies = [ [[package]] name = "syncserver-db-common" -version = "0.14.0" +version = "0.14.1" dependencies = [ "backtrace", "deadpool", @@ -3291,11 +3434,11 @@ dependencies = [ [[package]] name = "syncserver-settings" -version = "0.14.0" +version = "0.14.1" dependencies = [ "config 0.11.0", "num_cpus", - "serde 1.0.188", + "serde 1.0.189", "slog-scope", "syncserver-common", "syncstorage-settings", @@ -3305,11 +3448,11 @@ dependencies = [ [[package]] name = "syncstorage-db" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "cadence", - "env_logger", + "env_logger 0.10.0", "futures 0.3.28", "hostname", "lazy_static", @@ -3323,12 +3466,12 @@ dependencies = [ "syncstorage-mysql", "syncstorage-settings", "syncstorage-spanner", - "tokio", + "tokio 0.2.25", ] [[package]] name = "syncstorage-db-common" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "backtrace", @@ -3338,7 +3481,7 @@ dependencies = [ "futures 0.3.28", "http", "lazy_static", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "syncserver-common", "syncserver-db-common", @@ -3347,7 +3490,7 @@ dependencies = [ [[package]] name = "syncstorage-mysql" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "backtrace", @@ -3355,7 +3498,7 @@ dependencies = [ "diesel", "diesel_logger", "diesel_migrations", - "env_logger", + "env_logger 0.10.0", "futures 0.3.28", "http", "slog-scope", @@ -3370,23 +3513,24 @@ dependencies = [ [[package]] name = "syncstorage-settings" -version = "0.14.0" +version = "0.14.1" dependencies = [ "rand 0.8.5", - "serde 1.0.188", + "serde 1.0.189", "syncserver-common", - "time 0.3.28", + "time 0.3.30", ] [[package]] name = "syncstorage-spanner" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "backtrace", "cadence", "deadpool", - "env_logger", + "env_logger 0.10.0", + "form_urlencoded", "futures 0.3.28", "google-cloud-rust-raw", "grpcio", @@ -3399,21 +3543,30 @@ dependencies = [ "syncstorage-db-common", "syncstorage-settings", "thiserror", - "tokio", + "tokio 0.2.25", "url 2.4.1", - "uuid", + "uuid 0.8.2", ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "system-configuration" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] @@ -3466,22 +3619,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3520,24 +3673,25 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa 1.0.9", "libc", "num_threads", - "serde 1.0.188", + "powerfmt", + "serde 1.0.189", "time-core", - "time-macros 0.2.14", + "time-macros 0.2.15", ] [[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 = "time-macros" @@ -3551,9 +3705,9 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -3588,29 +3742,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenserver-auth" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "dyn-clone", "futures 0.3.28", "mockito", "pyo3", - "reqwest", - "serde 1.0.188", + "reqwest 0.10.10", + "serde 1.0.189", "serde_json", "syncserver-common", "tokenserver-common", "tokenserver-settings", - "tokio", + "tokio 0.2.25", ] [[package]] name = "tokenserver-common" -version = "0.14.0" +version = "0.14.1" dependencies = [ "actix-web", "backtrace", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "syncserver-common", "thiserror", @@ -3618,17 +3772,17 @@ dependencies = [ [[package]] name = "tokenserver-db" -version = "0.14.0" +version = "0.14.1" dependencies = [ "async-trait", "backtrace", "diesel", "diesel_logger", "diesel_migrations", - "env_logger", + "env_logger 0.10.0", "futures 0.3.28", "http", - "serde 1.0.188", + "serde 1.0.189", "serde_derive", "serde_json", "slog-scope", @@ -3638,14 +3792,14 @@ dependencies = [ "thiserror", "tokenserver-common", "tokenserver-settings", - "tokio", + "tokio 0.2.25", ] [[package]] name = "tokenserver-settings" -version = "0.14.0" +version = "0.14.1" dependencies = [ - "serde 1.0.188", + "serde 1.0.189", "tokenserver-common", ] @@ -3662,9 +3816,8 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.23", "mio-uds", - "num_cpus", "pin-project-lite 0.1.12", "signal-hook-registry", "slab", @@ -3673,6 +3826,22 @@ dependencies = [ ] [[package]] +name = "tokio" +version = "1.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes 1.5.0", + "libc", + "mio 0.8.8", + "num_cpus", + "pin-project-lite 0.2.13", + "socket2 0.5.4", + "windows-sys", +] + +[[package]] name = "tokio-macros" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3684,6 +3853,16 @@ dependencies = [ ] [[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio 1.33.0", +] + +[[package]] name = "tokio-rustls" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3691,7 +3870,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls", - "tokio", + "tokio 0.2.25", "webpki", ] @@ -3702,7 +3881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -3716,7 +3895,21 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.12", - "tokio", + "tokio 0.2.25", +] + +[[package]] +name = "tokio-util" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +dependencies = [ + "bytes 1.5.0", + "futures-core", + "futures-sink", + "pin-project-lite 0.2.13", + "tokio 1.33.0", + "tracing", ] [[package]] @@ -3725,7 +3918,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -3736,11 +3929,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "cfg-if 1.0.0", "log", "pin-project-lite 0.2.13", "tracing-core", @@ -3748,11 +3940,12 @@ dependencies = [ [[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", + "valuable", ] [[package]] @@ -3766,6 +3959,15 @@ dependencies = [ ] [[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "tracing-core", +] + +[[package]] name = "trust-dns-proto" version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3781,7 +3983,7 @@ dependencies = [ "rand 0.7.3", "smallvec", "thiserror", - "tokio", + "tokio 0.2.25", "url 2.4.1", ] @@ -3800,7 +4002,7 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", - "tokio", + "tokio 0.2.25", "trust-dns-proto", ] @@ -3862,12 +4064,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] name = "unindent" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3880,6 +4076,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] +name = "ureq" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +dependencies = [ + "base64 0.21.4", + "log", + "native-tls", + "once_cell", + "url 2.4.1", +] + +[[package]] name = "url" version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3899,7 +4108,7 @@ dependencies = [ "form_urlencoded", "idna 0.4.0", "percent-encoding 2.3.0", - "serde 1.0.188", + "serde 1.0.189", ] [[package]] @@ -3915,30 +4124,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ "getrandom 0.2.10", - "serde 1.0.188", + "serde 1.0.189", +] + +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +dependencies = [ + "serde 1.0.189", ] [[package]] name = "validator" -version = "0.14.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0f08911ab0fee2c5009580f04615fa868898ee57de10692a45da0c3bcc3e5e" +checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" dependencies = [ - "idna 0.2.3", + "idna 0.4.0", "lazy_static", "regex", - "serde 1.0.188", + "serde 1.0.189", "serde_derive", "serde_json", "url 2.4.1", - "validator_types", ] [[package]] name = "validator_derive" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85135714dba11a1bd0b3eb1744169266f1a38977bf4e3ff5e2e1acb8c2b7eee" +checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" dependencies = [ "if_chain", "lazy_static", @@ -3952,15 +4169,21 @@ dependencies = [ [[package]] name = "validator_types" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291" +checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" dependencies = [ "proc-macro2", "syn 1.0.109", ] [[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4016,7 +4239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", - "serde 1.0.188", + "serde 1.0.189", "serde_json", "wasm-bindgen-macro", ] @@ -4032,7 +4255,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -4066,7 +4289,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4168,10 +4391,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] @@ -4261,10 +4484,20 @@ dependencies = [ ] [[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys", +] + +[[package]] name = "woothee" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d5a45c5d9c772e577c263597681448fd91a46aed911783394eec396e45d4ee" +checksum = "896174c6a4779d4d7d4523dd27aef7d46609eda2497e370f6c998325c6bf6971" dependencies = [ "lazy_static", "regex", diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix index d80f76446362d..399c56376ecfc 100644 --- a/pkgs/servers/syncstorage-rs/default.nix +++ b/pkgs/servers/syncstorage-rs/default.nix @@ -2,7 +2,6 @@ , rustPlatform , pkg-config , python3 -, openssl , cmake , libmysqlclient , makeBinaryWrapper @@ -21,13 +20,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HGX4uLiOqIRjluMLL0QY7YjVYVCkQLe8IiuYdkmAjBQ="; + hash = "sha256-7lIFHK0XSOtfDEy6N9jcPGOd5Por5i1CBdDZQBiHm8c="; }; nativeBuildInputs = [ @@ -39,7 +38,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libmysqlclient - openssl ]; preFixup = '' diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 3872b7783529e..2bab6f7423166 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.13.1"; + version = "2.13.2"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+uVBvtwMJRqPWJKQ0Tn9wLiuR02Btsbxd9+rl9tAlgg="; + sha256 = "sha256-G1YNOJ2snddhFOWDkRQikQ1qC3G1BHg+qb2j5ffIR8k="; }; installPhase = '' diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index d11f51a8d8e64..435e872d332fe 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -7,12 +7,12 @@ with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-zwKK8TPEATAgJwHh04hurzU3NrhyHA70qkf5kXW1yQc="; + sha256 = "sha256-BNvJkDOSlcNXt5W9/3/4I+MhQYn0W37zrJRYpAoZWaA="; }; nativeBuildInputs = [ pkg-config cmake xxd ]; diff --git a/pkgs/servers/web-apps/livebook/default.nix b/pkgs/servers/web-apps/livebook/default.nix index 4ee2899966fd5..511f7b80bc57e 100644 --- a/pkgs/servers/web-apps/livebook/default.nix +++ b/pkgs/servers/web-apps/livebook/default.nix @@ -1,7 +1,7 @@ { lib, beamPackages, makeWrapper, rebar3, elixir, erlang, fetchFromGitHub }: beamPackages.mixRelease rec { pname = "livebook"; - version = "0.11.1"; + version = "0.11.3"; inherit elixir; @@ -13,13 +13,13 @@ beamPackages.mixRelease rec { owner = "livebook-dev"; repo = "livebook"; rev = "v${version}"; - hash = "sha256-8td6BUaJiEPjABrfsJTvaA+PXZ+8PnRl2hj7Ft/kb+Q="; + hash = "sha256-zUJM6OcXhHW8e09h2EKnfI9voF2k4AZ75ulQErNqjD0="; }; mixFodDeps = beamPackages.fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - hash = "sha256-+6lq0t9K6eIyGIFs+aI35v0T6W2DASOxA+tHtFL4u28="; + hash = "sha256-7GvtxEIEbC0QZEYIoARaX9uIsf/CoGE6dX60/mCvkYI="; }; installPhase = '' diff --git a/pkgs/servers/web-apps/snipe-it/composer-env.nix b/pkgs/servers/web-apps/snipe-it/composer-env.nix deleted file mode 100644 index 71714b7640082..0000000000000 --- a/pkgs/servers/web-apps/snipe-it/composer-env.nix +++ /dev/null @@ -1,244 +0,0 @@ -# This file originates from composer2nix - -{ stdenv, lib, writeTextFile, fetchurl, php, unzip, phpPackages }: - -let - inherit (phpPackages) composer; - - filterSrc = src: - builtins.filterSource (path: type: type != "directory" || (baseNameOf path != ".git" && baseNameOf path != ".git" && baseNameOf path != ".svn")) src; - - buildZipPackage = { name, src }: - stdenv.mkDerivation { - inherit name src; - nativeBuildInputs = [ unzip ]; - buildCommand = '' - shopt -s dotglob - unzip $src - baseDir=$(find . -type d -mindepth 1 -maxdepth 1) - cd $baseDir - mkdir -p $out - mv * $out - ''; - }; - - buildPackage = - { name - , src - , packages ? {} - , devPackages ? {} - , buildInputs ? [] - , symlinkDependencies ? false - , executable ? false - , removeComposerArtifacts ? false - , postInstall ? "" - , noDev ? false - , composerExtraArgs ? "" - , unpackPhase ? "true" - , buildPhase ? "true" - , ...}@args: - - let - reconstructInstalled = writeTextFile { - name = "reconstructinstalled.php"; - executable = true; - text = '' - #! ${php}/bin/php - <?php - if(file_exists($argv[1])) - { - $composerLockStr = file_get_contents($argv[1]); - - if($composerLockStr === false) - { - fwrite(STDERR, "Cannot open composer.lock contents\n"); - exit(1); - } - else - { - $config = json_decode($composerLockStr, true); - - if(array_key_exists("packages", $config)) - $allPackages = $config["packages"]; - else - $allPackages = array(); - - ${lib.optionalString (!noDev) '' - if(array_key_exists("packages-dev", $config)) - $allPackages = array_merge($allPackages, $config["packages-dev"]); - ''} - - $packagesStr = json_encode($allPackages, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES); - print($packagesStr); - } - } - else - print("[]"); - ?> - ''; - }; - - constructBin = writeTextFile { - name = "constructbin.php"; - executable = true; - text = '' - #! ${php}/bin/php - <?php - $composerJSONStr = file_get_contents($argv[1]); - - if($composerJSONStr === false) - { - fwrite(STDERR, "Cannot open composer.json contents\n"); - exit(1); - } - else - { - $config = json_decode($composerJSONStr, true); - - if(array_key_exists("bin-dir", $config)) - $binDir = $config["bin-dir"]; - else - $binDir = "bin"; - - if(array_key_exists("bin", $config)) - { - if(!file_exists("vendor/".$binDir)) - mkdir("vendor/".$binDir); - - foreach($config["bin"] as $bin) - symlink("../../".$bin, "vendor/".$binDir."/".basename($bin)); - } - } - ?> - ''; - }; - - bundleDependencies = dependencies: - lib.concatMapStrings (dependencyName: - let - dependency = dependencies.${dependencyName}; - in - '' - ${if dependency.targetDir == "" then '' - vendorDir="$(dirname ${dependencyName})" - mkdir -p "$vendorDir" - ${if symlinkDependencies then - ''ln -s "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"'' - else - ''cp -av "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"'' - } - '' else '' - namespaceDir="${dependencyName}/$(dirname "${dependency.targetDir}")" - mkdir -p "$namespaceDir" - ${if symlinkDependencies then - ''ln -s "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"'' - else - ''cp -av "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"'' - } - ''} - '') (builtins.attrNames dependencies); - - extraArgs = removeAttrs args [ "packages" "devPackages" "buildInputs" ]; - in - stdenv.mkDerivation ({ - buildInputs = [ php composer ] ++ buildInputs; - - inherit unpackPhase buildPhase; - - installPhase = '' - ${if executable then '' - mkdir -p $out/share/php - cp -av $src $out/share/php/$name - chmod -R u+w $out/share/php/$name - cd $out/share/php/$name - '' else '' - cp -av $src $out - chmod -R u+w $out - cd $out - ''} - - # Remove unwanted files - rm -f *.nix - - export HOME=$TMPDIR - - # Remove the provided vendor folder if it exists - rm -Rf vendor - - # If there is no composer.lock file, compose a dummy file. - # Otherwise, composer attempts to download the package.json file from - # the registry which we do not want. - if [ ! -f composer.lock ] - then - cat > composer.lock <<EOF - { - "packages": [] - } - EOF - fi - - # Reconstruct the installed.json file from the lock file - mkdir -p vendor/composer - ${php}/bin/php ${reconstructInstalled} composer.lock > vendor/composer/installed.json - - # Copy or symlink the provided dependencies - cd vendor - ${bundleDependencies packages} - ${lib.optionalString (!noDev) (bundleDependencies devPackages)} - cd .. - - # Reconstruct autoload scripts - # We use the optimize feature because Nix packages cannot change after they have been built - # Using the dynamic loader for a Nix package is useless since there is nothing to dynamically reload. - composer dump-autoload --optimize ${lib.optionalString noDev "--no-dev"} ${composerExtraArgs} - - # Run the install step as a validation to confirm that everything works out as expected - composer install --optimize-autoloader ${lib.optionalString noDev "--no-dev"} ${composerExtraArgs} - - ${lib.optionalString executable '' - # Reconstruct the bin/ folder if we deploy an executable project - ${php}/bin/php ${constructBin} composer.json - ln -s $(pwd)/vendor/bin $out/bin - ''} - - ${lib.optionalString (!symlinkDependencies) '' - # Patch the shebangs if possible - if [ -d $(pwd)/vendor/bin ] - then - # Look for all executables in bin/ - for i in $(pwd)/vendor/bin/* - do - # Look for their location - realFile=$(readlink -f "$i") - - # Restore write permissions - chmod u+wx "$(dirname "$realFile")" - chmod u+w "$realFile" - - # Patch shebang - sed -e "s|#!/usr/bin/php|#!${php}/bin/php|" \ - -e "s|#!/usr/bin/env php|#!${php}/bin/php|" \ - "$realFile" > tmp - mv tmp "$realFile" - chmod u+x "$realFile" - done - fi - ''} - - if [ "$removeComposerArtifacts" = "1" ] - then - # Remove composer stuff - rm -f composer.json composer.lock - fi - - # Execute post install hook - runHook postInstall - ''; - } // extraArgs); -in -{ - inherit filterSrc; - composer = lib.makeOverridable composer; - buildZipPackage = lib.makeOverridable buildZipPackage; - buildPackage = lib.makeOverridable buildPackage; -} diff --git a/pkgs/servers/web-apps/snipe-it/composition.nix b/pkgs/servers/web-apps/snipe-it/composition.nix deleted file mode 100644 index d8df4b81fa3e4..0000000000000 --- a/pkgs/servers/web-apps/snipe-it/composition.nix +++ /dev/null @@ -1,15 +0,0 @@ -{pkgs ? import <nixpkgs> { - inherit system; - }, system ? builtins.currentSystem, noDev ? false, php ? pkgs.php, phpPackages ? pkgs.phpPackages}: - -let - composerEnv = import ./composer-env.nix { - inherit (pkgs) stdenv lib writeTextFile fetchurl unzip; - inherit php phpPackages; - }; -in -import ./php-packages.nix { - inherit composerEnv noDev; - inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn; -} - diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix index a4fa8aee8b599..33fedd334a9e6 100644 --- a/pkgs/servers/web-apps/snipe-it/default.nix +++ b/pkgs/servers/web-apps/snipe-it/default.nix @@ -1,52 +1,48 @@ { lib -, pkgs -, stdenv -, fetchFromGitHub , dataDir ? "/var/lib/snipe-it" +, fetchFromGitHub , mariadb , nixosTests , php -, phpPackages }: -let - package = (import ./composition.nix { - inherit pkgs php phpPackages; - inherit (stdenv.hostPlatform) system; - noDev = true; # Disable development dependencies - }).overrideAttrs (attrs : { - installPhase = attrs.installPhase + '' - # Before symlinking the following directories, copy the invalid_barcode.gif - # to a different location. The `snipe-it-setup` oneshot service will then - # copy the file back during bootstrap. - mkdir -p $out/share/snipe-it - cp $out/public/uploads/barcodes/invalid_barcode.gif $out/share/snipe-it/ - - rm -R $out/storage $out/public/uploads $out/bootstrap/cache - ln -s ${dataDir}/.env $out/.env - ln -s ${dataDir}/storage $out/ - ln -s ${dataDir}/public/uploads $out/public/uploads - ln -s ${dataDir}/bootstrap/cache $out/bootstrap/cache - - chmod +x $out/artisan - - substituteInPlace config/database.php --replace "env('DB_DUMP_PATH', '/usr/local/bin')" "env('DB_DUMP_PATH', '${mariadb}/bin')" - ''; - }); - -in package.override rec { +php.buildComposerProject (finalAttrs: { pname = "snipe-it"; version = "6.2.2"; src = fetchFromGitHub { owner = "snipe"; - repo = pname; - rev = "v${version}"; - sha256 = "11i9ijkl7am5k48y7r5k6nki2827cd7mw3dr1xj8dvb8diwaskqi"; + repo = "snipe-it"; + rev = "v${finalAttrs.version}"; + hash = "sha256-EU+teGxo7YZkD7kNXk9jRyARpzWz5OMRmaWqQ6eMKYY="; }; - passthru.tests = nixosTests.snipe-it; - passthru.phpPackage = php; + vendorHash = "sha256-JcBcrETbjGJFlG1dH/XXqmb9MlKr0ICdnEx7/61Z5io="; + + postInstall = '' + snipe_it_out="$out/share/php/snipe-it" + + # Before symlinking the following directories, copy the invalid_barcode.gif + # to a different location. The `snipe-it-setup` oneshot service will then + # copy the file back during bootstrap. + mkdir -p $out/share/snipe-it + cp $snipe_it_out/public/uploads/barcodes/invalid_barcode.gif $out/share/snipe-it/ + + rm -R $snipe_it_out/storage $snipe_it_out/public/uploads $snipe_it_out/bootstrap/cache + ln -s ${dataDir}/.env $snipe_it_out/.env + ln -s ${dataDir}/storage $snipe_it_out/ + ln -s ${dataDir}/public/uploads $snipe_it_out/public/uploads + ln -s ${dataDir}/bootstrap/cache $snipe_it_out/bootstrap/cache + + chmod +x $snipe_it_out/artisan + + substituteInPlace $snipe_it_out/config/database.php --replace "env('DB_DUMP_PATH', '/usr/local/bin')" "env('DB_DUMP_PATH', '${mariadb}/bin')" + ''; + + passthru = { + tests = nixosTests.snipe-it; + phpPackage = php; + }; meta = with lib; { description = "A free open source IT asset/license management system"; @@ -62,4 +58,4 @@ in package.override rec { maintainers = with maintainers; [ yayayayaka ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/servers/web-apps/snipe-it/php-packages.nix b/pkgs/servers/web-apps/snipe-it/php-packages.nix deleted file mode 100644 index 465310daf90cb..0000000000000 --- a/pkgs/servers/web-apps/snipe-it/php-packages.nix +++ /dev/null @@ -1,1708 +0,0 @@ -{composerEnv, fetchurl, fetchgit ? null, fetchhg ? null, fetchsvn ? null, noDev ? false}: - -let - packages = { - "alek13/slack" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "alek13-slack-9222449402df4e1e57d7850be87898b2c99803bd"; - src = fetchurl { - url = "https://api.github.com/repos/php-slack/slack/zipball/9222449402df4e1e57d7850be87898b2c99803bd"; - sha256 = "02kxal8066rlq4002qf36yfq8i3pafrrlbspqbvh3vxhnzzj2f2k"; - }; - }; - }; - "arietimmerman/laravel-scim-server" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "arietimmerman-laravel-scim-server-dda6dfb60d70fb6cca4b8d4ce1c5f4c19deaab2d"; - src = fetchurl { - url = "https://api.github.com/repos/grokability/laravel-scim-server/zipball/dda6dfb60d70fb6cca4b8d4ce1c5f4c19deaab2d"; - sha256 = "0b08j7xfrbvp6ckv413sfpqq8v4qk59y9wcwch5kc19fb8y3dgiq"; - }; - }; - }; - "asm89/stack-cors" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "asm89-stack-cors-73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"; - src = fetchurl { - url = "https://api.github.com/repos/asm89/stack-cors/zipball/73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"; - sha256 = "1idpisw39ba2dic9jl2s2yrkdgbyny9dfxf0qdr5i0wfvvlmbdih"; - }; - }; - }; - "aws/aws-crt-php" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "aws-aws-crt-php-3942776a8c99209908ee0b287746263725685732"; - src = fetchurl { - url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732"; - sha256 = "0g4vjln6s1419ydljn5m64kzid0b7cplbc0nwn3y4cj72408fyiz"; - }; - }; - }; - "aws/aws-sdk-php" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-8f8742caa42b260950320c98ddc5da4926e2373d"; - src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/8f8742caa42b260950320c98ddc5da4926e2373d"; - sha256 = "0z87ncxqvcs6bjp1b0dw1gib0f1k35sxzag8vzcd4ssh9n1m29gm"; - }; - }; - }; - "bacon/bacon-qr-code" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "bacon-bacon-qr-code-d70c840f68657ce49094b8d91f9ee0cc07fbf66c"; - src = fetchurl { - url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c"; - sha256 = "0k2z8a6qz5xg1p85vwcp58yqbiw8bmnp3hg2pjcaqlimnf65v058"; - }; - }; - }; - "barryvdh/laravel-debugbar" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-debugbar-3372ed65e6d2039d663ed19aa699956f9d346271"; - src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/3372ed65e6d2039d663ed19aa699956f9d346271"; - sha256 = "08ll8z25mbq21q8gxdlgdb0pymx7z3xxc1la68m879l5r2ddhi05"; - }; - }; - }; - "barryvdh/laravel-dompdf" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "barryvdh-laravel-dompdf-1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; - src = fetchurl { - url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/1d47648c6cef37f715ecb8bcc5f5a656ad372e27"; - sha256 = "0xvaq6mp9s8nxlpfisa50fr8rjb6vmivxdbr985q9vydadh1dsv2"; - }; - }; - }; - "brick/math" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "brick-math-ca57d18f028f84f777b2168cd1911b0dee2343ae"; - src = fetchurl { - url = "https://api.github.com/repos/brick/math/zipball/ca57d18f028f84f777b2168cd1911b0dee2343ae"; - sha256 = "1nr1grrb9g5g3ihx94yk0amp8zx8prkkvg2934ygfc3rrv03cq9w"; - }; - }; - }; - "dasprid/enum" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "dasprid-enum-5abf82f213618696dda8e3bf6f64dd042d8542b2"; - src = fetchurl { - url = "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2"; - sha256 = "0rs7i1xiwhssy88s7bwnp5ri5fi2xy3fl7pw6l5k27xf2f1hv7q6"; - }; - }; - }; - "defuse/php-encryption" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "defuse-php-encryption-77880488b9954b7884c25555c2a0ea9e7053f9d2"; - src = fetchurl { - url = "https://api.github.com/repos/defuse/php-encryption/zipball/77880488b9954b7884c25555c2a0ea9e7053f9d2"; - sha256 = "1lcvpg56nw72cxyh6sga7fx94qw9l0l1y78z7y7ny3hgdniwhihx"; - }; - }; - }; - "dflydev/dot-access-data" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "dflydev-dot-access-data-0992cc19268b259a39e86f296da5f0677841f42c"; - src = fetchurl { - url = "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/0992cc19268b259a39e86f296da5f0677841f42c"; - sha256 = "0qdf1gbfkj7vjqhn7m99s1gpjkj2crqrqh1wzpdzyz27izgjgsyw"; - }; - }; - }; - "doctrine/annotations" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-annotations-648b0343343565c4a056bfc8392201385e8d89f0"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0"; - sha256 = "0mkxq1yaqp6an2gjcgsmg7hq37mrwcj27f94sfkfxq9x6qh02k57"; - }; - }; - }; - "doctrine/cache" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-cache-56cd022adb5514472cb144c087393c1821911d09"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/cache/zipball/56cd022adb5514472cb144c087393c1821911d09"; - sha256 = "1ri5pwrnq8pxjv8ljscvlaqzjj7ii87420af4dq133qm35jn4ffr"; - }; - }; - }; - "doctrine/collections" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-collections-1958a744696c6bb3bb0d28db2611dc11610e78af"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/collections/zipball/1958a744696c6bb3bb0d28db2611dc11610e78af"; - sha256 = "0ygsw2vgrkz1wd9aw6gd8y6kjwxq9bjqcp3dgdx0p8w9mz7bdpm5"; - }; - }; - }; - "doctrine/common" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-common-f3812c026e557892c34ef37f6ab808a6b567da7f"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/common/zipball/f3812c026e557892c34ef37f6ab808a6b567da7f"; - sha256 = "16jf1wzs6ccpw2ny7rkzpf0asdwr1cfzcyw8g5x88i4j9jazn8xa"; - }; - }; - }; - "doctrine/dbal" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-dbal-9f79d4650430b582f4598fe0954ef4d52fbc0a8a"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a"; - sha256 = "0jf1whbf0d5kizrlzdm29ld5lrk4fgmayr239vyl2dmdzzxyvkhf"; - }; - }; - }; - "doctrine/deprecations" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-deprecations-0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"; - sha256 = "1sk1f020n0w7p7r4rsi7wnww85vljrim1i5h9wb0qiz2c4l8jj09"; - }; - }; - }; - "doctrine/event-manager" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-event-manager-41370af6a30faa9dc0368c4a6814d596e81aba7f"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f"; - sha256 = "0pn2aiwl4fvv6fcwar9alng2yrqy8bzc58n4bkp6y2jnpw5gp4m8"; - }; - }; - }; - "doctrine/inflector" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-inflector-4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9"; - sha256 = "0390gkbk3vdjd98h7wjpdv0579swbavrdb6yrlslfdr068g4bmbf"; - }; - }; - }; - "doctrine/instantiator" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-instantiator-10dcfce151b967d20fde1b34ae6640712c3891bc"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc"; - sha256 = "1m6pw3bb8v04wqsysj8ma4db8vpm9jnd7ddh8ihdqyfpz8pawjp7"; - }; - }; - }; - "doctrine/lexer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-lexer-c268e882d4dbdd85e36e4ad69e02dc284f89d229"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229"; - sha256 = "12g069nljl3alyk15884nd1jc4mxk87isqsmfj7x6j2vxvk9qchs"; - }; - }; - }; - "doctrine/persistence" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-persistence-7a6eac9fb6f61bba91328f15aa7547f4806ca288"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/persistence/zipball/7a6eac9fb6f61bba91328f15aa7547f4806ca288"; - sha256 = "0mszkf7lxdhbr5b3ibpn7ipyrf6a6kfj283fvh83akyv1mplsl0h"; - }; - }; - }; - "doctrine/reflection" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-reflection-1034e5e71f89978b80f9c1570e7226f6c3b9b6fb"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/reflection/zipball/1034e5e71f89978b80f9c1570e7226f6c3b9b6fb"; - sha256 = "08n0m6z8b66b0v8awl1w8s8ncg61sa25273ba42fbjmn24b3h6mp"; - }; - }; - }; - "dompdf/dompdf" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "dompdf-dompdf-e8d2d5e37e8b0b30f0732a011295ab80680d7e85"; - src = fetchurl { - url = "https://api.github.com/repos/dompdf/dompdf/zipball/e8d2d5e37e8b0b30f0732a011295ab80680d7e85"; - sha256 = "0a2qk57c3qwg7j8gp1hwyd8y8dwm5pb8lg1npb49sijig8kyjlv3"; - }; - }; - }; - "dragonmantank/cron-expression" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "dragonmantank-cron-expression-be85b3f05b46c39bbc0d95f6c071ddff669510fa"; - src = fetchurl { - url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa"; - sha256 = "09k5cj8bay6jkphjl5ngfx7qb17dxnlvpf6918a9ms8am731s2a6"; - }; - }; - }; - "eduardokum/laravel-mail-auto-embed" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "eduardokum-laravel-mail-auto-embed-ea098444590521d574c84a37ed732c92b840d5b4"; - src = fetchurl { - url = "https://api.github.com/repos/eduardokum/laravel-mail-auto-embed/zipball/ea098444590521d574c84a37ed732c92b840d5b4"; - sha256 = "1amqglrskwx9lfdl06k5j0inz3j41lbr0kmq6hjxx1gia0ddh91f"; - }; - }; - }; - "egulias/email-validator" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "egulias-email-validator-0dbf5d78455d4d6a41d186da50adc1122ec066f4"; - src = fetchurl { - url = "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4"; - sha256 = "00kwb8rhk1fq3a1i152xniipk3y907q1v5r3szqbkq5rz82dwbck"; - }; - }; - }; - "enshrined/svg-sanitize" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "enshrined-svg-sanitize-e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"; - src = fetchurl { - url = "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"; - sha256 = "1pv8lkpyl0fp0ychfqlds31lpy73pzz9z2rjngxhpvzfka39gchg"; - }; - }; - }; - "erusev/parsedown" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "erusev-parsedown-cb17b6477dfff935958ba01325f2e8a2bfa6dab3"; - src = fetchurl { - url = "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3"; - sha256 = "1iil9v8g03m5vpxxg3a5qb2sxd1cs5c4p5i0k00cqjnjsxfrazxd"; - }; - }; - }; - "ezyang/htmlpurifier" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "ezyang-htmlpurifier-12ab42bd6e742c70c0a52f7b82477fcd44e64b75"; - src = fetchurl { - url = "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75"; - sha256 = "168kkjcq1w9vdnly5k72qc8jb8amdcmax9wja0xwfh926gb6dpz7"; - }; - }; - }; - "facade/flare-client-php" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "facade-flare-client-php-b2adf1512755637d0cef4f7d1b54301325ac78ed"; - src = fetchurl { - url = "https://api.github.com/repos/facade/flare-client-php/zipball/b2adf1512755637d0cef4f7d1b54301325ac78ed"; - sha256 = "10yqn1bi4q6mp89g16d02dc7crxdigjxyvax973fdnmxnvafl0cb"; - }; - }; - }; - "facade/ignition" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "facade-ignition-6acd82e986a2ecee89e2e68adfc30a1936d1ab7c"; - src = fetchurl { - url = "https://api.github.com/repos/facade/ignition/zipball/6acd82e986a2ecee89e2e68adfc30a1936d1ab7c"; - sha256 = "1mxn6kqwbgd3vs36ckwydpx7kvjky6fvnhmbvn0c2zp0hsliq7rw"; - }; - }; - }; - "facade/ignition-contracts" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "facade-ignition-contracts-3c921a1cdba35b68a7f0ccffc6dffc1995b18267"; - src = fetchurl { - url = "https://api.github.com/repos/facade/ignition-contracts/zipball/3c921a1cdba35b68a7f0ccffc6dffc1995b18267"; - sha256 = "1nsjwd1k9q8qmfvh7m50rs42yxzxyq4f56r6dq205gwcmqsjb2j0"; - }; - }; - }; - "fideloper/proxy" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "fideloper-proxy-a751f2bc86dd8e6cfef12dc0cbdada82f5a18750"; - src = fetchurl { - url = "https://api.github.com/repos/fideloper/TrustedProxy/zipball/a751f2bc86dd8e6cfef12dc0cbdada82f5a18750"; - sha256 = "11whawpjkiphdfpfwm5c2v3finc3apl9gp8b4lwq76370i41plcf"; - }; - }; - }; - "filp/whoops" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "filp-whoops-a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"; - src = fetchurl { - url = "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc"; - sha256 = "0hc9zfh3i7br30831grccm4wny9dllpswhaw8hdn988mvg5xrdy0"; - }; - }; - }; - "firebase/php-jwt" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "firebase-php-jwt-018dfc4e1da92ad8a1b90adc4893f476a3b41cb8"; - src = fetchurl { - url = "https://api.github.com/repos/firebase/php-jwt/zipball/018dfc4e1da92ad8a1b90adc4893f476a3b41cb8"; - sha256 = "1jzri64bl3hiwah9nk3yq8nfjfn4z0xb0znp1dwh65qzjy54f0jh"; - }; - }; - }; - "fruitcake/laravel-cors" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "fruitcake-laravel-cors-783a74f5e3431d7b9805be8afb60fd0a8f743534"; - src = fetchurl { - url = "https://api.github.com/repos/fruitcake/laravel-cors/zipball/783a74f5e3431d7b9805be8afb60fd0a8f743534"; - sha256 = "13mqhjks048fb5042l0rfrr52rz7knp9gjn8qviw9cx76kllw2c9"; - }; - }; - }; - "graham-campbell/result-type" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "graham-campbell-result-type-0690bde05318336c7221785f2a932467f98b64ca"; - src = fetchurl { - url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca"; - sha256 = "0a6kj3vxmhr1wh2kggmrl6y41hkg19jc0iq8qw095lf11mr4bd83"; - }; - }; - }; - "guzzlehttp/guzzle" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"; - src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"; - sha256 = "0a8491bb72y61r3ghqn32kabsj8rxhj9pddnkkr14x3wbc10zfr4"; - }; - }; - }; - "guzzlehttp/promises" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "guzzlehttp-promises-fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; - src = fetchurl { - url = "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; - sha256 = "09ivi77y49bpc2sy3xhvgq22rfh2fhv921mn8402dv0a8bdprf56"; - }; - }; - }; - "guzzlehttp/psr7" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-0454e12ef0cd597ccd2adb036f7bda4e7fface66"; - src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/0454e12ef0cd597ccd2adb036f7bda4e7fface66"; - sha256 = "1vlrryjzwjigf2q1nichnrxl43r75cw3yjf17d3dy7ixhvlpnlv6"; - }; - }; - }; - "intervention/image" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "intervention-image-04be355f8d6734c826045d02a1079ad658322dad"; - src = fetchurl { - url = "https://api.github.com/repos/Intervention/image/zipball/04be355f8d6734c826045d02a1079ad658322dad"; - sha256 = "1cbg43hm2jgwb7gm1r9xcr4cpx8ng1zr93zx6shk9xhjlssnv0bx"; - }; - }; - }; - "javiereguiluz/easyslugger" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "javiereguiluz-easyslugger-11524a3fd70e3f0c98043755a0ffa228f2529211"; - src = fetchurl { - url = "https://api.github.com/repos/javiereguiluz/EasySlugger/zipball/11524a3fd70e3f0c98043755a0ffa228f2529211"; - sha256 = "12x5cgp3qmz5d9wvgpd6c0whygm9z3y392fdi4kqjlzi3n5yknnp"; - }; - }; - }; - "laravel/framework" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-framework-96aecced5126d48e277e5339193c376fe82b6565"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/96aecced5126d48e277e5339193c376fe82b6565"; - sha256 = "1s4bcjpfsjafqigj28xbwa3bycs2cd1h4jnbpn9c9zj87w4smhzm"; - }; - }; - }; - "laravel/helpers" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-helpers-c28b0ccd799d58564c41a62395ac9511a1e72931"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/helpers/zipball/c28b0ccd799d58564c41a62395ac9511a1e72931"; - sha256 = "0s9ppwkwl5c1gp1bd12fvb2k1n77h0qj5vl4c88i325y5fcfgvnb"; - }; - }; - }; - "laravel/passport" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-passport-b62b418a6d9e9aca231a587be0fc14dc55cd8d77"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/passport/zipball/b62b418a6d9e9aca231a587be0fc14dc55cd8d77"; - sha256 = "139yqi5561cqzn35g336hf6m0gffcn4ixvmks7wz9kv4f0f336vn"; - }; - }; - }; - "laravel/serializable-closure" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-serializable-closure-09f0e9fb61829f628205b7c94906c28740ff9540"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540"; - sha256 = "1b0kdx0cs43ci4pyhhv874k5i0k42iiizz1mz0f6wk8lpzhk0r6r"; - }; - }; - }; - "laravel/slack-notification-channel" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-slack-notification-channel-060617a31562c88656c95c5971a36989122d4b53"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/slack-notification-channel/zipball/060617a31562c88656c95c5971a36989122d4b53"; - sha256 = "1b2hw28aqb805ac5w7knm9myrgyh40aqw9njyzmvsr2jrphjwgr4"; - }; - }; - }; - "laravel/socialite" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-socialite-a14a177f2cc71d8add71e2b19e00800e83bdda09"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/socialite/zipball/a14a177f2cc71d8add71e2b19e00800e83bdda09"; - sha256 = "1fxlywrr2pansda2p9k475i20il2b5sz93w9b0kr7lihf242rz1z"; - }; - }; - }; - "laravel/tinker" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-tinker-dff39b661e827dae6e092412f976658df82dbac5"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/tinker/zipball/dff39b661e827dae6e092412f976658df82dbac5"; - sha256 = "0az4n99pfrhrnr7diwi656f8y9qbynxzdw25md29ji8bw0isbc6d"; - }; - }; - }; - "laravel/ui" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-ui-65ec5c03f7fee2c8ecae785795b829a15be48c2c"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c"; - sha256 = "0hr8kkbxvxxidnw86r1i92938wajhskv68zjn1627h1i16b10ysm"; - }; - }; - }; - "laravelcollective/html" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravelcollective-html-78c3cb516ac9e6d3d76cad9191f81d217302dea6"; - src = fetchurl { - url = "https://api.github.com/repos/LaravelCollective/html/zipball/78c3cb516ac9e6d3d76cad9191f81d217302dea6"; - sha256 = "14nm7wzlp8hz0ja1xhs10nhci3bq9ss73jpavbs0qazipfpc38sn"; - }; - }; - }; - "lcobucci/clock" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "lcobucci-clock-353d83fe2e6ae95745b16b3d911813df6a05bfb3"; - src = fetchurl { - url = "https://api.github.com/repos/lcobucci/clock/zipball/353d83fe2e6ae95745b16b3d911813df6a05bfb3"; - sha256 = "18jdhd0jl5sqy5qkg2kjlrwyilyd80mck9gcpwa9xm7il9s9lf8m"; - }; - }; - }; - "lcobucci/jwt" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "lcobucci-jwt-fe2d89f2eaa7087af4aa166c6f480ef04e000582"; - src = fetchurl { - url = "https://api.github.com/repos/lcobucci/jwt/zipball/fe2d89f2eaa7087af4aa166c6f480ef04e000582"; - sha256 = "04rm6gfjlhxfllhmppx2fmxl8knflcxz6ss12y4lisg938xgm187"; - }; - }; - }; - "league/commonmark" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-commonmark-155ec1c95626b16fda0889cf15904d24890a60d5"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/commonmark/zipball/155ec1c95626b16fda0889cf15904d24890a60d5"; - sha256 = "1bl4f0s6adgilly5yivcyg6ya42f173vc734518vjrdmzzh1wk2m"; - }; - }; - }; - "league/config" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-config-a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/config/zipball/a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e"; - sha256 = "0mwqf6pdapgbxcry328kl9974awjmnv491c6ryirw74lqkapw2bn"; - }; - }; - }; - "league/csv" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-csv-9d2e0265c5d90f5dd601bc65ff717e05cec19b47"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/csv/zipball/9d2e0265c5d90f5dd601bc65ff717e05cec19b47"; - sha256 = "0mcngirl2r8aw7hgbwaq3hrkkib4xwvhngijdhrkdzg4hj6ii3ap"; - }; - }; - }; - "league/event" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-event-d2cc124cf9a3fab2bb4ff963307f60361ce4d119"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/event/zipball/d2cc124cf9a3fab2bb4ff963307f60361ce4d119"; - sha256 = "1fc8aj0mpbrnh3b93gn8pypix28nf2gfvi403kfl7ibh5iz6ds5l"; - }; - }; - }; - "league/flysystem" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-flysystem-094defdb4a7001845300334e7c1ee2335925ef99"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99"; - sha256 = "0dn71b1pwikbwz1cmmz9k1fc8k1fsmah3gy8sqxbz7czhqn5qiva"; - }; - }; - }; - "league/flysystem-aws-s3-v3" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-flysystem-aws-s3-v3-af286f291ebab6877bac0c359c6c2cb017eb061d"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af286f291ebab6877bac0c359c6c2cb017eb061d"; - sha256 = "1dyj1cvf2pbvkdw9i53qg6lycxv0di85qnjzcvy5lphrxambifxy"; - }; - }; - }; - "league/flysystem-cached-adapter" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-flysystem-cached-adapter-d1925efb2207ac4be3ad0c40b8277175f99ffaff"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/d1925efb2207ac4be3ad0c40b8277175f99ffaff"; - sha256 = "1gvp89cl27ypcy4h0qjm04dc5k77jfm95m4paasglzfsi6g40i71"; - }; - }; - }; - "league/mime-type-detection" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-mime-type-detection-ff6248ea87a9f116e78edd6002e39e5128a0d4dd"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd"; - sha256 = "1a63nvqd6cz3vck3y8vjswn6c3cfwh13p0cn0ci5pqdf0bgjvvfz"; - }; - }; - }; - "league/oauth1-client" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-oauth1-client-d6365b901b5c287dd41f143033315e2f777e1167"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167"; - sha256 = "0hkh8l7884g8ssja1biwfb59x0jj951lwk6kmiacjqvyvzs07qmx"; - }; - }; - }; - "league/oauth2-server" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-oauth2-server-7aeb7c42b463b1a6fe4d084d3145e2fa22436876"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/oauth2-server/zipball/7aeb7c42b463b1a6fe4d084d3145e2fa22436876"; - sha256 = "08fla005m5w3cvcivsi8x5jbxgyx814xhh9jmx6kcxrbwcpw2cpf"; - }; - }; - }; - "league/uri" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-uri-2d7c87a0860f3126a39f44a8a9bf2fed402dcfea"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/uri/zipball/2d7c87a0860f3126a39f44a8a9bf2fed402dcfea"; - sha256 = "1cibnnh81jvkn28050scyldnzbshqhy5464gqmdfw0ar1a6bz545"; - }; - }; - }; - "league/uri-interfaces" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "league-uri-interfaces-00e7e2943f76d8cb50c7dfdc2f6dee356e15e383"; - src = fetchurl { - url = "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/00e7e2943f76d8cb50c7dfdc2f6dee356e15e383"; - sha256 = "01jllf6n9fs4yjcf6sjc4ivqp7k7dkqhbpz354bq9mr14njsjv6x"; - }; - }; - }; - "livewire/livewire" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "livewire-livewire-020ad095cf1239138b097d22b584e2701ec3edfb"; - src = fetchurl { - url = "https://api.github.com/repos/livewire/livewire/zipball/020ad095cf1239138b097d22b584e2701ec3edfb"; - sha256 = "0kklhhk351fbw38dw810si3gpzppjnm8hn9f6h8arxhcgxc8vnx7"; - }; - }; - }; - "maatwebsite/excel" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "maatwebsite-excel-8a54972e3d616c74687c3cbff15765555761885c"; - src = fetchurl { - url = "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/8a54972e3d616c74687c3cbff15765555761885c"; - sha256 = "0h49x9aagq4wi05fymwhknvi16gl0na1xgi2cp9vlhy5ncrmpxy2"; - }; - }; - }; - "maennchen/zipstream-php" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "maennchen-zipstream-php-211e9ba1530ea5260b45d90c9ea252f56ec52729"; - src = fetchurl { - url = "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/211e9ba1530ea5260b45d90c9ea252f56ec52729"; - sha256 = "02llnd0f72lmqhn84ggv2kkdk6968bg29wv196386dabf7ilq4wg"; - }; - }; - }; - "markbaker/complex" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "markbaker-complex-ab8bc271e404909db09ff2d5ffa1e538085c0f22"; - src = fetchurl { - url = "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/ab8bc271e404909db09ff2d5ffa1e538085c0f22"; - sha256 = "1zgy7bz25a6wa4f0m9q3ax38a3dfzv8cz2mfcppf3znb2mxs8w5y"; - }; - }; - }; - "markbaker/matrix" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "markbaker-matrix-c66aefcafb4f6c269510e9ac46b82619a904c576"; - src = fetchurl { - url = "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/c66aefcafb4f6c269510e9ac46b82619a904c576"; - sha256 = "0vfa7phvjkgsfplpxd3s2h00c28hy389yig29bmcpxlfk008vicn"; - }; - }; - }; - "masterminds/html5" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "masterminds-html5-897eb517a343a2281f11bc5556d6548db7d93947"; - src = fetchurl { - url = "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947"; - sha256 = "12fmcgsrmh0f0llnpcvk33mrs4067nw246ci5619rr79ijy3yc0k"; - }; - }; - }; - "maximebf/debugbar" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "maximebf-debugbar-0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6"; - src = fetchurl { - url = "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6"; - sha256 = "02g3kz29pgf31q2q7zmm2w999n4bncm6336bh0ixv8v9vl1mssd4"; - }; - }; - }; - "mediconesystems/livewire-datatables" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "mediconesystems-livewire-datatables-bf6f24d529208e6bdec58276e92792719c73c827"; - src = fetchurl { - url = "https://api.github.com/repos/MedicOneSystems/livewire-datatables/zipball/bf6f24d529208e6bdec58276e92792719c73c827"; - sha256 = "0pdr1ax3735f2147w6bz843rrfjnrr57z6355xkdax9a16zvc0lm"; - }; - }; - }; - "monolog/monolog" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "monolog-monolog-5579edf28aee1190a798bfa5be8bc16c563bd524"; - src = fetchurl { - url = "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524"; - sha256 = "014sys8bv57jbpag7xlc7vplc1qy4h5jppy258hpr0xfbh27cg3w"; - }; - }; - }; - "mtdowling/jmespath.php" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "mtdowling-jmespath.php-9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; - src = fetchurl { - url = "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; - sha256 = "1ig3gi6f8gisagcn876598ps48s86s6m0c82diyksylarg3yn0yd"; - }; - }; - }; - "myclabs/php-enum" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "myclabs-php-enum-b942d263c641ddb5190929ff840c68f78713e937"; - src = fetchurl { - url = "https://api.github.com/repos/myclabs/php-enum/zipball/b942d263c641ddb5190929ff840c68f78713e937"; - sha256 = "16123l5459sjbmnz5nx68x8kpq5mc7miz95q4sjvancpb1dgl8d3"; - }; - }; - }; - "neitanod/forceutf8" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "neitanod-forceutf8-c1fbe70bfb5ad41b8ec5785056b0e308b40d4831"; - src = fetchurl { - url = "https://api.github.com/repos/neitanod/forceutf8/zipball/c1fbe70bfb5ad41b8ec5785056b0e308b40d4831"; - sha256 = "1fvh2iapy7q22n65p6xkcbxcmp68x917gkv2cb0gs59671fwxsjf"; - }; - }; - }; - "nesbot/carbon" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nesbot-carbon-a9000603ea337c8df16cc41f8b6be95a65f4d0f5"; - src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/a9000603ea337c8df16cc41f8b6be95a65f4d0f5"; - sha256 = "0rjlq01108i309q9lyfv0vvb9vmsnqy5ylk9h8wvhd7916vw3jnc"; - }; - }; - }; - "nette/schema" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nette-schema-9a39cef03a5b34c7de64f551538cbba05c2be5df"; - src = fetchurl { - url = "https://api.github.com/repos/nette/schema/zipball/9a39cef03a5b34c7de64f551538cbba05c2be5df"; - sha256 = "1kr5lai6r1l6w85ck64b1cq9cp0r2kwa10i1xcmlc7q0xlrxwhp2"; - }; - }; - }; - "nette/utils" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nette-utils-0af4e3de4df9f1543534beab255ccf459e7a2c99"; - src = fetchurl { - url = "https://api.github.com/repos/nette/utils/zipball/0af4e3de4df9f1543534beab255ccf459e7a2c99"; - sha256 = "0pmcgx3h3bl02sdqvhb9ap548ldxnhl3051imqss2yd64fkxf5fj"; - }; - }; - }; - "nikic/php-parser" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nikic-php-parser-34bea19b6e03d8153165d8f30bba4c3be86184c1"; - src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1"; - sha256 = "1yj97j9cdx48566qwjl5q8hkjkrd1xl59aczb1scspxay37l9w72"; - }; - }; - }; - "nunomaduro/collision" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nunomaduro-collision-8b610eef8582ccdc05d8f2ab23305e2d37049461"; - src = fetchurl { - url = "https://api.github.com/repos/nunomaduro/collision/zipball/8b610eef8582ccdc05d8f2ab23305e2d37049461"; - sha256 = "0w559vqpknkl6fbhz5hnkc9g37ydcyrqx82w3kjl88vmjycd1f61"; - }; - }; - }; - "nyholm/psr7" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nyholm-psr7-e874c8c4286a1e010fb4f385f3a55ac56a05cc93"; - src = fetchurl { - url = "https://api.github.com/repos/Nyholm/psr7/zipball/e874c8c4286a1e010fb4f385f3a55ac56a05cc93"; - sha256 = "0abjvcrg19km5p6bcjfmfhrravsb60hap71zzznpwmf83bq16l8r"; - }; - }; - }; - "onelogin/php-saml" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "onelogin-php-saml-a7328b11887660ad248ea10952dd67a5aa73ba3b"; - src = fetchurl { - url = "https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b"; - sha256 = "1df8mxmdh14y2scw80yhh1l90lvdnxq1pjlli3is1cakc0cdw90z"; - }; - }; - }; - "opis/closure" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "opis-closure-3d81e4309d2a927abbe66df935f4bb60082805ad"; - src = fetchurl { - url = "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad"; - sha256 = "0hqs6rdkkcggswrgjlispkby2yg4hwn63bl2ma62lnmpfbpwn0sd"; - }; - }; - }; - "paragonie/constant_time_encoding" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "paragonie-constant_time_encoding-58c3f47f650c94ec05a151692652a868995d2938"; - src = fetchurl { - url = "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938"; - sha256 = "0i9km0lzvc7df9758fm1p3y0679pzvr5m9x3mrz0d2hxlppsm764"; - }; - }; - }; - "paragonie/random_compat" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "paragonie-random_compat-996434e5492cb4c3edcb9168db6fbb1359ef965a"; - src = fetchurl { - url = "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a"; - sha256 = "0ky7lal59dihf969r1k3pb96ql8zzdc5062jdbg69j6rj0scgkyx"; - }; - }; - }; - "paragonie/sodium_compat" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "paragonie-sodium_compat-cb15e403ecbe6a6cc515f855c310eb6b1872a933"; - src = fetchurl { - url = "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933"; - sha256 = "01jxl868i8bkx5szgp2fp6mi438ani80bqkdcc7rnn9z22lrsm78"; - }; - }; - }; - "phenx/php-font-lib" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phenx-php-font-lib-dd448ad1ce34c63d09baccd05415e361300c35b4"; - src = fetchurl { - url = "https://api.github.com/repos/dompdf/php-font-lib/zipball/dd448ad1ce34c63d09baccd05415e361300c35b4"; - sha256 = "0l20inbvipjdg9fdd32v8b7agjyvcs0rpqswcylld64vbm2sf3il"; - }; - }; - }; - "phenx/php-svg-lib" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phenx-php-svg-lib-76876c6cf3080bcb6f249d7d59705108166a6685"; - src = fetchurl { - url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685"; - sha256 = "0bjynrs81das9f9jwd5jgsxx9gjv2m6c0mkvlgx4w1f4pgbvwsf5"; - }; - }; - }; - "php-http/message-factory" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "php-http-message-factory-a478cb11f66a6ac48d8954216cfed9aa06a501a1"; - src = fetchurl { - url = "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1"; - sha256 = "13drpc83bq332hz0b97whibkm7jpk56msq4yppw9nmrchzwgy7cs"; - }; - }; - }; - "phpdocumentor/reflection-common" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpdocumentor-reflection-common-1d01c49d4ed62f25aa84a747ad35d5a16924662b"; - src = fetchurl { - url = "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b"; - sha256 = "1wx720a17i24471jf8z499dnkijzb4b8xra11kvw9g9hhzfadz1r"; - }; - }; - }; - "phpdocumentor/reflection-docblock" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpdocumentor-reflection-docblock-622548b623e81ca6d78b721c5e029f4ce664f170"; - src = fetchurl { - url = "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170"; - sha256 = "1vs0fhpqk8s9bc0sqyfhpbs63q14lfjg1f0c1dw4jz97145j6r1n"; - }; - }; - }; - "phpdocumentor/type-resolver" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpdocumentor-type-resolver-77a32518733312af16a44300404e945338981de3"; - src = fetchurl { - url = "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3"; - sha256 = "0y6byv5psmrcy6ga7nghzblv61rjbni046h0pgjda8r8qmz26yr4"; - }; - }; - }; - "phpoffice/phpspreadsheet" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpoffice-phpspreadsheet-69991111e05fca3ff7398e1e7fca9ebed33efec6"; - src = fetchurl { - url = "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/69991111e05fca3ff7398e1e7fca9ebed33efec6"; - sha256 = "091g479mzh4w057m6v7xpn8i8l8k4abvvyd9l51c2sf7mskjz1n0"; - }; - }; - }; - "phpoption/phpoption" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpoption-phpoption-eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; - src = fetchurl { - url = "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; - sha256 = "1lk50y8jj2mzbwc2mxfm2xdasxf4axya72nv8wfc1vyz9y5ys3li"; - }; - }; - }; - "phpseclib/phpseclib" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpseclib-phpseclib-2f0b7af658cbea265cbb4a791d6c29a6613f98ef"; - src = fetchurl { - url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/2f0b7af658cbea265cbb4a791d6c29a6613f98ef"; - sha256 = "08azglzhm6j821p5w3nb61ny7gz4lgj5kdmr1f1h723f8sjjwmfs"; - }; - }; - }; - "phpspec/prophecy" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpspec-prophecy-bbcd7380b0ebf3961ee21409db7b38bc31d69a13"; - src = fetchurl { - url = "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13"; - sha256 = "1xw7x12lws8qdrryhbgjiih48gxwlq99ayhhsy0q2ls9i9p6mw0w"; - }; - }; - }; - "pragmarx/google2fa" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "pragmarx-google2fa-80c3d801b31fe165f8fe99ea085e0a37834e1be3"; - src = fetchurl { - url = "https://api.github.com/repos/antonioribeiro/google2fa/zipball/80c3d801b31fe165f8fe99ea085e0a37834e1be3"; - sha256 = "0qfjgkl02ifc0zicv3d5d6zs8mwpq68bg211jy3psgghnqpxyhlm"; - }; - }; - }; - "pragmarx/google2fa-laravel" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "pragmarx-google2fa-laravel-f9014fd7ea36a1f7fffa233109cf59b209469647"; - src = fetchurl { - url = "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/f9014fd7ea36a1f7fffa233109cf59b209469647"; - sha256 = "1y1b24fyfsf8mrhla3j699x1x6pd23rw5k3pjsag0vqgvd4v3a8n"; - }; - }; - }; - "pragmarx/google2fa-qrcode" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "pragmarx-google2fa-qrcode-fd5ff0531a48b193a659309cc5fb882c14dbd03f"; - src = fetchurl { - url = "https://api.github.com/repos/antonioribeiro/google2fa-qrcode/zipball/fd5ff0531a48b193a659309cc5fb882c14dbd03f"; - sha256 = "1csa15v68bznrz3262xjcdgcgw0lg8fwb6fhrbms2mnylhq4s35g"; - }; - }; - }; - "psr/cache" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-cache-d11b50ad223250cf17b86e38383413f5a6764bf8"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8"; - sha256 = "06i2k3dx3b4lgn9a4v1dlgv8l9wcl4kl7vzhh63lbji0q96hv8qz"; - }; - }; - }; - "psr/container" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-container-513e0666f7216c7459170d56df27dfcefe1689ea"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea"; - sha256 = "00yvj3b5ls2l1d0sk38g065raw837rw65dx1sicggjnkr85vmfzz"; - }; - }; - }; - "psr/event-dispatcher" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-event-dispatcher-dbefd12671e8a14ec7f180cab83036ed26714bb0"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0"; - sha256 = "05nicsd9lwl467bsv4sn44fjnnvqvzj1xqw2mmz9bac9zm66fsjd"; - }; - }; - }; - "psr/http-client" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-http-client-2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; - sha256 = "0cmkifa3ji1r8kn3y1rwg81rh8g2crvnhbv2am6d688dzsbw967v"; - }; - }; - }; - "psr/http-factory" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-http-factory-12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; - sha256 = "0inbnqpc5bfhbbda9dwazsrw9xscfnc8rdx82q1qm3r446mc1vds"; - }; - }; - }; - "psr/http-message" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-http-message-f6561bf28d520154e4b0ec72be95418abe6d9363"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363"; - sha256 = "195dd67hva9bmr52iadr4kyp2gw2f5l51lplfiay2pv6l9y4cf45"; - }; - }; - }; - "psr/log" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-log-d49695b909c3b7628b6289db5479a1c204601f11"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11"; - sha256 = "0sb0mq30dvmzdgsnqvw3xh4fb4bqjncx72kf8n622f94dd48amln"; - }; - }; - }; - "psr/simple-cache" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psr-simple-cache-408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; - src = fetchurl { - url = "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; - sha256 = "1djgzclkamjxi9jy4m9ggfzgq1vqxaga2ip7l3cj88p7rwkzjxgw"; - }; - }; - }; - "psy/psysh" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "psy-psysh-77fc7270031fbc28f9a7bea31385da5c4855cb7a"; - src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/77fc7270031fbc28f9a7bea31385da5c4855cb7a"; - sha256 = "058wlfpslslxh59844ybwk2knplfxd67mc9k4gia3vmakc2n7ysb"; - }; - }; - }; - "ralouphie/getallheaders" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "ralouphie-getallheaders-120b605dfeb996808c31b6477290a714d356e822"; - src = fetchurl { - url = "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822"; - sha256 = "1bv7ndkkankrqlr2b4kw7qp3fl0dxi6bp26bnim6dnlhavd6a0gg"; - }; - }; - }; - "ramsey/collection" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "ramsey-collection-cccc74ee5e328031b15640b51056ee8d3bb66c0a"; - src = fetchurl { - url = "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a"; - sha256 = "1i2ga25aj80cci3di58qm17l588lzgank8wqhdbq0dcb3cg6cgr6"; - }; - }; - }; - "ramsey/uuid" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "ramsey-uuid-fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"; - src = fetchurl { - url = "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"; - sha256 = "1fhjsyidsj95x5dd42z3hi5qhzii0hhhxa7xvc5jj7spqjdbqln4"; - }; - }; - }; - "robrichards/xmlseclibs" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "robrichards-xmlseclibs-f8f19e58f26cdb42c54b214ff8a820760292f8df"; - src = fetchurl { - url = "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df"; - sha256 = "01zlpm36rrdj310cfmiz2fnabszxd3fq80fa8x8j3f9ki7dvhh5y"; - }; - }; - }; - "rollbar/rollbar" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "rollbar-rollbar-ff3db5739dd635740caed02ddad43e671b5a37e5"; - src = fetchurl { - url = "https://api.github.com/repos/rollbar/rollbar-php/zipball/ff3db5739dd635740caed02ddad43e671b5a37e5"; - sha256 = "1mkbw0mcaj50ks0x6ql2qq7dr2i5nfr46x6chdf8hvnm1vjnphmd"; - }; - }; - }; - "rollbar/rollbar-laravel" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "rollbar-rollbar-laravel-d7647ffabf234beabfd0239ffaca003d934653b4"; - src = fetchurl { - url = "https://api.github.com/repos/rollbar/rollbar-php-laravel/zipball/d7647ffabf234beabfd0239ffaca003d934653b4"; - sha256 = "0jm70pqhzdczrwzq4m7vxcwkzj1fcjn4r19qjpawvbsw4ldlcdg7"; - }; - }; - }; - "sabberworm/php-css-parser" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sabberworm-php-css-parser-e41d2140031d533348b2192a83f02d8dd8a71d30"; - src = fetchurl { - url = "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30"; - sha256 = "0slqh0ra9cwk1pm4q7bqhndynir0yxypzrxb2vrfzfkmnh0rm02c"; - }; - }; - }; - "sebastian/comparator" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-comparator-55f4261989e546dc112258c7a75935a81a7ce382"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382"; - sha256 = "1d4bgf4m2x0kn3nw9hbb45asbx22lsp9vxl74rp1yl3sj2vk9sch"; - }; - }; - }; - "sebastian/diff" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-diff-3461e3fccc7cfdfc2720be910d3bd73c69be590d"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d"; - sha256 = "0967nl6cdnr0v0z83w4xy59agn60kfv8gb41aw3fpy1n2wpp62dj"; - }; - }; - }; - "sebastian/exporter" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-exporter-65e8b7db476c5dd267e65eea9cab77584d3cfff9"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9"; - sha256 = "071813jw7nlsa3fs1hlrkl5fsjz4sidyq0i26p22m43isvvyad0q"; - }; - }; - }; - "sebastian/recursion-context" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-recursion-context-cd9d8cf3c5804de4341c283ed787f099f5506172"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172"; - sha256 = "1k0ki1krwq6329vsbw3515wsyg8a7n2l83lk19pdc12i2lg9nhpy"; - }; - }; - }; - "spatie/db-dumper" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "spatie-db-dumper-05e5955fb882008a8947c5a45146d86cfafa10d1"; - src = fetchurl { - url = "https://api.github.com/repos/spatie/db-dumper/zipball/05e5955fb882008a8947c5a45146d86cfafa10d1"; - sha256 = "0g0scxq259qn1maxa61qh3cl5a88778qgx27dgbxr9p8kszivlsg"; - }; - }; - }; - "spatie/laravel-backup" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "spatie-laravel-backup-332fae80b12cacb9e4161824ba195d984b28c8fb"; - src = fetchurl { - url = "https://api.github.com/repos/spatie/laravel-backup/zipball/332fae80b12cacb9e4161824ba195d984b28c8fb"; - sha256 = "02gcsv825zhw727bphrykp7lg7nhna7a2pzc20pnchkl9qbb6pnj"; - }; - }; - }; - "spatie/temporary-directory" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "spatie-temporary-directory-f517729b3793bca58f847c5fd383ec16f03ffec6"; - src = fetchurl { - url = "https://api.github.com/repos/spatie/temporary-directory/zipball/f517729b3793bca58f847c5fd383ec16f03ffec6"; - sha256 = "1pn6l9c86yigpzn83ajpq2wiy8ds0rlxmiq0iwby14cijc98ma3m"; - }; - }; - }; - "squizlabs/php_codesniffer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "squizlabs-php_codesniffer-1359e176e9307e906dc3d890bcc9603ff6d90619"; - src = fetchurl { - url = "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619"; - sha256 = "0bgb02zirxg0swfil3hacp7ry4cv5rwnbjkrj4l3hqln97cvmn21"; - }; - }; - }; - "swiftmailer/swiftmailer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "swiftmailer-swiftmailer-8a5d5072dca8f48460fce2f4131fcc495eec654c"; - src = fetchurl { - url = "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c"; - sha256 = "1p9m4fw9y9md9a7msbmnc0hpdrky8dwrllnyg1qf1cdyp9d70x1d"; - }; - }; - }; - "symfony/console" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-console-4d671ab4ddac94ee439ea73649c69d9d200b5000"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/4d671ab4ddac94ee439ea73649c69d9d200b5000"; - sha256 = "13p16qi328f7jds94vh2gswpq2zgkh99zr7x0ihvy9ysmdc4vln2"; - }; - }; - }; - "symfony/css-selector" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-css-selector-0628e6c6d7c92f1a7bae543959bdc17347be2436"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/css-selector/zipball/0628e6c6d7c92f1a7bae543959bdc17347be2436"; - sha256 = "1piyal7jg8sslxn4h4znrl1fsppbv2ik2s99i5na8wyq6wpz9zp4"; - }; - }; - }; - "symfony/deprecation-contracts" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-deprecation-contracts-e8b495ea28c1d97b5e0c121748d6f9b53d075c66"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66"; - sha256 = "09k869asjb7cd3xh8i5ps824k5y6v510sbpzfalndwy3knig9fig"; - }; - }; - }; - "symfony/error-handler" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-error-handler-c116cda1f51c678782768dce89a45f13c949455d"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/c116cda1f51c678782768dce89a45f13c949455d"; - sha256 = "16bvys7dkhja7bjf42k7rxd7d96fbsp1aj3n50a6b6fj3q2jkxwm"; - }; - }; - }; - "symfony/event-dispatcher" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"; - sha256 = "10vdzpy7gvmy0w4lpr4h4xj2gr224k5llc7f356x1jzbijxg8ckh"; - }; - }; - }; - "symfony/event-dispatcher-contracts" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-contracts-f98b54df6ad059855739db6fcbc2d36995283fe1"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1"; - sha256 = "114zpsd8vac016a0ppf5ag5lmgllrha7nwln8vvhq9282r79xhsl"; - }; - }; - }; - "symfony/finder" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-finder-9b630f3427f3ebe7cd346c277a1408b00249dad9"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9"; - sha256 = "0b2rdx4080jav1ixqxrl4mabn91amf81xsj533b067vdfq4rcfv4"; - }; - }; - }; - "symfony/http-foundation" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-e7793b7906f72a8cc51054fbca9dcff7a8af1c1e"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/e7793b7906f72a8cc51054fbca9dcff7a8af1c1e"; - sha256 = "1wd6ja7wfc6gkmbvpvlmg1d2fbnscnqsx5m2c2qzfnr64pm8wnxm"; - }; - }; - }; - "symfony/http-kernel" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-255ae3b0a488d78fbb34da23d3e0c059874b5948"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/255ae3b0a488d78fbb34da23d3e0c059874b5948"; - sha256 = "0mjkq7badxnrwh8f7xwrpgxsaikb2zb9pf2576v5g3mj4ipf8m2b"; - }; - }; - }; - "symfony/mime" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-mime-02265e1e5111c3cd7480387af25e82378b7ab9cc"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/02265e1e5111c3cd7480387af25e82378b7ab9cc"; - sha256 = "0fm8smz4y87igkwl7sgp05xzxknbsjb16qma6v6k543ba8p46fzy"; - }; - }; - }; - "symfony/polyfill-ctype" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-ctype-6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"; - sha256 = "18235xiqpjx9nzx3pzylm5yzqr6n1j8wnnrzgab1hpbvixfrbqba"; - }; - }; - }; - "symfony/polyfill-iconv" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-iconv-143f1881e655bebca1312722af8068de235ae5dc"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc"; - sha256 = "19v4r40vx62a181l6zfs7n40w9f7npy7jw5x6dssg40hl4a0i3p2"; - }; - }; - }; - "symfony/polyfill-intl-grapheme" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-grapheme-433d05519ce6990bf3530fba6957499d327395c2"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2"; - sha256 = "11169jh39mhr591b61iara8hvq4pnfzgkynlqg90iv510c74d1cg"; - }; - }; - }; - "symfony/polyfill-intl-idn" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-idn-59a8d271f00dd0e4c2e518104cc7963f655a1aa8"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8"; - sha256 = "1bcdl48ji0dmswwvw2b66qxdxxawbx8bgicc02la92gacps08n5v"; - }; - }; - }; - "symfony/polyfill-intl-normalizer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-intl-normalizer-219aa369ceff116e673852dce47c3a41794c14bd"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd"; - sha256 = "1cwckrazq4p4i9ysjh8wjqw8qfnp0rx48pkwysch6z7vkgcif22w"; - }; - }; - }; - "symfony/polyfill-mbstring" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-mbstring-9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"; - sha256 = "0y289x91c9lgr8vlixj5blayf9lsgi4nn2gyn3a99brvn2jnh6q8"; - }; - }; - }; - "symfony/polyfill-php72" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php72-bf44a9fd41feaac72b074de600314a93e2ae78e2"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2"; - sha256 = "11knb688wcf8yvrprgp4z02z3nb6s5xj3wrv77n2qjkc7nc8q7l7"; - }; - }; - }; - "symfony/polyfill-php73" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php73-e440d35fa0286f77fb45b79a03fedbeda9307e85"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85"; - sha256 = "1c7w7j375a1fxq5m4ldy72jg5x4dpijs8q9ryqxvd6gmj1lvncqy"; - }; - }; - }; - "symfony/polyfill-php80" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php80-cfa0ae98841b9e461207c13ab093d76b0fa7bace"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace"; - sha256 = "1kbh4j01kxxc39ls9kzkg7dj13cdlzwy599b96harisysn47jw2n"; - }; - }; - }; - "symfony/polyfill-php81" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-polyfill-php81-13f6d1271c663dc5ae9fb843a8f16521db7687a1"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1"; - sha256 = "01dqzkdppaw7kh1vkckkzn54aql4iw6m9vyg99ahhzmqc2krs91x"; - }; - }; - }; - "symfony/process" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-process-597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"; - sha256 = "1vv2xwk3cvr144yxjj6k4afhkv50v2b957lscncs6m3rvi2zs1nk"; - }; - }; - }; - "symfony/psr-http-message-bridge" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-psr-http-message-bridge-22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34"; - sha256 = "18zvhrcry8173wklv3zpf8k06xx15smrw1dnj0zmq97injnam6fl"; - }; - }; - }; - "symfony/routing" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-routing-e07817bb6244ea33ef5ad31abc4a9288bef3f2f7"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/e07817bb6244ea33ef5ad31abc4a9288bef3f2f7"; - sha256 = "1lk7dbcxvfwmyx65hm0v78ma79f67jnq2xnzg6k0wz52161rk6cl"; - }; - }; - }; - "symfony/service-contracts" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-service-contracts-4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c"; - sha256 = "0lh0vxy0h4wsjmnlf42s950bicsvkzz6brqikfnfb5kmvi0xhcm6"; - }; - }; - }; - "symfony/string" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-string-4432bc7df82a554b3e413a8570ce2fea90e94097"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/4432bc7df82a554b3e413a8570ce2fea90e94097"; - sha256 = "08abxmddl3nphkqf6a58r8w1d5la2f3m9rkbhdfv2k78h2nn19v7"; - }; - }; - }; - "symfony/translation" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-translation-1639abc1177d26bcd4320e535e664cef067ab0ca"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/1639abc1177d26bcd4320e535e664cef067ab0ca"; - sha256 = "0q7f4hfv8n7px5fhh0f8ii6lbfj9xp7fas5ls7yazm4980c06a1x"; - }; - }; - }; - "symfony/translation-contracts" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-translation-contracts-136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe"; - sha256 = "1z1514i3gsxdisyayzh880i8rj954qim7c183cld91kvvqcqi7x0"; - }; - }; - }; - "symfony/var-dumper" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-af52239a330fafd192c773795520dc2dd62b5657"; - src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657"; - sha256 = "1dxmwyg3wxq313zfrjwywkfsi38lq6i3prq69f47vbiqajfs55jn"; - }; - }; - }; - "tecnickcom/tc-lib-barcode" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tecnickcom-tc-lib-barcode-4907ef1e384dbb7d3100c897925e7dc071a419a3"; - src = fetchurl { - url = "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/4907ef1e384dbb7d3100c897925e7dc071a419a3"; - sha256 = "1wwrws42lh60zmx7d49dqwlli09j1q6m1669cdlya907icx6cxbd"; - }; - }; - }; - "tecnickcom/tc-lib-color" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tecnickcom-tc-lib-color-f9e45c59496418227184626ad31e83470153c11f"; - src = fetchurl { - url = "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/f9e45c59496418227184626ad31e83470153c11f"; - sha256 = "04g9fkk4ifc8sj27jz3nj6rnqgfyls6b2p1ll59wm9d99rngyq72"; - }; - }; - }; - "tecnickcom/tcpdf" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tecnickcom-tcpdf-e3cffc9bcbc76e89e167e9eb0bbda0cab7518459"; - src = fetchurl { - url = "https://api.github.com/repos/tecnickcom/TCPDF/zipball/e3cffc9bcbc76e89e167e9eb0bbda0cab7518459"; - sha256 = "17769rpyfq6z8lw5bj7icvkz7003d6kbj1hiji5cixrkahvc57fy"; - }; - }; - }; - "tijsverkoyen/css-to-inline-styles" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tijsverkoyen-css-to-inline-styles-da444caae6aca7a19c0c140f68c6182e337d5b1c"; - src = fetchurl { - url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c"; - sha256 = "13lzhf1kswg626b8zd23z4pa7sg679si368wcg6pklqvijnn0any"; - }; - }; - }; - "tmilos/lexer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tmilos-lexer-e7885595614759f1da2ff79b66e3fb26d7f875fa"; - src = fetchurl { - url = "https://api.github.com/repos/tmilos/lexer/zipball/e7885595614759f1da2ff79b66e3fb26d7f875fa"; - sha256 = "0b1dysgnfph13xcc04kvi0kncsq63q1kw973q5ichwl4h9w5qfdk"; - }; - }; - }; - "tmilos/scim-filter-parser" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tmilos-scim-filter-parser-cfd9ba1f33e1e15adcab2481bffd74cb9fb35704"; - src = fetchurl { - url = "https://api.github.com/repos/tmilos/scim-filter-parser/zipball/cfd9ba1f33e1e15adcab2481bffd74cb9fb35704"; - sha256 = "08vp7p7jbzarmq1dlsiy7wb5klqp6ln8iidhnhq9xcqa1frrfj87"; - }; - }; - }; - "tmilos/scim-schema" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tmilos-scim-schema-bb871e667b33080b4cd36d7a9b2ac2cdbf796062"; - src = fetchurl { - url = "https://api.github.com/repos/tmilos/scim-schema/zipball/bb871e667b33080b4cd36d7a9b2ac2cdbf796062"; - sha256 = "0k78qica59y2cmad17qcww6gm0caqa1shvv73scgyf0fxzqpay8w"; - }; - }; - }; - "tmilos/value" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "tmilos-value-9e78ad9c026b14cacec1a27552ee0ada9d7d1c06"; - src = fetchurl { - url = "https://api.github.com/repos/tmilos/value/zipball/9e78ad9c026b14cacec1a27552ee0ada9d7d1c06"; - sha256 = "1lbmm5l0q8mn2qs9jczqk1lc72m77455b3dv774fdfpy8vm2d7iy"; - }; - }; - }; - "unicodeveloper/laravel-password" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "unicodeveloper-laravel-password-806e345ae992e0adf38c4cfa32063d7d7c9d189a"; - src = fetchurl { - url = "https://api.github.com/repos/unicodeveloper/laravel-password/zipball/806e345ae992e0adf38c4cfa32063d7d7c9d189a"; - sha256 = "1qd63zahc0mw7ypfghm2q1zfq1w3vr58zxh5gdgcx0srlg2v69gc"; - }; - }; - }; - "vlucas/phpdotenv" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "vlucas-phpdotenv-264dce589e7ce37a7ba99cb901eed8249fbec92f"; - src = fetchurl { - url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f"; - sha256 = "0z2q376k3rww8qb9jdywm3fj386pqmcx7rg6msd3zdrjxfbqcqnl"; - }; - }; - }; - "voku/portable-ascii" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "voku-portable-ascii-87337c91b9dfacee02452244ee14ab3c43bc485a"; - src = fetchurl { - url = "https://api.github.com/repos/voku/portable-ascii/zipball/87337c91b9dfacee02452244ee14ab3c43bc485a"; - sha256 = "1j2xpbv7xiwxwb6gfc3h6imc6xcbyb2jw3h8wgfnpvjl5yfbi4xb"; - }; - }; - }; - "watson/validating" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "watson-validating-fda4daaf804ead4aef641e1fb3f3b40a8448167e"; - src = fetchurl { - url = "https://api.github.com/repos/dwightwatson/validating/zipball/fda4daaf804ead4aef641e1fb3f3b40a8448167e"; - sha256 = "00i2k7q0n62yy20k6p09j7hwbxxwq1n15gprsp4rl9wbagwwx4m9"; - }; - }; - }; - "webmozart/assert" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "webmozart-assert-11cb2199493b2f8a3b53e7f19068fc6aac760991"; - src = fetchurl { - url = "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991"; - sha256 = "18qiza1ynwxpi6731jx1w5qsgw98prld1lgvfk54z92b1nc7psix"; - }; - }; - }; - }; - devPackages = {}; -in -composerEnv.buildPackage { - inherit packages devPackages noDev; - name = "snipe-it"; - src = composerEnv.filterSrc ./.; - executable = false; - symlinkDependencies = false; - meta = { - license = "AGPL-3.0-or-later"; - }; -} - diff --git a/pkgs/servers/web-apps/snipe-it/update.sh b/pkgs/servers/web-apps/snipe-it/update.sh deleted file mode 100755 index 226c71af3e345..0000000000000 --- a/pkgs/servers/web-apps/snipe-it/update.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i bash -p nix curl jq nix-update -# shellcheck shell=bash -cd "$(dirname "$0")" - -usage () { - cat <<EOF -# Snipe-IT Updater - -A small script to update Snipe-IT to the latest release - -Usage: $(basename "$0") [options] - - -h, --help Display this message and quit - -c, --commit Create a commit after updating - -n, --no-build Just update, don't build the package - -This script needs composer2nix in your PATH. -https://github.com/svanderburg/composer2nix -EOF -} - -# Parse command line arguments -while [ $# -ge 1 ]; do - case "$1" in - -h|--help) - usage - exit 0 - ;; - -c|--commit) - COMMIT_CHANGES=true - ;; - -d|--dont-build) - DONT_BUILD=true - ;; - *) - ;; - esac - shift -done - -# check if composer2nix is installed -if ! command -v composer2nix &> /dev/null; then - echo "Please install composer2nix (https://github.com/svanderburg/composer2nix) to run this script." - exit 1 -fi - -CURRENT_VERSION=$(nix eval -f ../../../.. --raw snipe-it.version) -TARGET_VERSION_REMOTE=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/snipe/snipe-it/releases/latest | jq -r ".tag_name") -TARGET_VERSION=${TARGET_VERSION_REMOTE:1} -SNIPE_IT=https://github.com/snipe/snipe-it/raw/$TARGET_VERSION_REMOTE -SHA256=$(nix-prefetch-url --unpack "https://github.com/snipe/snipe-it/archive/v$TARGET_VERSION/snipe-it.tar.gz") - -if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then - echo "snipe-it is up-to-date: ${CURRENT_VERSION}" - exit 0 -fi - -curl -LO "$SNIPE_IT/composer.json" -curl -LO "$SNIPE_IT/composer.lock" - -composer2nix --name "snipe-it" \ - --composition=composition.nix \ - --no-dev -rm composer.json composer.lock - -# change version number -sed -e "s/version =.*;/version = \"$TARGET_VERSION\";/g" \ - -e "s/sha256 =.*;/sha256 = \"$SHA256\";/g" \ - -i ./default.nix - -# fix composer-env.nix -sed -e "s/stdenv\.lib/lib/g" \ - -e '3s/stdenv, writeTextFile/stdenv, lib, writeTextFile/' \ - -i ./composer-env.nix - -# fix composition.nix -sed -e '7s/stdenv writeTextFile/stdenv lib writeTextFile/' \ - -i composition.nix - -# fix missing newline -echo "" >> composition.nix -echo "" >> php-packages.nix - -if [ -z ${DONT_BUILD+x} ]; then - ( - cd ../../../.. - nix-build -A snipe-it - ) -fi - -if [ -n "$COMMIT_CHANGES" ]; then - git add . - git commit -m "snipe-it: $CURRENT_VERSION -> $TARGET_VERSION - -https://github.com/snipe/snipe-it/releases/tag/v$TARGET_VERSION" -fi - -exit $? diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/servers/wishlist/default.nix index 33a8f0ae2cfcd..93986677b28ea 100644 --- a/pkgs/servers/wishlist/default.nix +++ b/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-NOR7YCLcwjf+oAi46qL6NteKLMSvJpqu9UzO6UvgcVQ="; + sha256 = "sha256-NSL67j/nnE6Ftm39XNav3/TPUSFXHxQE5OxpNEIdtVc="; }; - vendorHash = "sha256-v8R0e52CpyLKiuYcEZFWAY64tgCBZE2dY0vgqsHWeAc="; + vendorHash = "sha256-8TQkzsvHjdkYXVmUKaqbs7nURx8kUv2HGs9cBv3hPJc="; doCheck = false; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index eb9c1ced67111..870ea4ad05854 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4159,11 +4159,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.8"; + version = "21.1.9"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.8.tar.xz"; - sha256 = "0lmimvaw9x0ymdhjfqsrbx689bcapy8c24ajw9705j2harrxpaiq"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.9.tar.xz"; + sha256 = "0fjk9ggcrn96blq0bm80739yj23s3gjjjsc0nxk4jk0v07i7nsgz"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index e7c93e10bacb9..06a2b69d505af 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.4.tar.xz mirror://xorg/individual/util/makedepend-1.0.8.tar.xz mirror://xorg/individual/util/util-macros-1.20.0.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz -mirror://xorg/individual/xserver/xorg-server-21.1.8.tar.xz +mirror://xorg/individual/xserver/xorg-server-21.1.9.tar.xz diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 7ad83147fa165..9bfc745ff51a4 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "23.2.1"; + version = "23.2.2"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-7rwmksOqgGF9eEKLxux7kbJUqYIU0qcOmXCYUDzW75A="; + sha256 = "sha256-n3wJONKkHpQf+gT5nDXl2yvNPuwDSv6NNdXIEKIusKg="; }; depsBuildBuild = [ diff --git a/pkgs/shells/loksh/default.nix b/pkgs/shells/loksh/default.nix index d646e91e286b0..39231e6e14423 100644 --- a/pkgs/shells/loksh/default.nix +++ b/pkgs/shells/loksh/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "loksh"; - version = "7.3"; + version = "7.4"; src = fetchFromGitHub { owner = "dimkr"; repo = finalAttrs.pname; rev = finalAttrs.version; fetchSubmodules = true; - sha256 = "sha256-djjJH+mknmOfleVJhSkCLqCIaELh2gjZZE/xdNZuPtY="; + sha256 = "sha256-gQK9gq6MsKVyOikOW0sW/SbIM1K/3I8pn58P/SqzKys="; }; nativeBuildInputs = [ diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix index bb3f631cf225d..f4571d4da0026 100644 --- a/pkgs/shells/nushell/plugins/default.nix +++ b/pkgs/shells/nushell/plugins/default.nix @@ -4,6 +4,6 @@ lib.makeScope newScope (self: with self; { gstat = callPackage ./gstat.nix { inherit Security; }; formats = callPackage ./formats.nix { inherit IOKit Foundation; }; query = callPackage ./query.nix { inherit IOKit CoreFoundation; }; - regex = callPackage ./regex.nix { }; + regex = callPackage ./regex.nix { inherit IOKit; }; net = callPackage ./net.nix { inherit IOKit CoreFoundation; }; }) diff --git a/pkgs/shells/nushell/plugins/regex.nix b/pkgs/shells/nushell/plugins/regex.nix index 24cffddc27c2a..4689a83902574 100644 --- a/pkgs/shells/nushell/plugins/regex.nix +++ b/pkgs/shells/nushell/plugins/regex.nix @@ -1,7 +1,9 @@ -{ lib +{ stdenv +, lib , rustPlatform , fetchFromGitHub , nix-update-script +, IOKit }: rustPlatform.buildRustPackage { @@ -17,6 +19,8 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-AACpzSavY6MlYnl1lDYxVlfsEvEpNK0u8SzsoSZbqFc="; + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index b84cfb5be7a60..58485bc8c9aa0 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.3.8"; + version = "7.3.9"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -88,19 +88,19 @@ stdenv.mkDerivation rec { sources = { aarch64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz"; - hash = "sha256-0FyTt+tn3mpr6LxC3oQvmULNO8+Jp7qsjISRdTesCCI="; + hash = "sha256-g63hMkJUIYFpSl9NylCQs0WYdq/8S3UaFVtRjhZOs+s="; }; aarch64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; - hash = "sha256-BNf157sdXg7pV6Hfg9luw3Xi03fTekesBQCwDFeO8ZI="; + hash = "sha256-zy6VZyXj9TV5QlVFnCgiB6XfIOyS79kPOFhvMRpOrP4="; }; x86_64-darwin = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-Ts+nF6tPQZfYgJAvPtijvYBGSrg5mxCeNEa0X74/g4M="; + hash = "sha256-DI+m3Ik1Zw293H6VR19DNAECBApqdIENlrK2/D/3vNc="; }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; - hash = "sha256-iELDoFTy/W6Wm0gNJmywwvp811WycjffBTMDRtrWdVU="; + hash = "sha256-eHlh46eV+g3eCiKalVGixwKY9mlk2lXRwUJF6By5lP0="; }; }; tests.version = testers.testVersion { diff --git a/pkgs/shells/zsh/zsh-abbr/default.nix b/pkgs/shells/zsh/zsh-abbr/default.nix index 9a8f9f9b55971..27b9e02dc93e2 100644 --- a/pkgs/shells/zsh/zsh-abbr/default.nix +++ b/pkgs/shells/zsh/zsh-abbr/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "zsh-abbr"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "olets"; repo = "zsh-abbr"; rev = "v${version}"; - hash = "sha256-iKL2vn7TmQr78y0Bn02DgNf9DS5jZyh6uK9MzYTFZaA"; + hash = "sha256-MvxJkEbJKMmYRku/RF6ayOb7u7NI4HZehO8ty64jEnE="; }; strictDeps = true; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index beba687e788ac..d235ffefaab40 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -165,6 +165,17 @@ let , ... } @ attrs: +# Policy on acceptable hash types in nixpkgs +assert attrs ? outputHash -> ( + let algo = + attrs.outputHashAlgo or (lib.head (lib.splitString "-" attrs.outputHash)); + in + if algo == "md5" then + throw "Rejected insecure ${algo} hash '${attrs.outputHash}'" + else + true +); + let # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when # no package has `doCheck = true`. diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 4cc9ecc0db3e9..595c3413d5e18 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -104,7 +104,7 @@ with pkgs; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; fetchurl = callPackages ../build-support/fetchurl/tests.nix { }; - fetchFromBittorrent = callPackages ../build-support/fetchbittorrent/tests.nix { }; + fetchtorrent = callPackages ../build-support/fetchtorrent/tests.nix { }; fetchpatch = callPackages ../build-support/fetchpatch/tests.nix { }; fetchpatch2 = callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; }; fetchDebianPatch = callPackages ../build-support/fetchdebianpatch/tests.nix { }; diff --git a/pkgs/test/nixpkgs-check-by-name/Cargo.lock b/pkgs/test/nixpkgs-check-by-name/Cargo.lock index aa4459c7cff8b..fc3aeb9fd79b4 100644 --- a/pkgs/test/nixpkgs-check-by-name/Cargo.lock +++ b/pkgs/test/nixpkgs-check-by-name/Cargo.lock @@ -163,6 +163,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] name = "errno" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -219,6 +225,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -274,6 +289,7 @@ dependencies = [ "anyhow", "clap", "colored", + "itertools", "lazy_static", "regex", "rnix", diff --git a/pkgs/test/nixpkgs-check-by-name/Cargo.toml b/pkgs/test/nixpkgs-check-by-name/Cargo.toml index 70b44d0482005..1e6eaa1106d54 100644 --- a/pkgs/test/nixpkgs-check-by-name/Cargo.toml +++ b/pkgs/test/nixpkgs-check-by-name/Cargo.toml @@ -13,6 +13,7 @@ serde = { version = "1.0.185", features = ["derive"] } anyhow = "1.0" lazy_static = "1.4.0" colored = "2.0.4" +itertools = "0.11.0" [dev-dependencies] temp-env = "0.3.5" diff --git a/pkgs/test/nixpkgs-check-by-name/README.md b/pkgs/test/nixpkgs-check-by-name/README.md index 2d2db9a58bc5f..146cea0a64ba1 100644 --- a/pkgs/test/nixpkgs-check-by-name/README.md +++ b/pkgs/test/nixpkgs-check-by-name/README.md @@ -1,6 +1,6 @@ # Nixpkgs pkgs/by-name checker -This directory implements a program to check the [validity](#validity-checks) of the `pkgs/by-name` Nixpkgs directory once introduced. +This directory implements a program to check the [validity](#validity-checks) of the `pkgs/by-name` Nixpkgs directory. It is being used by [this GitHub Actions workflow](../../../.github/workflows/check-by-name.yml). This is part of the implementation of [RFC 140](https://github.com/NixOS/rfcs/pull/140). @@ -24,7 +24,7 @@ This API may be changed over time if the CI workflow making use of it is adjuste - `2`: If an unexpected I/O error occurs - Standard error: - Informative messages - - Error messages if validation is not successful + - Detected problems if validation is not successful ## Validity checks diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.rs b/pkgs/test/nixpkgs-check-by-name/src/eval.rs index 26836501c97ad..e4f986748b4f4 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.rs @@ -1,12 +1,12 @@ +use crate::nixpkgs_problem::NixpkgsProblem; use crate::structure; -use crate::utils::ErrorWriter; +use crate::validation::{self, Validation::Success}; use crate::Version; use std::path::Path; use anyhow::Context; use serde::Deserialize; use std::collections::HashMap; -use std::io; use std::path::PathBuf; use std::process; use tempfile::NamedTempFile; @@ -40,12 +40,12 @@ const EXPR: &str = include_str!("eval.nix"); /// Check that the Nixpkgs attribute values corresponding to the packages in pkgs/by-name are /// of the form `callPackage <package_file> { ... }`. /// See the `eval.nix` file for how this is achieved on the Nix side -pub fn check_values<W: io::Write>( +pub fn check_values( version: Version, - error_writer: &mut ErrorWriter<W>, - nixpkgs: &structure::Nixpkgs, + nixpkgs_path: &Path, + package_names: Vec<String>, eval_accessible_paths: Vec<&Path>, -) -> anyhow::Result<()> { +) -> validation::Result<()> { // Write the list of packages we need to check into a temporary JSON file. // This can then get read by the Nix evaluation. let attrs_file = NamedTempFile::new().context("Failed to create a temporary file")?; @@ -55,7 +55,7 @@ pub fn check_values<W: io::Write>( // entry is needed. let attrs_file_path = attrs_file.path().canonicalize()?; - serde_json::to_writer(&attrs_file, &nixpkgs.package_names).context(format!( + serde_json::to_writer(&attrs_file, &package_names).context(format!( "Failed to serialise the package names to the temporary path {}", attrs_file_path.display() ))?; @@ -87,9 +87,9 @@ pub fn check_values<W: io::Write>( .arg(&attrs_file_path) // Same for the nixpkgs to test .args(["--arg", "nixpkgsPath"]) - .arg(&nixpkgs.path) + .arg(nixpkgs_path) .arg("-I") - .arg(&nixpkgs.path); + .arg(nixpkgs_path); // Also add extra paths that need to be accessible for path in eval_accessible_paths { @@ -111,52 +111,54 @@ pub fn check_values<W: io::Write>( String::from_utf8_lossy(&result.stdout) ))?; - for package_name in &nixpkgs.package_names { - let relative_package_file = structure::Nixpkgs::relative_file_for_package(package_name); - let absolute_package_file = nixpkgs.path.join(&relative_package_file); + Ok(validation::sequence_(package_names.iter().map( + |package_name| { + let relative_package_file = structure::relative_file_for_package(package_name); + let absolute_package_file = nixpkgs_path.join(&relative_package_file); - if let Some(attribute_info) = actual_files.get(package_name) { - let valid = match &attribute_info.variant { - AttributeVariant::AutoCalled => true, - AttributeVariant::CallPackage { path, empty_arg } => { - let correct_file = if let Some(call_package_path) = path { - absolute_package_file == *call_package_path - } else { - false - }; - // Only check for the argument to be non-empty if the version is V1 or - // higher - let non_empty = if version >= Version::V1 { - !empty_arg - } else { - true - }; - correct_file && non_empty - } - AttributeVariant::Other => false, - }; - - if !valid { - error_writer.write(&format!( - "pkgs.{package_name}: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage {} {{ ... }}` with a non-empty second argument.", - relative_package_file.display() - ))?; - continue; - } + if let Some(attribute_info) = actual_files.get(package_name) { + let valid = match &attribute_info.variant { + AttributeVariant::AutoCalled => true, + AttributeVariant::CallPackage { path, empty_arg } => { + let correct_file = if let Some(call_package_path) = path { + absolute_package_file == *call_package_path + } else { + false + }; + // Only check for the argument to be non-empty if the version is V1 or + // higher + let non_empty = if version >= Version::V1 { + !empty_arg + } else { + true + }; + correct_file && non_empty + } + AttributeVariant::Other => false, + }; - if !attribute_info.is_derivation { - error_writer.write(&format!( - "pkgs.{package_name}: This attribute defined by {} is not a derivation", - relative_package_file.display() - ))?; + if !valid { + NixpkgsProblem::WrongCallPackage { + relative_package_file: relative_package_file.clone(), + package_name: package_name.clone(), + } + .into() + } else if !attribute_info.is_derivation { + NixpkgsProblem::NonDerivation { + relative_package_file: relative_package_file.clone(), + package_name: package_name.clone(), + } + .into() + } else { + Success(()) + } + } else { + NixpkgsProblem::UndefinedAttr { + relative_package_file: relative_package_file.clone(), + package_name: package_name.clone(), + } + .into() } - } else { - error_writer.write(&format!( - "pkgs.{package_name}: This attribute is not defined but it should be defined automatically as {}", - relative_package_file.display() - ))?; - continue; - } - } - Ok(()) + }, + ))) } diff --git a/pkgs/test/nixpkgs-check-by-name/src/main.rs b/pkgs/test/nixpkgs-check-by-name/src/main.rs index 5d28077ae4aec..4cabf8f446f56 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/main.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/main.rs @@ -1,16 +1,19 @@ mod eval; +mod nixpkgs_problem; mod references; mod structure; mod utils; +mod validation; +use crate::structure::check_structure; +use crate::validation::Validation::Failure; +use crate::validation::Validation::Success; use anyhow::Context; use clap::{Parser, ValueEnum}; use colored::Colorize; use std::io; use std::path::{Path, PathBuf}; use std::process::ExitCode; -use structure::Nixpkgs; -use utils::ErrorWriter; /// Program to check the validity of pkgs/by-name #[derive(Parser, Debug)] @@ -63,8 +66,8 @@ fn main() -> ExitCode { /// /// # Return value /// - `Err(e)` if an I/O-related error `e` occurred. -/// - `Ok(false)` if the structure is invalid, all the structural errors have been written to `error_writer`. -/// - `Ok(true)` if the structure is valid, nothing will have been written to `error_writer`. +/// - `Ok(false)` if there are problems, all of which will be written to `error_writer`. +/// - `Ok(true)` if there are no problems pub fn check_nixpkgs<W: io::Write>( nixpkgs_path: &Path, version: Version, @@ -76,31 +79,38 @@ pub fn check_nixpkgs<W: io::Write>( nixpkgs_path.display() ))?; - // Wraps the error_writer to print everything in red, and tracks whether anything was printed - // at all. Later used to figure out if the structure was valid or not. - let mut error_writer = ErrorWriter::new(error_writer); - - if !nixpkgs_path.join(structure::BASE_SUBPATH).exists() { + let check_result = if !nixpkgs_path.join(utils::BASE_SUBPATH).exists() { eprintln!( "Given Nixpkgs path does not contain a {} subdirectory, no check necessary.", - structure::BASE_SUBPATH + utils::BASE_SUBPATH ); + Success(()) } else { - let nixpkgs = Nixpkgs::new(&nixpkgs_path, &mut error_writer)?; + match check_structure(&nixpkgs_path)? { + Failure(errors) => Failure(errors), + Success(package_names) => + // Only if we could successfully parse the structure, we do the evaluation checks + { + eval::check_values(version, &nixpkgs_path, package_names, eval_accessible_paths)? + } + } + }; - if error_writer.empty { - // Only if we could successfully parse the structure, we do the semantic checks - eval::check_values(version, &mut error_writer, &nixpkgs, eval_accessible_paths)?; - references::check_references(&mut error_writer, &nixpkgs)?; + match check_result { + Failure(errors) => { + for error in errors { + writeln!(error_writer, "{}", error.to_string().red())? + } + Ok(false) } + Success(_) => Ok(true), } - Ok(error_writer.empty) } #[cfg(test)] mod tests { use crate::check_nixpkgs; - use crate::structure; + use crate::utils; use crate::Version; use anyhow::Context; use std::fs; @@ -145,7 +155,7 @@ mod tests { return Ok(()); } - let base = path.join(structure::BASE_SUBPATH); + let base = path.join(utils::BASE_SUBPATH); fs::create_dir_all(base.join("fo/foo"))?; fs::write(base.join("fo/foo/package.nix"), "{ someDrv }: someDrv")?; diff --git a/pkgs/test/nixpkgs-check-by-name/src/nixpkgs_problem.rs b/pkgs/test/nixpkgs-check-by-name/src/nixpkgs_problem.rs new file mode 100644 index 0000000000000..2344a8cc13253 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/src/nixpkgs_problem.rs @@ -0,0 +1,218 @@ +use crate::utils::PACKAGE_NIX_FILENAME; +use rnix::parser::ParseError; +use std::ffi::OsString; +use std::fmt; +use std::io; +use std::path::PathBuf; + +/// Any problem that can occur when checking Nixpkgs +pub enum NixpkgsProblem { + ShardNonDir { + relative_shard_path: PathBuf, + }, + InvalidShardName { + relative_shard_path: PathBuf, + shard_name: String, + }, + PackageNonDir { + relative_package_dir: PathBuf, + }, + CaseSensitiveDuplicate { + relative_shard_path: PathBuf, + first: OsString, + second: OsString, + }, + InvalidPackageName { + relative_package_dir: PathBuf, + package_name: String, + }, + IncorrectShard { + relative_package_dir: PathBuf, + correct_relative_package_dir: PathBuf, + }, + PackageNixNonExistent { + relative_package_dir: PathBuf, + }, + PackageNixDir { + relative_package_dir: PathBuf, + }, + UndefinedAttr { + relative_package_file: PathBuf, + package_name: String, + }, + WrongCallPackage { + relative_package_file: PathBuf, + package_name: String, + }, + NonDerivation { + relative_package_file: PathBuf, + package_name: String, + }, + OutsideSymlink { + relative_package_dir: PathBuf, + subpath: PathBuf, + }, + UnresolvableSymlink { + relative_package_dir: PathBuf, + subpath: PathBuf, + io_error: io::Error, + }, + CouldNotParseNix { + relative_package_dir: PathBuf, + subpath: PathBuf, + error: ParseError, + }, + PathInterpolation { + relative_package_dir: PathBuf, + subpath: PathBuf, + line: usize, + text: String, + }, + SearchPath { + relative_package_dir: PathBuf, + subpath: PathBuf, + line: usize, + text: String, + }, + OutsidePathReference { + relative_package_dir: PathBuf, + subpath: PathBuf, + line: usize, + text: String, + }, + UnresolvablePathReference { + relative_package_dir: PathBuf, + subpath: PathBuf, + line: usize, + text: String, + io_error: io::Error, + }, +} + +impl fmt::Display for NixpkgsProblem { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + NixpkgsProblem::ShardNonDir { relative_shard_path } => + write!( + f, + "{}: This is a file, but it should be a directory.", + relative_shard_path.display(), + ), + NixpkgsProblem::InvalidShardName { relative_shard_path, shard_name } => + write!( + f, + "{}: Invalid directory name \"{shard_name}\", must be at most 2 ASCII characters consisting of a-z, 0-9, \"-\" or \"_\".", + relative_shard_path.display() + ), + NixpkgsProblem::PackageNonDir { relative_package_dir } => + write!( + f, + "{}: This path is a file, but it should be a directory.", + relative_package_dir.display(), + ), + NixpkgsProblem::CaseSensitiveDuplicate { relative_shard_path, first, second } => + write!( + f, + "{}: Duplicate case-sensitive package directories {first:?} and {second:?}.", + relative_shard_path.display(), + ), + NixpkgsProblem::InvalidPackageName { relative_package_dir, package_name } => + write!( + f, + "{}: Invalid package directory name \"{package_name}\", must be ASCII characters consisting of a-z, A-Z, 0-9, \"-\" or \"_\".", + relative_package_dir.display(), + ), + NixpkgsProblem::IncorrectShard { relative_package_dir, correct_relative_package_dir } => + write!( + f, + "{}: Incorrect directory location, should be {} instead.", + relative_package_dir.display(), + correct_relative_package_dir.display(), + ), + NixpkgsProblem::PackageNixNonExistent { relative_package_dir } => + write!( + f, + "{}: Missing required \"{PACKAGE_NIX_FILENAME}\" file.", + relative_package_dir.display(), + ), + NixpkgsProblem::PackageNixDir { relative_package_dir } => + write!( + f, + "{}: \"{PACKAGE_NIX_FILENAME}\" must be a file.", + relative_package_dir.display(), + ), + NixpkgsProblem::UndefinedAttr { relative_package_file, package_name } => + write!( + f, + "pkgs.{package_name}: This attribute is not defined but it should be defined automatically as {}", + relative_package_file.display() + ), + NixpkgsProblem::WrongCallPackage { relative_package_file, package_name } => + write!( + f, + "pkgs.{package_name}: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage {} {{ ... }}` with a non-empty second argument.", + relative_package_file.display() + ), + NixpkgsProblem::NonDerivation { relative_package_file, package_name } => + write!( + f, + "pkgs.{package_name}: This attribute defined by {} is not a derivation", + relative_package_file.display() + ), + NixpkgsProblem::OutsideSymlink { relative_package_dir, subpath } => + write!( + f, + "{}: Path {} is a symlink pointing to a path outside the directory of that package.", + relative_package_dir.display(), + subpath.display(), + ), + NixpkgsProblem::UnresolvableSymlink { relative_package_dir, subpath, io_error } => + write!( + f, + "{}: Path {} is a symlink which cannot be resolved: {io_error}.", + relative_package_dir.display(), + subpath.display(), + ), + NixpkgsProblem::CouldNotParseNix { relative_package_dir, subpath, error } => + write!( + f, + "{}: File {} could not be parsed by rnix: {}", + relative_package_dir.display(), + subpath.display(), + error, + ), + NixpkgsProblem::PathInterpolation { relative_package_dir, subpath, line, text } => + write!( + f, + "{}: File {} at line {line} contains the path expression \"{}\", which is not yet supported and may point outside the directory of that package.", + relative_package_dir.display(), + subpath.display(), + text + ), + NixpkgsProblem::SearchPath { relative_package_dir, subpath, line, text } => + write!( + f, + "{}: File {} at line {line} contains the nix search path expression \"{}\" which may point outside the directory of that package.", + relative_package_dir.display(), + subpath.display(), + text + ), + NixpkgsProblem::OutsidePathReference { relative_package_dir, subpath, line, text } => + write!( + f, + "{}: File {} at line {line} contains the path expression \"{}\" which may point outside the directory of that package.", + relative_package_dir.display(), + subpath.display(), + text, + ), + NixpkgsProblem::UnresolvablePathReference { relative_package_dir, subpath, line, text, io_error } => + write!( + f, + "{}: File {} at line {line} contains the path expression \"{}\" which cannot be resolved: {io_error}.", + relative_package_dir.display(), + subpath.display(), + text, + ), + } + } +} diff --git a/pkgs/test/nixpkgs-check-by-name/src/references.rs b/pkgs/test/nixpkgs-check-by-name/src/references.rs index 16dc60729c420..0561a9b22e858 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/references.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/references.rs @@ -1,105 +1,98 @@ -use crate::structure::Nixpkgs; +use crate::nixpkgs_problem::NixpkgsProblem; use crate::utils; -use crate::utils::{ErrorWriter, LineIndex}; +use crate::utils::LineIndex; +use crate::validation::{self, ResultIteratorExt, Validation::Success}; use anyhow::Context; use rnix::{Root, SyntaxKind::NODE_PATH}; use std::ffi::OsStr; use std::fs::read_to_string; -use std::io; -use std::path::{Path, PathBuf}; - -/// Small helper so we don't need to pass in the same arguments to all functions -struct PackageContext<'a, W: io::Write> { - error_writer: &'a mut ErrorWriter<W>, - /// The package directory relative to Nixpkgs, such as `pkgs/by-name/fo/foo` - relative_package_dir: &'a PathBuf, - /// The absolute package directory - absolute_package_dir: &'a PathBuf, -} +use std::path::Path; /// Check that every package directory in pkgs/by-name doesn't link to outside that directory. /// Both symlinks and Nix path expressions are checked. -pub fn check_references<W: io::Write>( - error_writer: &mut ErrorWriter<W>, - nixpkgs: &Nixpkgs, -) -> anyhow::Result<()> { - // Check the directories for each package separately - for package_name in &nixpkgs.package_names { - let relative_package_dir = Nixpkgs::relative_dir_for_package(package_name); - let mut context = PackageContext { - error_writer, - relative_package_dir: &relative_package_dir, - absolute_package_dir: &nixpkgs.path.join(&relative_package_dir), - }; - - // The empty argument here is the subpath under the package directory to check - // An empty one means the package directory itself - check_path(&mut context, Path::new("")).context(format!( - "While checking the references in package directory {}", - relative_package_dir.display() - ))?; - } - Ok(()) +pub fn check_references( + relative_package_dir: &Path, + absolute_package_dir: &Path, +) -> validation::Result<()> { + // The empty argument here is the subpath under the package directory to check + // An empty one means the package directory itself + check_path(relative_package_dir, absolute_package_dir, Path::new("")).context(format!( + "While checking the references in package directory {}", + relative_package_dir.display() + )) } /// Checks for a specific path to not have references outside -fn check_path<W: io::Write>(context: &mut PackageContext<W>, subpath: &Path) -> anyhow::Result<()> { - let path = context.absolute_package_dir.join(subpath); +fn check_path( + relative_package_dir: &Path, + absolute_package_dir: &Path, + subpath: &Path, +) -> validation::Result<()> { + let path = absolute_package_dir.join(subpath); - if path.is_symlink() { + Ok(if path.is_symlink() { // Check whether the symlink resolves to outside the package directory match path.canonicalize() { Ok(target) => { // No need to handle the case of it being inside the directory, since we scan through the // entire directory recursively anyways - if let Err(_prefix_error) = target.strip_prefix(context.absolute_package_dir) { - context.error_writer.write(&format!( - "{}: Path {} is a symlink pointing to a path outside the directory of that package.", - context.relative_package_dir.display(), - subpath.display(), - ))?; + if let Err(_prefix_error) = target.strip_prefix(absolute_package_dir) { + NixpkgsProblem::OutsideSymlink { + relative_package_dir: relative_package_dir.to_path_buf(), + subpath: subpath.to_path_buf(), + } + .into() + } else { + Success(()) } } - Err(e) => { - context.error_writer.write(&format!( - "{}: Path {} is a symlink which cannot be resolved: {e}.", - context.relative_package_dir.display(), - subpath.display(), - ))?; + Err(io_error) => NixpkgsProblem::UnresolvableSymlink { + relative_package_dir: relative_package_dir.to_path_buf(), + subpath: subpath.to_path_buf(), + io_error, } + .into(), } } else if path.is_dir() { // Recursively check each entry - for entry in utils::read_dir_sorted(&path)? { - let entry_subpath = subpath.join(entry.file_name()); - check_path(context, &entry_subpath) - .context(format!("Error while recursing into {}", subpath.display()))? - } + validation::sequence_( + utils::read_dir_sorted(&path)? + .into_iter() + .map(|entry| { + let entry_subpath = subpath.join(entry.file_name()); + check_path(relative_package_dir, absolute_package_dir, &entry_subpath) + .context(format!("Error while recursing into {}", subpath.display())) + }) + .collect_vec()?, + ) } else if path.is_file() { // Only check Nix files if let Some(ext) = path.extension() { if ext == OsStr::new("nix") { - check_nix_file(context, subpath).context(format!( - "Error while checking Nix file {}", - subpath.display() - ))? + check_nix_file(relative_package_dir, absolute_package_dir, subpath).context( + format!("Error while checking Nix file {}", subpath.display()), + )? + } else { + Success(()) } + } else { + Success(()) } } else { // This should never happen, git doesn't support other file types anyhow::bail!("Unsupported file type for path {}", subpath.display()); - } - Ok(()) + }) } /// Check whether a nix file contains path expression references pointing outside the package /// directory -fn check_nix_file<W: io::Write>( - context: &mut PackageContext<W>, +fn check_nix_file( + relative_package_dir: &Path, + absolute_package_dir: &Path, subpath: &Path, -) -> anyhow::Result<()> { - let path = context.absolute_package_dir.join(subpath); +) -> validation::Result<()> { + let path = absolute_package_dir.join(subpath); let parent_dir = path.parent().context(format!( "Could not get parent of path {}", subpath.display() @@ -110,75 +103,73 @@ fn check_nix_file<W: io::Write>( let root = Root::parse(&contents); if let Some(error) = root.errors().first() { - context.error_writer.write(&format!( - "{}: File {} could not be parsed by rnix: {}", - context.relative_package_dir.display(), - subpath.display(), - error, - ))?; - return Ok(()); + return Ok(NixpkgsProblem::CouldNotParseNix { + relative_package_dir: relative_package_dir.to_path_buf(), + subpath: subpath.to_path_buf(), + error: error.clone(), + } + .into()); } let line_index = LineIndex::new(&contents); - for node in root.syntax().descendants() { - // We're only interested in Path expressions - if node.kind() != NODE_PATH { - continue; - } - - let text = node.text().to_string(); - let line = line_index.line(node.text_range().start().into()); - - // Filters out ./foo/${bar}/baz - // TODO: We can just check ./foo - if node.children().count() != 0 { - context.error_writer.write(&format!( - "{}: File {} at line {line} contains the path expression \"{}\", which is not yet supported and may point outside the directory of that package.", - context.relative_package_dir.display(), - subpath.display(), - text - ))?; - continue; - } - - // Filters out search paths like <nixpkgs> - if text.starts_with('<') { - context.error_writer.write(&format!( - "{}: File {} at line {line} contains the nix search path expression \"{}\" which may point outside the directory of that package.", - context.relative_package_dir.display(), - subpath.display(), - text - ))?; - continue; - } - - // Resolves the reference of the Nix path - // turning `../baz` inside `/foo/bar/default.nix` to `/foo/baz` - match parent_dir.join(Path::new(&text)).canonicalize() { - Ok(target) => { - // Then checking if it's still in the package directory - // No need to handle the case of it being inside the directory, since we scan through the - // entire directory recursively anyways - if let Err(_prefix_error) = target.strip_prefix(context.absolute_package_dir) { - context.error_writer.write(&format!( - "{}: File {} at line {line} contains the path expression \"{}\" which may point outside the directory of that package.", - context.relative_package_dir.display(), - subpath.display(), - text, - ))?; + Ok(validation::sequence_(root.syntax().descendants().map( + |node| { + let text = node.text().to_string(); + let line = line_index.line(node.text_range().start().into()); + + if node.kind() != NODE_PATH { + // We're only interested in Path expressions + Success(()) + } else if node.children().count() != 0 { + // Filters out ./foo/${bar}/baz + // TODO: We can just check ./foo + NixpkgsProblem::PathInterpolation { + relative_package_dir: relative_package_dir.to_path_buf(), + subpath: subpath.to_path_buf(), + line, + text, } - } - Err(e) => { - context.error_writer.write(&format!( - "{}: File {} at line {line} contains the path expression \"{}\" which cannot be resolved: {e}.", - context.relative_package_dir.display(), - subpath.display(), + .into() + } else if text.starts_with('<') { + // Filters out search paths like <nixpkgs> + NixpkgsProblem::SearchPath { + relative_package_dir: relative_package_dir.to_path_buf(), + subpath: subpath.to_path_buf(), + line, text, - ))?; + } + .into() + } else { + // Resolves the reference of the Nix path + // turning `../baz` inside `/foo/bar/default.nix` to `/foo/baz` + match parent_dir.join(Path::new(&text)).canonicalize() { + Ok(target) => { + // Then checking if it's still in the package directory + // No need to handle the case of it being inside the directory, since we scan through the + // entire directory recursively anyways + if let Err(_prefix_error) = target.strip_prefix(absolute_package_dir) { + NixpkgsProblem::OutsidePathReference { + relative_package_dir: relative_package_dir.to_path_buf(), + subpath: subpath.to_path_buf(), + line, + text, + } + .into() + } else { + Success(()) + } + } + Err(e) => NixpkgsProblem::UnresolvablePathReference { + relative_package_dir: relative_package_dir.to_path_buf(), + subpath: subpath.to_path_buf(), + line, + text, + io_error: e, + } + .into(), + } } - }; - } - - Ok(()) + }, + ))) } diff --git a/pkgs/test/nixpkgs-check-by-name/src/structure.rs b/pkgs/test/nixpkgs-check-by-name/src/structure.rs index ea80128e487ac..4051ca037c9a3 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/structure.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/structure.rs @@ -1,152 +1,170 @@ +use crate::nixpkgs_problem::NixpkgsProblem; +use crate::references; use crate::utils; -use crate::utils::ErrorWriter; +use crate::utils::{BASE_SUBPATH, PACKAGE_NIX_FILENAME}; +use crate::validation::{self, ResultIteratorExt, Validation::Success}; +use itertools::concat; use lazy_static::lazy_static; use regex::Regex; -use std::collections::HashMap; -use std::io; +use std::fs::DirEntry; use std::path::{Path, PathBuf}; -pub const BASE_SUBPATH: &str = "pkgs/by-name"; -pub const PACKAGE_NIX_FILENAME: &str = "package.nix"; - lazy_static! { static ref SHARD_NAME_REGEX: Regex = Regex::new(r"^[a-z0-9_-]{1,2}$").unwrap(); static ref PACKAGE_NAME_REGEX: Regex = Regex::new(r"^[a-zA-Z0-9_-]+$").unwrap(); } -/// Contains information about the structure of the pkgs/by-name directory of a Nixpkgs -pub struct Nixpkgs { - /// The path to nixpkgs - pub path: PathBuf, - /// The names of all packages declared in pkgs/by-name - pub package_names: Vec<String>, -} - -impl Nixpkgs { - // Some utility functions for the basic structure +// Some utility functions for the basic structure - pub fn shard_for_package(package_name: &str) -> String { - package_name.to_lowercase().chars().take(2).collect() - } - - pub fn relative_dir_for_shard(shard_name: &str) -> PathBuf { - PathBuf::from(format!("{BASE_SUBPATH}/{shard_name}")) - } +pub fn shard_for_package(package_name: &str) -> String { + package_name.to_lowercase().chars().take(2).collect() +} - pub fn relative_dir_for_package(package_name: &str) -> PathBuf { - Nixpkgs::relative_dir_for_shard(&Nixpkgs::shard_for_package(package_name)) - .join(package_name) - } +pub fn relative_dir_for_shard(shard_name: &str) -> PathBuf { + PathBuf::from(format!("{BASE_SUBPATH}/{shard_name}")) +} - pub fn relative_file_for_package(package_name: &str) -> PathBuf { - Nixpkgs::relative_dir_for_package(package_name).join(PACKAGE_NIX_FILENAME) - } +pub fn relative_dir_for_package(package_name: &str) -> PathBuf { + relative_dir_for_shard(&shard_for_package(package_name)).join(package_name) } -impl Nixpkgs { - /// Read the structure of a Nixpkgs directory, displaying errors on the writer. - /// May return early with I/O errors. - pub fn new<W: io::Write>( - path: &Path, - error_writer: &mut ErrorWriter<W>, - ) -> anyhow::Result<Nixpkgs> { - let base_dir = path.join(BASE_SUBPATH); +pub fn relative_file_for_package(package_name: &str) -> PathBuf { + relative_dir_for_package(package_name).join(PACKAGE_NIX_FILENAME) +} - let mut package_names = Vec::new(); +/// Check the structure of Nixpkgs, returning the attribute names that are defined in +/// `pkgs/by-name` +pub fn check_structure(path: &Path) -> validation::Result<Vec<String>> { + let base_dir = path.join(BASE_SUBPATH); - for shard_entry in utils::read_dir_sorted(&base_dir)? { + let shard_results = utils::read_dir_sorted(&base_dir)? + .into_iter() + .map(|shard_entry| -> validation::Result<_> { let shard_path = shard_entry.path(); let shard_name = shard_entry.file_name().to_string_lossy().into_owned(); - let relative_shard_path = Nixpkgs::relative_dir_for_shard(&shard_name); + let relative_shard_path = relative_dir_for_shard(&shard_name); - if shard_name == "README.md" { + Ok(if shard_name == "README.md" { // README.md is allowed to be a file and not checked - continue; - } - - if !shard_path.is_dir() { - error_writer.write(&format!( - "{}: This is a file, but it should be a directory.", - relative_shard_path.display(), - ))?; - // we can't check for any other errors if it's a file, since there's no subdirectories to check - continue; - } - - let shard_name_valid = SHARD_NAME_REGEX.is_match(&shard_name); - if !shard_name_valid { - error_writer.write(&format!( - "{}: Invalid directory name \"{shard_name}\", must be at most 2 ASCII characters consisting of a-z, 0-9, \"-\" or \"_\".", - relative_shard_path.display() - ))?; - } - - let mut unique_package_names = HashMap::new(); - - for package_entry in utils::read_dir_sorted(&shard_path)? { - let package_path = package_entry.path(); - let package_name = package_entry.file_name().to_string_lossy().into_owned(); - let relative_package_dir = - PathBuf::from(format!("{BASE_SUBPATH}/{shard_name}/{package_name}")); - - if !package_path.is_dir() { - error_writer.write(&format!( - "{}: This path is a file, but it should be a directory.", - relative_package_dir.display(), - ))?; - continue; - } - if let Some(duplicate_package_name) = - unique_package_names.insert(package_name.to_lowercase(), package_name.clone()) - { - error_writer.write(&format!( - "{}: Duplicate case-sensitive package directories \"{duplicate_package_name}\" and \"{package_name}\".", - relative_shard_path.display(), - ))?; + Success(vec![]) + } else if !shard_path.is_dir() { + NixpkgsProblem::ShardNonDir { + relative_shard_path: relative_shard_path.clone(), } - - let package_name_valid = PACKAGE_NAME_REGEX.is_match(&package_name); - if !package_name_valid { - error_writer.write(&format!( - "{}: Invalid package directory name \"{package_name}\", must be ASCII characters consisting of a-z, A-Z, 0-9, \"-\" or \"_\".", - relative_package_dir.display(), - ))?; - } - - let correct_relative_package_dir = Nixpkgs::relative_dir_for_package(&package_name); - if relative_package_dir != correct_relative_package_dir { - // Only show this error if we have a valid shard and package name - // Because if one of those is wrong, you should fix that first - if shard_name_valid && package_name_valid { - error_writer.write(&format!( - "{}: Incorrect directory location, should be {} instead.", - relative_package_dir.display(), - correct_relative_package_dir.display(), - ))?; + .into() + // we can't check for any other errors if it's a file, since there's no subdirectories to check + } else { + let shard_name_valid = SHARD_NAME_REGEX.is_match(&shard_name); + let result = if !shard_name_valid { + NixpkgsProblem::InvalidShardName { + relative_shard_path: relative_shard_path.clone(), + shard_name: shard_name.clone(), } - } + .into() + } else { + Success(()) + }; + + let entries = utils::read_dir_sorted(&shard_path)?; + + let duplicate_results = entries + .iter() + .zip(entries.iter().skip(1)) + .filter(|(l, r)| { + l.file_name().to_ascii_lowercase() == r.file_name().to_ascii_lowercase() + }) + .map(|(l, r)| { + NixpkgsProblem::CaseSensitiveDuplicate { + relative_shard_path: relative_shard_path.clone(), + first: l.file_name(), + second: r.file_name(), + } + .into() + }); + + let result = result.and(validation::sequence_(duplicate_results)); + + let package_results = entries + .into_iter() + .map(|package_entry| { + check_package(path, &shard_name, shard_name_valid, package_entry) + }) + .collect_vec()?; + + result.and(validation::sequence(package_results)) + }) + }) + .collect_vec()?; - let package_nix_path = package_path.join(PACKAGE_NIX_FILENAME); - if !package_nix_path.exists() { - error_writer.write(&format!( - "{}: Missing required \"{PACKAGE_NIX_FILENAME}\" file.", - relative_package_dir.display(), - ))?; - } else if package_nix_path.is_dir() { - error_writer.write(&format!( - "{}: \"{PACKAGE_NIX_FILENAME}\" must be a file.", - relative_package_dir.display(), - ))?; - } + // Combine the package names conatained within each shard into a longer list + Ok(validation::sequence(shard_results).map(concat)) +} - package_names.push(package_name.clone()); - } +fn check_package( + path: &Path, + shard_name: &str, + shard_name_valid: bool, + package_entry: DirEntry, +) -> validation::Result<String> { + let package_path = package_entry.path(); + let package_name = package_entry.file_name().to_string_lossy().into_owned(); + let relative_package_dir = PathBuf::from(format!("{BASE_SUBPATH}/{shard_name}/{package_name}")); + + Ok(if !package_path.is_dir() { + NixpkgsProblem::PackageNonDir { + relative_package_dir: relative_package_dir.clone(), } - - Ok(Nixpkgs { - path: path.to_owned(), - package_names, - }) - } + .into() + } else { + let package_name_valid = PACKAGE_NAME_REGEX.is_match(&package_name); + let result = if !package_name_valid { + NixpkgsProblem::InvalidPackageName { + relative_package_dir: relative_package_dir.clone(), + package_name: package_name.clone(), + } + .into() + } else { + Success(()) + }; + + let correct_relative_package_dir = relative_dir_for_package(&package_name); + let result = result.and(if relative_package_dir != correct_relative_package_dir { + // Only show this error if we have a valid shard and package name + // Because if one of those is wrong, you should fix that first + if shard_name_valid && package_name_valid { + NixpkgsProblem::IncorrectShard { + relative_package_dir: relative_package_dir.clone(), + correct_relative_package_dir: correct_relative_package_dir.clone(), + } + .into() + } else { + Success(()) + } + } else { + Success(()) + }); + + let package_nix_path = package_path.join(PACKAGE_NIX_FILENAME); + let result = result.and(if !package_nix_path.exists() { + NixpkgsProblem::PackageNixNonExistent { + relative_package_dir: relative_package_dir.clone(), + } + .into() + } else if package_nix_path.is_dir() { + NixpkgsProblem::PackageNixDir { + relative_package_dir: relative_package_dir.clone(), + } + .into() + } else { + Success(()) + }); + + let result = result.and(references::check_references( + &relative_package_dir, + &path.join(&relative_package_dir), + )?); + + result.map(|_| package_name.clone()) + }) } diff --git a/pkgs/test/nixpkgs-check-by-name/src/utils.rs b/pkgs/test/nixpkgs-check-by-name/src/utils.rs index 325c736eca98b..5cc4a0863ba82 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/utils.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/utils.rs @@ -1,9 +1,11 @@ use anyhow::Context; -use colored::Colorize; use std::fs; use std::io; use std::path::Path; +pub const BASE_SUBPATH: &str = "pkgs/by-name"; +pub const PACKAGE_NIX_FILENAME: &str = "package.nix"; + /// Deterministic file listing so that tests are reproducible pub fn read_dir_sorted(base_dir: &Path) -> anyhow::Result<Vec<fs::DirEntry>> { let listing = base_dir @@ -47,26 +49,3 @@ impl LineIndex { } } } - -/// A small wrapper around a generic io::Write specifically for errors: -/// - Print everything in red to signal it's an error -/// - Keep track of whether anything was printed at all, so that -/// it can be queried whether any errors were encountered at all -pub struct ErrorWriter<W> { - pub writer: W, - pub empty: bool, -} - -impl<W: io::Write> ErrorWriter<W> { - pub fn new(writer: W) -> ErrorWriter<W> { - ErrorWriter { - writer, - empty: true, - } - } - - pub fn write(&mut self, string: &str) -> io::Result<()> { - self.empty = false; - writeln!(self.writer, "{}", string.red()) - } -} diff --git a/pkgs/test/nixpkgs-check-by-name/src/validation.rs b/pkgs/test/nixpkgs-check-by-name/src/validation.rs new file mode 100644 index 0000000000000..e727938515218 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/src/validation.rs @@ -0,0 +1,102 @@ +use crate::nixpkgs_problem::NixpkgsProblem; +use itertools::concat; +use itertools::{ + Either::{Left, Right}, + Itertools, +}; +use Validation::*; + +/// The validation result of a check. +/// Instead of exiting at the first failure, +/// this type can accumulate multiple failures. +/// This can be achieved using the functions `and`, `sequence` and `sequence_` +/// +/// This leans on https://hackage.haskell.org/package/validation +pub enum Validation<A> { + Failure(Vec<NixpkgsProblem>), + Success(A), +} + +impl<A> From<NixpkgsProblem> for Validation<A> { + /// Create a `Validation<A>` from a single check problem + fn from(value: NixpkgsProblem) -> Self { + Failure(vec![value]) + } +} + +/// A type alias representing the result of a check, either: +/// - Err(anyhow::Error): A fatal failure, typically I/O errors. +/// Such failures are not caused by the files in Nixpkgs. +/// This hints at a bug in the code or a problem with the deployment. +/// - Ok(Failure(Vec<NixpkgsProblem>)): A non-fatal validation problem with the Nixpkgs files. +/// Further checks can be run even with this result type. +/// Such problems can be fixed by changing the Nixpkgs files. +/// - Ok(Success(A)): A successful (potentially intermediate) result with an arbitrary value. +/// No fatal errors have occurred and no validation problems have been found with Nixpkgs. +pub type Result<A> = anyhow::Result<Validation<A>>; + +pub trait ResultIteratorExt<A, E>: Sized + Iterator<Item = std::result::Result<A, E>> { + fn collect_vec(self) -> std::result::Result<Vec<A>, E>; +} + +impl<I, A, E> ResultIteratorExt<A, E> for I +where + I: Sized + Iterator<Item = std::result::Result<A, E>>, +{ + /// A convenience version of `collect` specialised to a vector + fn collect_vec(self) -> std::result::Result<Vec<A>, E> { + self.collect() + } +} + +impl<A> Validation<A> { + /// Map a `Validation<A>` to a `Validation<B>` by applying a function to the + /// potentially contained value in case of success. + pub fn map<B>(self, f: impl FnOnce(A) -> B) -> Validation<B> { + match self { + Failure(err) => Failure(err), + Success(value) => Success(f(value)), + } + } +} + +impl Validation<()> { + /// Combine two validations, both of which need to be successful for the return value to be successful. + /// The `NixpkgsProblem`s of both sides are returned concatenated. + pub fn and<A>(self, other: Validation<A>) -> Validation<A> { + match (self, other) { + (Success(_), Success(right_value)) => Success(right_value), + (Failure(errors), Success(_)) => Failure(errors), + (Success(_), Failure(errors)) => Failure(errors), + (Failure(errors_l), Failure(errors_r)) => Failure(concat([errors_l, errors_r])), + } + } +} + +/// Combine many validations into a single one. +/// All given validations need to be successful in order for the returned validation to be successful, +/// in which case the returned validation value contains a `Vec` of each individual value. +/// Otherwise the `NixpkgsProblem`s of all validations are returned concatenated. +pub fn sequence<A>(check_results: impl IntoIterator<Item = Validation<A>>) -> Validation<Vec<A>> { + let (errors, values): (Vec<Vec<NixpkgsProblem>>, Vec<A>) = check_results + .into_iter() + .partition_map(|validation| match validation { + Failure(err) => Left(err), + Success(value) => Right(value), + }); + + // To combine the errors from the results we flatten all the error Vec's into a new Vec + // This is not very efficient, but doesn't matter because generally we should have no errors + let flattened_errors = errors.into_iter().concat(); + + if flattened_errors.is_empty() { + Success(values) + } else { + Failure(flattened_errors) + } +} + +/// Like `sequence`, but without any containing value, for convenience +pub fn sequence_(validations: impl IntoIterator<Item = Validation<()>>) -> Validation<()> { + sequence(validations).map(|_| ()) +} diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index 0fa87cccc2199..3882eb2b625c5 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -142,6 +142,15 @@ in ''; }; + # Check that mkDerivation rejects MD5 hashes + rejectedHashes = lib.recurseIntoAttrs { + md5 = + let drv = runCommand "md5 outputHash rejected" { + outputHash = "md5-fPt7dxVVP7ffY3MxkQdwVw=="; + } "true"; + in assert !(builtins.tryEval drv).success; {}; + }; + test-inputDerivation = let inherit (stdenv.mkDerivation { dep1 = derivation { name = "dep1"; builder = "/bin/sh"; args = [ "-c" ": > $out" ]; system = builtins.currentSystem; }; diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 6c4c89e888875..1421b2a028dae 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -13,11 +13,11 @@ let in buildPythonApplication rec { pname = "arandr"; - version = "0.1.10"; + version = "0.1.11"; src = fetchurl { url = "https://christian.amsuess.com/tools/arandr/files/${pname}-${version}.tar.gz"; - sha256 = "135q0llvm077jil2fr92ssw3p095m4r8jfj0lc5rr3m71n4srj6v"; + hash = "sha256-5Mu+Npi7gSs5V3CHAXS+AJS7rrOREFqBH5X0LrGCrgI="; }; preBuild = '' @@ -31,10 +31,10 @@ buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ xrandr pygobject3 ]; - meta = { + meta = with lib; { homepage = "https://christian.amsuess.com/tools/arandr/"; description = "A simple visual front end for XRandR"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.domenkozar ]; + license = licenses.gpl3; + maintainers = with maintainers; [ gepbird ]; }; } diff --git a/pkgs/tools/admin/ansible/lint.nix b/pkgs/tools/admin/ansible/lint.nix index bbdde0e60f720..fbac95d019ba5 100644 --- a/pkgs/tools/admin/ansible/lint.nix +++ b/pkgs/tools/admin/ansible/lint.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication rec { pname = "ansible-lint"; - version = "6.20.0"; + version = "6.21.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-7BO/LrZUd/Rkq468YiNVKr/mjLP2WD3JEdhGAP0ZGts="; + hash = "sha256-Bf/G38jzy79W9/l3CzQ2/HkJutXB11Rw76BkUx8C324="; }; postPatch = '' diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 4205071c4a32e..87231b2277b5f 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,5 @@ { lib -, stdenv -, python3 -, fetchPypi +, callPackage , fetchFromGitHub , installShellFiles }: @@ -18,9 +16,7 @@ let }; # put packages that needs to be overridden in the py package scope - py = import ./python-packages.nix { - inherit stdenv src version python3 fetchPypi; - }; + py = callPackage ./python-packages.nix { inherit src version; }; in py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index d13dd28230104..fa7d84e511727 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -1,6 +1,7 @@ { stdenv , python3 , fetchPypi +, fetchpatch , src , version }: @@ -28,6 +29,20 @@ let pname = "azure-cli-core"; inherit version src; + patches = [ + (fetchpatch { + name = "fix-python311.patch"; + url = "https://github.com/Azure/azure-cli/commit/a5198b578b17de934e15b1c92e369e45323e9658.patch"; + hash = "sha256-qbyKF6Vvtz8QwY78sG7ptTVcbM2IR+phntOKqsrWetE="; + stripLen = 2; + includes = [ + "azure/cli/core/tests/test_command_registration.py" + "azure/cli/core/tests/test_help.py" + "azure/cli/core/tests/test_parser.py" + ]; + }) + ]; + sourceRoot = "${src.name}/src/azure-cli-core"; propagatedBuildInputs = with self; [ diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index b5b6a1fb32f3f..632da8db0a2bc 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "unstable-2023-08-22"; + version = "unstable-2023-09-03"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "c91c6fac9d725716ca6ecc3002053f941137f24f"; - hash = "sha256-oGcKRx1tP2jeshHhaCHPRKmwKQ3WPYK1tHGGt1/3oDU="; + rev = "c4ea4d299aa1bbbcc972c04adf06c18245ce7674"; + hash = "sha256-Tp3yZb1nteOlz/KhydFdjBrj3OrY20s/Ltfk/EBrIyk="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 9a1edeef22d51..862b68be94efe 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.74.2"; + version = "1.74.3"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Xssc8T4y8ZaFqOukAJkrKPSUBM0uTlGkI3M92XNLalk="; + sha256 = "sha256-upnwaY++tUg4LcuD/BMSvvM2bo/95OP+SUK/aOiq1Oo="; }; vendorHash = null; diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 6ec8819e3bc94..0e4b614891731 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.11.13"; + version = "0.12.6"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-S4XouqqIBalXqfznrJ8F2TxU9h+gqObnjRXEQnj67LQ="; + sha256 = "sha256-WecKgLnfasqNp4G9e24EPjSeA9dqiEhl8KjVQ/KbmKk="; }; - vendorHash = "sha256-Y1F+7bJwsUb09xTSRSdfa6bOPMFCkNBaNurrfB9IPCA="; + vendorHash = "sha256-f9KJyMu4WD96IPTWSuGfQDZvayEbZ+1KeQj/99Ck/I4="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix index 0969acab5e440..6e09092874cc9 100644 --- a/pkgs/tools/admin/oxidized/default.nix +++ b/pkgs/tools/admin/oxidized/default.nix @@ -14,7 +14,7 @@ bundlerApp { description = "A network device configuration backup tool. It's a RANCID replacement!"; homepage = "https://github.com/ytti/oxidized"; license = licenses.asl20; - maintainers = with maintainers; [ nicknovitski netali ]; + maintainers = with maintainers; [ nicknovitski ] ++ teams.wdz.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index beecd6412bcfb..117f02a593bac 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -9,6 +9,7 @@ , yarn , fixup_yarn_lock , nodejs +, fetchpatch , server-mode ? true }: @@ -26,7 +27,61 @@ let # keep the scope, as it is used throughout the derivation and tests # this also makes potential future overrides easier - pythonPackages = python3.pkgs.overrideScope (final: prev: rec { }); + pythonPackages = python3.pkgs.overrideScope (final: prev: rec { + # pgadmin 7.8 is incompatible with Flask >= 2.3 + flask = prev.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.2.5"; + src = oldAttrs.src.override { + pname = "Flask"; + inherit version; + hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; + }; + format = "setuptools"; + }); + # downgrade needed for older Flask + httpbin = prev.httpbin.overridePythonAttrs (oldAttrs: rec { + version = "0.7.0"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo="; + }; + format = "setuptools"; + patches = [ + (fetchpatch { + # Replaces BaseResponse class with Response class for Werkezug 2.1.0 compatibility + # https://github.com/postmanlabs/httpbin/pull/674 + url = "https://github.com/postmanlabs/httpbin/commit/5cc81ce87a3c447a127e4a1a707faf9f3b1c9b6b.patch"; + hash = "sha256-SbEWjiqayMFYrbgAPZtSsXqSyCDUz3z127XgcKOcrkE="; + }) + ]; + pytestFlagsArray = [ + "test_httpbin.py" + ]; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ final.pythonPackages.brotlipy ]; + }); + # downgrade needed for older httpbin + werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.2.3"; + format = "setuptools"; + src = oldAttrs.src.override { + pname = "Werkzeug"; + inherit version; + hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; + }; + }); + # Downgrade needed for older Flask + flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec { + version = "5.1.2"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc="; + }; + postPatch = '' + # This should be removed after updating to version 5.3.0. + sed -i '/filterwarnings =/a ignore:pkg_resources is deprecated:DeprecationWarning' pytest.ini + ''; + }); + }); offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-random.nix b/pkgs/tools/admin/pulumi-packages/pulumi-random.nix index 4248ae73dda7a..af704eac192d8 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-random.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-random.nix @@ -4,10 +4,10 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-random"; - version = "4.8.2"; + version = "4.14.0"; rev = "v${version}"; - hash = "sha256-tFEtBgNpl8090RuVMEkyGmdfpZK8wvOD4iog1JRq+GY="; - vendorHash = "sha256-H3mpKxb1lt+du3KterYPV6WWs1D0XXlmemMyMiZBnqs="; + hash = "sha256-1MR7zWNBDbAUoRed7IU80PQxeH18x95MKJKejW5m2Rs="; + vendorHash = "sha256-YDuF89F9+pxVq4TNe5l3JlbcqpnJwSTPAP4TwWTriWA="; cmdGen = "pulumi-tfgen-random"; cmdRes = "pulumi-resource-random"; extraLdflags = [ diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 3d1fb40f5bcf1..441961703f163 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.73.0"; + version = "0.74.2"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Iu1ZgcjNDIYbgQMzt88vOyYKrKujMY196MV6O//Pg6E="; + hash = "sha256-9cC+T9jIRqD/omUUZrrRLu6FIo/oz8wCx9D76G94saE="; }; - vendorHash = "sha256-QMuaM4u8y90WCbC/V6StPGK9uOm52LVQrLakgm3viP8="; + vendorHash = "sha256-ilEG1relXYEFPR++oq35qcvnIcXkP4HRAjqxYr3U3XM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index d92e1e79b3d7b..38fd3fc1e12fa 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.21.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-VZ3yCgO110t920T0vWP3IwdphlsZrWbJj5nXX70mtJ4="; + sha256 = "sha256-Q65X2lsR5jyWXxxmkvUA0yG4miD+KUSBGRFXvH4KBGY="; }; - vendorHash = "sha256-MVBxtd+MZ6aS/fJn/+/a2jjh1rKjeT5BiHF2mzg95C8="; + vendorHash = "sha256-mZ2XFZS5tqtRUhdo6AOCY4xSaYgxUEy1OFbyzsbCEnU="; ldflags = [ "-w" diff --git a/pkgs/tools/admin/scalr-cli/default.nix b/pkgs/tools/admin/scalr-cli/default.nix index 125d20351464a..3450019afa266 100644 --- a/pkgs/tools/admin/scalr-cli/default.nix +++ b/pkgs/tools/admin/scalr-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "scalr-cli"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; - hash = "sha256-8KhFF/bD//NYRQ7v+ksGAE6bKVu+nE3o3R119XbHVDA="; + hash = "sha256-vuYkUFh9C+D6Sbu/vbEFV57FDVQVSCkvOxdLeDVbe18="; }; - vendorHash = "sha256-xoxSQ9V9i7yxJzn8wAtIAtWlTn4q/UnNqMT93RyBHII="; + vendorHash = "sha256-zyshSluHq5f+DQV4K7qxHNsZ4nKzL8J5A25rdg9fHeM="; ldflags = [ "-s" "-w" diff --git a/pkgs/tools/admin/trinsic-cli/default.nix b/pkgs/tools/admin/trinsic-cli/default.nix index cab4f195dc951..bc9b0568cf5f8 100644 --- a/pkgs/tools/admin/trinsic-cli/default.nix +++ b/pkgs/tools/admin/trinsic-cli/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "trinsic-cli"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz"; - sha256 = "sha256-kWdayQRV/VHgvBhGLc67qTXFz6Ufec6h+1ihrIdkCs4="; + sha256 = "sha256-dKVbiqLhcN8QALOyvTIlgsODWOQv6zRBXrRVB6KxpJg="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index d598d78bde967..6cb9ecc0782d4 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -7,19 +7,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.46.0"; + version = "0.46.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hthVpiiTRrBdEL5QsL8NiOYNRXybCAfAnCn5w3JfNn4="; + hash = "sha256-Jybno45XQYt1Bt9eGIf6p9AgOluW0/M/mRiQLiArhhc="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-2Aig/udgLQzNmVJ0m1C7wfqlNefpexQOrh2HCPBK9Mc="; + vendorHash = "sha256-MIfRq2bj73G4eyHjrJZkVMrlnLYacbHdHTPgWASVXow="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index 440606bdd8364..37faff29c7284 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -26,6 +26,8 @@ , extraPatches ? [ ] , pluginOverrides ? { } , disableAllPlugins ? false +, disabledTests ? [] +, extraNativeBuildInputs ? [] # tests , runCommand @@ -52,12 +54,6 @@ python3Packages.buildPythonApplication { patches = extraPatches; - postPatch = '' - # https://github.com/beetbox/beets/pull/4868 - substituteInPlace beets/util/artresizer.py \ - --replace "Image.ANTIALIAS" "Image.Resampling.LANCZOS" - ''; - propagatedBuildInputs = with python3Packages; [ confuse gst-python @@ -76,7 +72,7 @@ python3Packages.buildPythonApplication { nativeBuildInputs = [ gobject-introspection sphinxHook - ]; + ] ++ extraNativeBuildInputs; buildInputs = [ ] ++ (with gst_all_1; [ @@ -93,24 +89,6 @@ python3Packages.buildPythonApplication { cp extra/_beet $out/share/zsh/site-functions/ ''; - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - - tmphome="$(mktemp -d)" - - EDITOR="${writeScript "beetconfig.sh" '' - #!${runtimeShell} - cat > "$1" <<CFG - plugins: ${lib.concatStringsSep " " (attrNames enabledPlugins)} - CFG - ''}" HOME="$tmphome" "$out/bin/beet" config -e - EDITOR=true HOME="$tmphome" "$out/bin/beet" config -e - - runHook postInstallCheck - ''; - makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" @@ -118,17 +96,17 @@ python3Packages.buildPythonApplication { ]; nativeCheckInputs = with python3Packages; [ - pytest + pytestCheckHook mock rarfile responses ] ++ pluginWrapperBins; disabledTestPaths = lib.flatten (attrValues (lib.mapAttrs (n: v: v.testPaths ++ [ "test/test_${n}.py" ]) disabledPlugins)); + inherit disabledTests; - checkPhase = '' - runHook preCheck - + # Perform extra "sanity checks", before running pytest tests. + preCheck = '' # Check for undefined plugins find beetsplug -mindepth 1 \ \! -path 'beetsplug/__init__.py' -a \ @@ -140,19 +118,13 @@ python3Packages.buildPythonApplication { export BEETS_TEST_SHELL="${bashInteractive}/bin/bash --norc" export HOME="$(mktemp -d)" - args=" -m pytest -r fEs" - eval "disabledTestPaths=($disabledTestPaths)" - for path in ''${disabledTestPaths[@]}; do - if [ -e "$path" ]; then - args+=" --ignore $path" - else - echo "Skipping non-existent test path '$path'" - fi - done - - python $args - - runHook postCheck + env EDITOR="${writeScript "beetconfig.sh" '' + #!${runtimeShell} + cat > "$1" <<CFG + plugins: ${lib.concatStringsSep " " (attrNames enabledPlugins)} + CFG + ''}" "$out/bin/beet" config -e + env EDITOR=true "$out/bin/beet" config -e ''; @@ -160,19 +132,17 @@ python3Packages.buildPythonApplication { passthru.tests.gstreamer = runCommand "beets-gstreamer-test" { meta.timeout = 60; - } - '' - set -euo pipefail - export HOME=$(mktemp -d) - mkdir $out + } '' + set -euo pipefail + export HOME=$(mktemp -d) + mkdir $out - cat << EOF > $out/config.yaml + cat << EOF > $out/config.yaml replaygain: backend: gstreamer EOF - echo $out/config.yaml - ${beets}/bin/beet -c $out/config.yaml > /dev/null + ${beets}/bin/beet -c $out/config.yaml > /dev/null ''; meta = with lib; { diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 7f5c3bbceae9b..c78ccced9a80c 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -2,6 +2,7 @@ , callPackage , fetchFromGitHub , fetchpatch +, python3Packages }: /* ** To customize the enabled beets plugins, use the pluginOverrides input to the @@ -20,6 +21,7 @@ lib.makeExtensible (self: { beets = self.beets-stable; beets-stable = callPackage ./common.nix rec { + inherit python3Packages; version = "1.6.0"; src = fetchFromGitHub { owner = "beetbox"; @@ -41,27 +43,46 @@ lib.makeExtensible (self: { # https://github.com/beetbox/beets/pull/4839 # The upstream patch does not apply on 1.6.0, as the related code has been refactored since ./patches/fix-embedart-imagick-7.1.1-12.patch + # Pillow 10 compatibility fix, a backport of + # https://github.com/beetbox/beets/pull/4868, which doesn't apply now + ./patches/fix-pillow10-compat.patch + ]; + disabledTests = [ + # This issue is present on this version alone, and can be removed on the + # next stable version version bump. Since this is fixed in branch master, + # we don't have a bug ticket open for this. As of writing, it also seems + # hard to find a patch that can be backported to v1.6.0 that would fix + # the failure, as the master branch has gone through too many changes + # now. + "test_get_single_item_by_path" ]; }; beets-minimal = self.beets.override { disableAllPlugins = true; }; beets-unstable = callPackage ./common.nix { - version = "unstable-2023-07-05"; + inherit python3Packages; + version = "unstable-2023-10-26"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "9481402b3c20739ca0b879d19adbfca22ccd6a44"; - hash = "sha256-AKmozMNVchysoQcUWd90Ic6bQBKQgylVn0E3i85dGb8="; + rev = "6655760732100f5387fad2d2890c015ee5039981"; + hash = "sha256-Nz9BHtacYpJMLmB3f9WFg6GvMa+BuUhiNbJ9cyannek="; }; extraPatches = [ # Bash completion fix for Nix ./patches/unstable-bash-completion-always-print.patch ]; pluginOverrides = { - # unstable has a new plugin, so we register it here. + # unstable has new plugins, so we register them here. limit = { builtin = true; }; + substitute = { builtin = true; }; + advancedrewrite = { builtin = true; }; + autobpm = { builtin = true; }; }; + extraNativeBuildInputs = [ + python3Packages.pydata-sphinx-theme + ]; }; alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; }; diff --git a/pkgs/tools/audio/beets/patches/fix-pillow10-compat.patch b/pkgs/tools/audio/beets/patches/fix-pillow10-compat.patch new file mode 100644 index 0000000000000..f85eec20156cc --- /dev/null +++ b/pkgs/tools/audio/beets/patches/fix-pillow10-compat.patch @@ -0,0 +1,13 @@ +diff --git i/beets/util/artresizer.py w/beets/util/artresizer.py +index 8683e228..6f99c79e 100644 +--- i/beets/util/artresizer.py ++++ w/beets/util/artresizer.py +@@ -72,7 +72,7 @@ def pil_resize(maxwidth, path_in, path_out=None, quality=0, max_filesize=0): + try: + im = Image.open(util.syspath(path_in)) + size = maxwidth, maxwidth +- im.thumbnail(size, Image.ANTIALIAS) ++ im.thumbnail(size, Image.Resampling.LANCZOS) + + if quality == 0: + # Use PIL's default quality. diff --git a/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch b/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch index 395f40f92c986..96b175117572b 100644 --- a/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch +++ b/pkgs/tools/audio/beets/patches/unstable-bash-completion-always-print.patch @@ -1,34 +1,36 @@ -diff --git a/beets/ui/commands.py b/beets/ui/commands.py -index 1377ad0c..e178eeae 100755 ---- a/beets/ui/commands.py -+++ b/beets/ui/commands.py -@@ -1831,20 +1831,6 @@ default_commands.append(config_cmd) +diff --git i/beets/ui/commands.py w/beets/ui/commands.py +index ad4f7821..5077191d 100755 +--- i/beets/ui/commands.py ++++ w/beets/ui/commands.py +@@ -2381,22 +2381,6 @@ default_commands.append(config_cmd) def print_completion(*args): for line in completion_script(default_commands + plugins.commands()): - print_(line, end='') + print_(line, end="") - if not any(os.path.isfile(syspath(p)) for p in BASH_COMPLETION_PATHS): -- log.warning('Warning: Unable to find the bash-completion package. ' -- 'Command line completion might not work.') +- log.warning( +- "Warning: Unable to find the bash-completion package. " +- "Command line completion might not work." +- ) - - -BASH_COMPLETION_PATHS = [ -- b'/etc/bash_completion', -- b'/usr/share/bash-completion/bash_completion', -- b'/usr/local/share/bash-completion/bash_completion', +- b"/etc/bash_completion", +- b"/usr/share/bash-completion/bash_completion", +- b"/usr/local/share/bash-completion/bash_completion", - # SmartOS -- b'/opt/local/share/bash-completion/bash_completion', +- b"/opt/local/share/bash-completion/bash_completion", - # Homebrew (before bash-completion2) -- b'/usr/local/etc/bash_completion', +- b"/usr/local/etc/bash_completion", -] def completion_script(commands): -diff --git a/test/test_ui.py b/test/test_ui.py -index f66917dc..f3d934c6 100644 ---- a/test/test_ui.py -+++ b/test/test_ui.py -@@ -1310,12 +1310,7 @@ class CompletionTest(_common.TestCase, TestHelper): - stdout=subprocess.PIPE, env=env) +diff --git i/test/test_ui.py w/test/test_ui.py +index cae86148..faf266a8 100644 +--- i/test/test_ui.py ++++ w/test/test_ui.py +@@ -1434,12 +1434,7 @@ class CompletionTest(_common.TestCase, TestHelper): + ) # Load bash_completion library. - for path in commands.BASH_COMPLETION_PATHS: @@ -36,8 +38,8 @@ index f66917dc..f3d934c6 100644 - bash_completion = path - break - else: -- self.skipTest('bash-completion script not found') -+ self.skipTest('bash-completion script not found') +- self.skipTest("bash-completion script not found") ++ self.skipTest("bash-completion script not found") try: - with open(util.syspath(bash_completion), 'rb') as f: + with open(util.syspath(bash_completion), "rb") as f: tester.stdin.writelines(f) diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 7ea5cf622b57e..c9dc204ad405d 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "unstable-2023-05-02"; + version = "unstable-2023-10-13"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "71f38e62cad01c3078555bfe78d0f3a527422d75"; - sha256 = "sha256-2xm0F80cjovy/G9Ytq/iwa1eexZk0mromv6PPuNIT8U="; + rev = "1b07b595b0bfd261c87f4efecd022481ed4a196f"; + sha256 = "sha256-S4UD/J28McnJjFu5FH3ElwzXapceUUezfBCgI91eIi0="; }; cmakeFlags = [ diff --git a/pkgs/tools/audio/wyoming/faster-whisper.nix b/pkgs/tools/audio/wyoming/faster-whisper.nix index 50ec99f6deee4..4bc0982406229 100644 --- a/pkgs/tools/audio/wyoming/faster-whisper.nix +++ b/pkgs/tools/audio/wyoming/faster-whisper.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchPypi +, fetchpatch }: python3.pkgs.buildPythonApplication rec { @@ -16,6 +17,13 @@ python3.pkgs.buildPythonApplication rec { patches = [ ./faster-whisper-entrypoint.patch + + # fix model retrieval on python3.11+ + (fetchpatch { + url = "https://github.com/rhasspy/rhasspy3/commit/ea55a309e55384e6fd8c9f19534622968f8ed95b.patch"; + hash = "sha256-V9WXKE3+34KGubBS23vELTHjqU2RCTk3sX8GTjmH+AA="; + stripLen = 4; + }) ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 020902c1a0c60..3709040490b05 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ELnop8/f7/4E5FnWwGrPJt3n9YhSG1jei1tAt3zr1KI="; + hash = "sha256-N6mntK1cHkdnIZhU67DOvlwv8XXWx602oD/Pj+NJo9Y="; }; - vendorHash = "sha256-8NTAnkIJkFKyjQL7KBoCqtSBog9Hz1vPBo81u8YcA1A="; + vendorHash = "sha256-eP/T4UzXBLOuK/f3BTz7dGqsSj7r/uTKKQ4H4lCvPC8="; doCheck = false; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 3d3c1b54db823..a64812e96b9c7 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { autoreconfHook ]; - buildInputs = [ neon zlib ]; + buildInputs = [ + zlib + ]; patches = [ ./fix-sysconfdir.patch @@ -36,7 +38,10 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--sysconfdir=/etc" ]; + configureFlags = [ + "--sysconfdir=/etc" + "--with-neon=${lib.getLib neon}" + ]; meta = { homepage = "https://savannah.nongnu.org/projects/davfs2"; diff --git a/pkgs/tools/filesystems/exfatprogs/default.nix b/pkgs/tools/filesystems/exfatprogs/default.nix index 3310589824d02..dafdd2c830a9d 100644 --- a/pkgs/tools/filesystems/exfatprogs/default.nix +++ b/pkgs/tools/filesystems/exfatprogs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exfatprogs"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-xNspLbm7v4nj82Y4gYqWEBU7cVlFBh3rnqhQ8CXEqrw="; + sha256 = "sha256-2j+N/H+Vdy3Q6Ie2gBGkNKtLjt19RDvm9HZMS5l3L5Y="; }; nativeBuildInputs = [ pkg-config autoreconfHook file ]; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 0af1a965fc4e6..b738c30970182 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-fMKFQheFlSwz4ik1tgLheZGkS55LHq3nncOmvgY/TqM="; + hash = "sha256-tc3+OHDjsA2OC9YvuOXZMaysKot8O3+qNoymzF2PnwA="; }; - vendorHash = "sha256-bgZgYbQN6Dg4uHp29tazJ9un9fR1o9mYp8R8ZHtAs9Q="; + vendorHash = "sha256-9pVdoeRyhhxOX3jLZVlx+5eHfP5iu0x40wnpV0xq3Z0="; subPackages = [ "." "tools/mount_gcsfuse" ]; diff --git a/pkgs/tools/filesystems/ssdfs-utils/default.nix b/pkgs/tools/filesystems/ssdfs-utils/default.nix index 467e24724ff1f..7ed8173d38fc8 100644 --- a/pkgs/tools/filesystems/ssdfs-utils/default.nix +++ b/pkgs/tools/filesystems/ssdfs-utils/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.27"; + version = "4.35"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "9b647d73b34dc2e18ed04bfcf5e260ffb8242dd5"; - hash = "sha256-7I7h6Szb/oXtkypd7Nk4AFrTEsn9Y/1/u+IaL63zRVI="; + rev = "fe18072c9b1a670c06d1819205ad12e08312838f"; + hash = "sha256-eVduJa4ewkVDHkxZkj2GO2uNMcMubyGo+4RkhXb9KFA="; }; strictDeps = true; diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/tools/graphics/adriconf/default.nix index e7ae7c28194f7..35de292a36c87 100644 --- a/pkgs/tools/graphics/adriconf/default.nix +++ b/pkgs/tools/graphics/adriconf/default.nix @@ -7,7 +7,7 @@ , libGL , atkmm , pcre -, gtkmm3 +, gtkmm4 , pugixml , mesa , pciutils @@ -15,21 +15,30 @@ stdenv.mkDerivation rec { pname = "adriconf"; - version = "2.5.1"; + version = "2.7.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RhHmrjb5TvJnZ6R0aefqdmwMBpu4iTrxSHru7JAwrgs="; + sha256 = "sha256-GRmra4P30EW9/WrG84HXYC3Rk4RD+BhuWtsSXvY/5Rk="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libdrm libGL atkmm pcre gtkmm3 pugixml mesa pciutils ]; + buildInputs = [ libdrm libGL atkmm pcre gtkmm4 pugixml mesa pciutils ]; cmakeFlags = [ "-DENABLE_UNIT_TESTS=off" ]; + postInstall = '' + install -Dm444 ../flatpak/org.freedesktop.adriconf.metainfo.xml \ + -t $out/share/metainfo/ + install -Dm444 ../flatpak/org.freedesktop.adriconf.desktop \ + -t $out/share/applications/ + install -Dm444 ../flatpak/org.freedesktop.adriconf.png \ + -t $out/share/icons/hicolor/256x256/apps/ + ''; + meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/adriconf/"; description = "A GUI tool used to configure open source graphics drivers"; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 1d40af7cba8bd..271d5a5754f9b 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama , libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText -, libXdmcp, libXau, lib, openssl }: +, libXdmcp, libXau, lib, openssl +, writeScript +}: stdenv.mkDerivation rec { pname = "argyllcms"; - version = "3.0.0"; + version = "3.0.2"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "sha256-nX7YwsbWqaHav22S91ZkfAXXxuFYANhAv5hTO696Dt0="; + hash = "sha256-9+rUhZVwSzAM9Ko6FYyl2OVvsOFBaUCA1PJs9kaLWaE="; }; nativeBuildInputs = [ jam unzip ]; @@ -120,8 +122,22 @@ stdenv.mkDerivation rec { ''; + passthru = { + updateScript = writeScript "update-argyllcms" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of 'Current Version 3.0.1 (19th October 2023)' + new_version="$(curl -s https://www.argyllcms.com/ | + pcregrep -o1 '>Current Version ([0-9.]+) ')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { - homepage = "http://www.argyllcms.com"; + homepage = "https://www.argyllcms.com/"; description = "Color management system (compatible with ICC)"; license = licenses.gpl3; maintainers = []; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 09050275fe47f..b131b4d0fb1e1 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gromit-mpx"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; rev = version; - sha256 = "sha256-nbSyWcccu07FZbvOESFhlnuxgTNgJ+/6ujVQvEyQGGo="; + sha256 = "sha256-I2/9zRKpMkiB0IhnYuOrJHp4nNyG6pfful5D7OqCILQ="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 2bc674b594701..69af8d86b6790 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.4.2"; + version = "11.4.3"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4709"; - sha256 = "HT1cw6y5cOTMrBolfXwhKtMQYBPCPPO+Flv3aWeOK0A="; + rev = "4776"; + sha256 = "h8QjYc4VYJY1fSwCyqn6am/L0tv02ux1lQZfYov1XFA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/tools/graphics/svg2pdf/default.nix index 5952bb615ec63..27ef2edd0fa8a 100644 --- a/pkgs/tools/graphics/svg2pdf/default.nix +++ b/pkgs/tools/graphics/svg2pdf/default.nix @@ -5,15 +5,15 @@ rustPlatform.buildRustPackage rec { pname = "svg2pdf"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "typst"; repo = "svg2pdf"; rev = "v${version}"; - hash = "sha256-iN6/VO6EMP9wMoTn4t0y1Oq9XP9Q3UcRNCWsMzI4Fn8="; + hash = "sha256-Xy1ID2/M3v9/ZEo8fWEDlJ8+cmgAMdHhs27xDfe8IYQ="; }; - cargoHash = "sha256-Xxb8DeTAmw0Pq4mrLVcpEuzq7/SX+AlUSWoA2dcVQJA="; + cargoHash = "sha256-l3671zvqSM4CY7lOXOur0Q6PBDVf6jXnhZ/8kADWQz4="; buildFeatures = [ "cli" ]; meta = with lib; { diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 19d5b1b96933b..cb19026173254 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.22"; + version = "1.4.23"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-wjWDqhhLqj77IxVpelChOEdUtneaGmL+IK2Sp3eObkA="; + sha256 = "sha256-7bmWyk7A+dXu1jjD5j9P/w88PVqPnNSxE1Kgj+Xpvyg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix index dde07fc971770..b9384469e9630 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { pname = "libinput-gestures"; - version = "2.74"; + version = "2.76"; src = fetchFromGitHub { owner = "bulletmark"; repo = "libinput-gestures"; rev = version; - sha256 = "sha256-uBABs2FPvF+HO+VSNvz2F0Bc9Ja8ek1ULiu89/wvTv4="; + sha256 = "sha256-Tb/gQ/2Ul4JzEiLEUPJBj9T6ZAqzMSPdgiofdnDj73Q="; }; patches = [ ./0001-hardcode-name.patch diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index c9a647d000a0a..f74d1a8c803a5 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ earldouglas ]; + maintainers = with maintainers; [ earldouglas paumr ]; }; } diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index fdcdde0c04012..516e35a082ce1 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.222"; + version = "1.223"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-zGd2t2Qtec8Up1SHAizZp8l/fhFpa0Y1UJbB8XanX6Q="; + sha256 = "sha256-T9tj91mLB3PNRmJs75ohGjvBt1C5wotQr++MCdmyWBI="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix index 70e6aa04e6f46..8ac51a4821d46 100644 --- a/pkgs/tools/misc/cf-terraforming/default.nix +++ b/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-9aGN3TP4bMz4V0MRrNFxMm16k9RfvU5iDVwe+Ws4Ask="; + sha256 = "sha256-4thb0AFlSYQ90SkdyTSiFUc6vTRpt6KX2nH/thMuv4o="; }; - vendorHash = "sha256-fswT6t2LP6gRmCHrSHVJGdNc6gic3rMSrE+STe5oiyQ="; + vendorHash = "sha256-bfxF0qlEbZDczEuFhckqsG00/IzuM18ut/AQ9EMwdh0="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 9f75753e89889..88812357a9c08 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.40.0"; + version = "2.40.4"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-0FzhIsCsOVoQpxpxl83Ei8v8ANbanltLi5nvOt0kWsA="; + hash = "sha256-PtIT2PS88jkX/ERHYKRwhvCnCnlAP0lM0FDv74zi32M="; }; - vendorHash = "sha256-941uw/7NoVnW3Ul5bAJLyvQ+RrNoiUVJHpKlfkiGT8c="; + vendorHash = "sha256-O9Ywq8LunS/0yBX9p9M2mzm+auvX1ynYaAY4EoBaE94="; doCheck = false; diff --git a/pkgs/tools/misc/daktilo/default.nix b/pkgs/tools/misc/daktilo/default.nix new file mode 100644 index 0000000000000..b28f3b08f8cd9 --- /dev/null +++ b/pkgs/tools/misc/daktilo/default.nix @@ -0,0 +1,66 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, stdenv +, darwin +, unixtools +, pkg-config +, alsa-lib +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "daktilo"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "daktilo"; + rev = "v${version}"; + hash = "sha256-kbJwBOUODtHdngbfa6HbbQJ0kgW6f64c0EG3y8wLymw="; + }; + + cargoHash = "sha256-u9vL2HAUgP43ZDwIEK2u/I+KUEjQsfXda03gnGJ1Krc="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = [ + alsa-lib + xorg.libX11 + xorg.libXi + xorg.libXtst + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + nativeCheckInputs = [ + unixtools.script + ]; + + postInstall = '' + mkdir -p man completions + + OUT_DIR=man $out/bin/daktilo-mangen + OUT_DIR=completions $out/bin/daktilo-completions + + installManPage man/daktilo.1 + installShellCompletion \ + completions/daktilo.{bash,fish} \ + --zsh completions/_daktilo + + rm $out/bin/daktilo-{completions,mangen} + ''; + + meta = with lib; { + description = "Turn your keyboard into a typewriter"; + homepage = "https://github.com/orhun/daktilo"; + changelog = "https://github.com/orhun/daktilo/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ orhun ]; + mainProgram = "daktilo"; + }; +} diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 0b7f78936ed91..498ad0f095196 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol"; - version = "0.6.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; rev = version; - sha256 = "sha256-0mvkIW0Xsi7co/INmlNeTclBxGoqoJliFanA/RFMaLM="; + sha256 = "sha256-100SITpGbui/gRhFjVZxn6lZRB0najtGHd18oUpByJo="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index ef128ff264d0f..958738478baa2 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.10.3"; + version = "2023.10.4"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rvU2eA9HEZv77cn2K4xEL/hqBk2hauFv7eUHZzR5Q5s="; + hash = "sha256-rDq6uudT1kW97TiE9FswfgzLlNPTo8+YjD7HEvbrMn0="; }; postPatch = '' diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 7caff9523724a..fe1d957437d08 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.2.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9O+2vCi3CagpIU5pZPA8tLVhyC7KHn93trYdNhsT4n4="; + sha256 = "sha256-iF1E9wBX9UVv/zuCgznXqKLBF+Xk0LqVdJfxFNpmzRI="; }; - cargoHash = "sha256-mRIwmZwO/uqfUJ12ZYKZFPoefvo055Tp+DrfKsoP9q4="; + cargoHash = "sha256-xf4Q6nk2sYuAV+B7dsRF+feiLRKLXDSHnlYmw+o5bNc="; nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/fuc/default.nix b/pkgs/tools/misc/fuc/default.nix index 86b52fc094c2f..b52366ab76b22 100644 --- a/pkgs/tools/misc/fuc/default.nix +++ b/pkgs/tools/misc/fuc/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fuc"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "SUPERCILEX"; repo = "fuc"; rev = version; - hash = "sha256-jVJhV9uy49hWmBw8LVmrid/DswbdD/SOtDc1tZgBQnk="; + hash = "sha256-4yksr2gilR7Ec2sRzGsGmOgbRSQJR/5fDofZM4sRxDg="; }; - cargoHash = "sha256-94NdaJfIcTB6o4+iZXvuqm0OlAQrChGZEy2E7/yMxqE="; + cargoHash = "sha256-U/LABtCtpop+MXAceE93FKtf1FfgLuVIYqqXtd0NckQ="; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/tools/misc/goss/default.nix b/pkgs/tools/misc/goss/default.nix index 55fafb1059be2..e0a4369eb4779 100644 --- a/pkgs/tools/misc/goss/default.nix +++ b/pkgs/tools/misc/goss/default.nix @@ -1,8 +1,14 @@ -{ buildGoModule +{ bash +, buildGoModule , fetchFromGitHub +, getent , goss -, nix-update-script , lib +, makeWrapper +, nix-update-script +, nixosTests +, stdenv +, systemd , testers }: @@ -26,17 +32,30 @@ buildGoModule rec { "-s" "-w" "-X main.version=v${version}" ]; + nativeBuildInputs = [ makeWrapper ]; + checkFlags = [ # Prometheus tests are skipped upstream # See https://github.com/goss-org/goss/blob/master/ci/go-test.sh "-skip" "^TestPrometheus" ]; + postInstall = let + runtimeDependencies = [ bash getent ] + ++ lib.optionals stdenv.isLinux [ systemd ]; + in '' + wrapProgram $out/bin/goss \ + --prefix PATH : "${lib.makeBinPath runtimeDependencies}" + ''; + passthru = { - tests.version = testers.testVersion { - command = "goss --version"; - package = goss; - version = "v${version}"; + tests = { + inherit (nixosTests) goss; + version = testers.testVersion { + command = "goss --version"; + package = goss; + version = "v${version}"; + }; }; updateScript = nix-update-script { }; }; @@ -51,7 +70,8 @@ buildGoModule rec { Once the test suite is written they can be executed, waited-on, or served as a health endpoint. ''; license = licenses.asl20; - platforms = platforms.linux ++ platforms.darwin; + mainProgram = "goss"; maintainers = with maintainers; [ hyzual jk anthonyroussel ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/misc/graylog/3.3.nix b/pkgs/tools/misc/graylog/3.3.nix deleted file mode 100644 index fc93b9fc5829a..0000000000000 --- a/pkgs/tools/misc/graylog/3.3.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, lib }: -let - buildGraylog = callPackage ./graylog.nix {}; -in buildGraylog { - version = "3.3.16"; - sha256 = "sha256-P/cnfYKnMSnDD4otEyirKlLaFduyfSO9sao4BY3c3Z4="; - maintainers = [ lib.maintainers.fadenb ]; - license = lib.licenses.gpl3; -} diff --git a/pkgs/tools/misc/graylog/4.0.nix b/pkgs/tools/misc/graylog/4.0.nix deleted file mode 100644 index cae23dd431d7c..0000000000000 --- a/pkgs/tools/misc/graylog/4.0.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, lib, ...}: -let - buildGraylog = callPackage ./graylog.nix {}; -in buildGraylog { - version = "4.0.8"; - sha256 = "sha256-1JlJNJSU1wJiztLhYD87YM/7p3YCBXBKerEo/xfumUg="; - maintainers = [ lib.maintainers.f2k1de ]; - license = lib.licenses.sspl; -} diff --git a/pkgs/tools/misc/graylog/4.3.nix b/pkgs/tools/misc/graylog/4.3.nix deleted file mode 100644 index 1bd2ed3ec70d4..0000000000000 --- a/pkgs/tools/misc/graylog/4.3.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, lib, ...}: -let - buildGraylog = callPackage ./graylog.nix {}; -in buildGraylog { - version = "4.3.9"; - sha256 = "sha256-BMw6U47LQQFFVM34rgadMetpYTtj6R3E+uU0dtTcH64="; - maintainers = [ lib.maintainers.f2k1de ]; - license = lib.licenses.sspl; -} diff --git a/pkgs/tools/misc/gwe/default.nix b/pkgs/tools/misc/gwe/default.nix index 7e68790b2dc9c..4a4b02b537061 100644 --- a/pkgs/tools/misc/gwe/default.nix +++ b/pkgs/tools/misc/gwe/default.nix @@ -31,13 +31,13 @@ let ]); in stdenv.mkDerivation rec { pname = "gwe"; - version = "0.15.5"; + version = "0.15.6"; src = fetchFromGitLab { owner = "leinardi"; repo = pname; rev = version; - sha256 = "sha256-bey/G+muDZsMMU3lVdNS6E/BnAJr29zLPE0MMT4sh1c="; + sha256 = "sha256-xlAz67sThXZ5o2kABb+aQI/7N7jmRpWU/5m24u8TkII="; }; prePatch = '' diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 6918e8fe3ecf0..75e5340c2613b 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses, pkg-config, cmake }: stdenv.mkDerivation rec { - version = "7.0.0"; + version = "7.1.1"; pname = "multitail"; src = fetchFromGitHub { owner = "folkertvanheusden"; repo = pname; rev = version; - sha256 = "sha256-AMW55Bmwn0BsD36qGXI5WmEfydrMBob8NRY3Tyq92vA="; + sha256 = "sha256-qQc7FqpkAri/RE1hJIC4P6n1Jc6TJwBcR0Dp5n5QDQg="; }; nativeBuildInputs = [ pkg-config cmake ]; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = "https://github.com/halturin/multitail"; + homepage = "https://github.com/folkertvanheusden/multitail"; description = "tail on Steroids"; maintainers = with lib.maintainers; [ matthiasbeyer ]; platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; + license = lib.licenses.asl20; }; } diff --git a/pkgs/tools/misc/nbqa/default.nix b/pkgs/tools/misc/nbqa/default.nix index 214ab79abd63a..cc988a02bc060 100644 --- a/pkgs/tools/misc/nbqa/default.nix +++ b/pkgs/tools/misc/nbqa/default.nix @@ -76,6 +76,9 @@ python3.pkgs.buildPythonApplication rec { "test_running_in_different_dir_works" "test_unable_to_reconstruct_message_pythonpath" "test_with_subcommand" + # Broken since ruff was updated to 0.1.2 + # A PR was opened upstream: https://github.com/nbQA-dev/nbQA/issues/834 + "test_ruff_works" ]; disabledTestPaths = [ diff --git a/pkgs/tools/misc/panicparse/default.nix b/pkgs/tools/misc/panicparse/default.nix index 9c87e1fb87c74..2736758343631 100644 --- a/pkgs/tools/misc/panicparse/default.nix +++ b/pkgs/tools/misc/panicparse/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "panicparse"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "maruel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bwvxj9Ifcq2WpicUBK+03fbGuoVAVF2Zmtpy/utUxoo="; + sha256 = "sha256-KjWUubrHPJUJWvoa13EGEwTd5uNC0nrHAF8hzdnxEmY="; }; - vendorHash = "sha256-ZHUxzGqsGX1c4mBA4TBO2+WnGDhwAOGi0uYQx+3OgL8="; + vendorHash = "sha256-udkh/6Bu+7djxugMIuVsZvZ3JN2JooihsmcS2wJT0Wo="; subPackages = [ "." ]; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index b2e6deea725f5..20b6c1aed3665 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "profile-sync-daemon"; - version = "6.48"; + version = "6.50"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-sync-daemon"; rev = "v${version}"; - hash = "sha256-EHzRuE24Bj+lqRiPTCAPEAV4zVMK8iW2cF6OgO1izZw="; + hash = "sha256-Wb9YLxuu9i9s/Y6trz5NZDU9WRywe3138cp5Q2gWbxM="; }; installPhase = '' diff --git a/pkgs/tools/misc/qdl/default.nix b/pkgs/tools/misc/qdl/default.nix index e00b4f352e8f2..5fdf78acefcde 100644 --- a/pkgs/tools/misc/qdl/default.nix +++ b/pkgs/tools/misc/qdl/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, libxml2, systemd }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libxml2 +, systemd +}: stdenv.mkDerivation { pname = "qdl"; - version = "unstable-2021-05-06"; + version = "unstable-2023-04-11"; src = fetchFromGitHub { - owner = "andersson"; - repo = "qdl"; - rev = "2021b303a81ca1bcf21b7f1f23674b5c8747646f"; - sha256 = "0akrdca4jjdkfdya36vy1y5vzimrc4pp5jm24rmlw8hbqxvj72ri"; + owner = "linux-msm"; + repo = "qdl"; + rev = "3b22df2bc7de02d867334af3a7aa8606db4f8cdd"; + sha256 = "sha256-2sL9HX73APTn9nQOx1Efdkz9F4bNASPMVFMx6YOqxyc="; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ systemd libxml2 ]; installPhase = '' @@ -20,10 +27,10 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "https://github.com/andersson/qdl"; + homepage = "https://github.com/linux-msm/qdl"; description = "Tool for flashing images to Qualcomm devices"; - license = licenses.bsd3; + license = licenses.bsd3; maintainers = with maintainers; [ muscaln ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix index 6e70b3b046a8c..6ceaa4508d8fc 100644 --- a/pkgs/tools/misc/rtx/default.nix +++ b/pkgs/tools/misc/rtx/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "2023.10.1"; + version = "2023.10.2"; src = fetchFromGitHub { owner = "jdxcode"; repo = "rtx"; rev = "v${version}"; - hash = "sha256-E0jBTnfp8asLC2V8TtYSCh6fTxqkFwCMZjsjjBKEN0s="; + hash = "sha256-wp5+n8dSnCExxgnCHl0GhcWTu8J6nGBJnjzWmc7XJ3E="; }; - cargoHash = "sha256-n/GxC5wDfhPboynFu8S1f9+kNDVmcKoSHaT96khyi2Q="; + cargoHash = "sha256-Y/AUdg001/ezYHgOEt32go7DiIMLym9GyB88hG4NdKs="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/tools/misc/usbimager/default.nix index a3660d71da4cb..ff4dea4a8c9e4 100644 --- a/pkgs/tools/misc/usbimager/default.nix +++ b/pkgs/tools/misc/usbimager/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "usbimager"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitLab { owner = "bztsrc"; repo = pname; rev = version; - sha256 = "sha256-CEGUXJXqXmD8uT93T9dg49Lf5vTpAzQjdnhYmbR5zTI="; + sha256 = "sha256-HTFopc2xrhp0XYubQtOwMKWTQ+3JSKAyL4mMyQ82kAs="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/tools/misc/viddy/default.nix b/pkgs/tools/misc/viddy/default.nix index 385663f40c856..37aa2acff0361 100644 --- a/pkgs/tools/misc/viddy/default.nix +++ b/pkgs/tools/misc/viddy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "viddy"; - version = "0.3.7"; + version = "0.4.0"; src = fetchFromGitHub { owner = "sachaos"; repo = pname; rev = "v${version}"; - hash = "sha256-82q73L0641d5qNmB+WLkUmDP5OHMoj2SNFc+FhknhwU="; + hash = "sha256-iF5b5e3HPT3GJLRDxz9wN1U5rO9Ey51Cpw4p2zjffTI="; }; - vendorHash = "sha256-FMSgLI1W5keRnSYVyY0XuarMzLWvm9D1ufUYmZttfxk="; + vendorHash = "sha256-/lx2D2FIByRnK/097M4SQKRlmqtPTvbFo1dwbThJ5Fs="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/xdg-ninja/default.nix b/pkgs/tools/misc/xdg-ninja/default.nix index e0c59260a454c..a92a279a141fd 100644 --- a/pkgs/tools/misc/xdg-ninja/default.nix +++ b/pkgs/tools/misc/xdg-ninja/default.nix @@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/b3nj5m1n/xdg-ninja"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ patricksjackson ]; + maintainers = with maintainers; [ arcuru ]; }; } diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index eafba0d4f5274..53401cf4acf3e 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,11 +1,11 @@ -{ lib, fetchFromGitHub, perlPackages, autoreconfHook, iproute2, perl, curl }: +{ lib, fetchFromGitHub, perlPackages, autoreconfHook, perl, curl }: let myPerl = perl.withPackages (ps: [ ps.JSONPP ]); in perlPackages.buildPerlPackage rec { pname = "ddclient"; - version = "3.11.0"; + version = "3.11.1"; outputs = [ "out" ]; @@ -13,7 +13,7 @@ perlPackages.buildPerlPackage rec { owner = "ddclient"; repo = "ddclient"; rev = "v${version}"; - sha256 = "sha256-s/gdTvEY4QIVidqNnN7GYrpCsp4nZ0GEH8Jv+LkSr48="; + sha256 = "sha256-OM+JW3HP0llzyJNqmP5PLZ30TOvC2nA1bWwOspTbZZM="; }; postPatch = '' diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index 1785eae4580cf..fb4adc99fa3c4 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "5.6.3"; + version = "5.6.4"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-yOi2dowde2hTZOWq1Trpf3tAypA6bD6SawP5geqK7Ms="; + hash = "sha256-wE4xzAH31yQ8xrA0dI7f961KNwK84gRSit+XNoW37pc="; }; vendorHash = "sha256-e4mmUneFZCsteSrxfSeeky/pFc0sgNs0eRVnZQuG1ZI="; diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index 820b7f202f14a..eb7400b41890a 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpcui"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ssKVgvMO6+7/FQFxbHVTipDFVXZZ/9Ww/kFTqxTgdLQ="; + sha256 = "sha256-G4lVYwx8fYxuyHI2CzAfBQHQV/G4lf7zBwL8JTpnscA="; }; - vendorHash = "sha256-ui/zaHwZH5zdrcKFXwIrJ3TCLUeONsjSexIHoa6hRH8="; + vendorHash = "sha256-lw8HildV1RFTGLOf6FaitbXPxr4FtVGg7GxdzBVFiTM="; doCheck = false; diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index a99f26effc13b..02ad218cbf17a 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "grpcurl"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcurl"; rev = "v${version}"; - sha256 = "sha256-/GPFUMN6NQAoKOYJ6j9j0GmyEcYtYdOB7B8v2gNpNm8="; + sha256 = "sha256-zN/vleCph919HXZZ9wsXoJBXRT6y7gjyuQxnjRMzq00="; }; subPackages = [ "cmd/grpcurl" ]; - vendorHash = "sha256-8mGlmWuWae/NQ1aR0KVj0XS7rqROCs0PBDUkMAKijYU="; + vendorHash = "sha256-g5G966CuaVILGAgWunHAPrrkLjSv8pBj9R4bcLzyI+A="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 37f698386e240..5170df24b91ce 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C + sed -e 's@"/sbin/ifconfig.*"@"${iproute2}/sbin/ip link set dev $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C ''; diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/tools/networking/hurl/default.nix index d34d00f56b518..231a28f8935a4 100644 --- a/pkgs/tools/networking/hurl/default.nix +++ b/pkgs/tools/networking/hurl/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - hash = "sha256-ubzcCY3ccjt2VSZNx9+l3M/z4o7wWcE7USAlA9BnQY0="; + hash = "sha256-JsgAdLjDQQkLyLFoZCVG2jZ8vQDaGUPtPmHYAcwADQg"; }; - cargoHash = "sha256-C8WeYFaqF748QZkp/CppqJjF3QW1k7OWXycxSoxKPOI="; + cargoHash = "sha256-IE9c57rj8EANyj4KmbyagafJyMovzHOhp0PFCQBzqdA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/networking/iperf3d/default.nix b/pkgs/tools/networking/iperf3d/default.nix index f92299adf2e07..1edcaf86ed2ea 100644 --- a/pkgs/tools/networking/iperf3d/default.nix +++ b/pkgs/tools/networking/iperf3d/default.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { description = "A iperf3 client and server wrapper for dynamic server ports"; homepage = "https://github.com/wobcom/iperf3d"; license = licenses.mit; - maintainers = [ maintainers.netali ]; + maintainers = with maintainers; [ netali ] ++ teams.wdz.members; }; } diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 80b199b922c0d..994649404530c 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "miniupnpc"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz"; - sha256 = "0jrc84lkc7xb53rb8dbswxrxj21ndj1iiclmk3r9wkp6xm55w6j8"; + sha256 = "sha256-OKzV9GAvfPi83B7DCy1Y2y6ZEuXZ9TUN2ZsGv9/7UXw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index d3607a63210bd..33fe31b91d6e6 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -9,6 +9,7 @@ , libxslt , testers , offlineimap +, fetchpatch }: python3.pkgs.buildPythonApplication rec { @@ -22,6 +23,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0y3giaz9i8vvczlxkbwymfkn3vi9fv599dy4pc2pn2afxsl4mg2w"; }; + patches = [ + (fetchpatch { + name = "sqlite-version-aware-threadsafety-check.patch"; + url = "https://github.com/OfflineIMAP/offlineimap3/pull/139/commits/7cd32cf834b34a3d4675b29bebcd32dc1e5ef128.patch"; + hash = "sha256-xNq4jFHMf9XZaa9BFF1lOzZrEGa5BEU8Dr+gMOBkJE4="; + }) + ]; + nativeBuildInputs = [ asciidoc docbook_xsl diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index 16287b4177460..baf0ba802c0f2 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.18.1"; + version = "3.19.0"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-abCglaMFW6zPc53IU8Bgl/SaoIh1N9i3xDcfOnJypls="; + hash = "sha256-W3C4KbZnOdljofnlYZk/F6E77/AXjdNTRoWrtoEVfqg="; }; - vendorHash = "sha256-olirtvnOIKvNXJsanv5UFTcpj7RpPAa5OP0qYTv4wtk="; + vendorHash = "sha256-wEhh0nMdFH9wLfNSxYvbkbtu69cNEmVpQDk57/gdnw8="; subPackages = [ "cmd/ooniprobe" ]; diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 7d01deb36020c..bf645edec391c 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -18,11 +18,13 @@ , zlib , openssl , libedit +, ldns , pkg-config , pam , libredirect , etcDir ? null , withKerberos ? true +, withLdns ? true , libkrb5 , libfido2 , hostname @@ -64,6 +66,7 @@ stdenv.mkDerivation { buildInputs = [ zlib openssl libedit ] ++ lib.optional withFIDO libfido2 ++ lib.optional withKerberos libkrb5 + ++ lib.optional withLdns ldns ++ lib.optional withPAM pam; preConfigure = '' @@ -87,6 +90,7 @@ stdenv.mkDerivation { ++ lib.optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") ++ lib.optional stdenv.isDarwin "--disable-libutil" ++ lib.optional (!linkOpenssl) "--without-openssl" + ++ lib.optional withLdns "--with-ldns" ++ extraConfigureFlags; ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null}= [ "-laudit" ] ++ lib.optionals withKerberos [ "-lkeyutils" ]; diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/tools/networking/q/default.nix index bbcaf765d0fd7..40d61afd65d8f 100644 --- a/pkgs/tools/networking/q/default.nix +++ b/pkgs/tools/networking/q/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "q"; - version = "0.12.0"; + version = "0.13.5"; src = fetchFromGitHub { owner = "natesales"; repo = "q"; rev = "v${version}"; - sha256 = "sha256-Z62xxmbzouuP0ol0sJxlh3bQr/sysFSqo7Y5b26IJ1g="; + sha256 = "sha256-3T72841HoZTjyzebSL7oWWwbvxBMKSX98usCrkZ4QuI="; }; - vendorHash = "sha256-uWPvUz8H9e/deZ3JmpRBNEG6UXAQa1068fZwQoeiKkc="; + vendorHash = "sha256-VjwlNCmq5yAYlQRg+rKsN6EPDeb0FcnK5Y4MzBNO0Kg="; doCheck = false; # tries to resolve DNS diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/tools/networking/speedtest-go/default.nix index 0d2be501fd143..2a74445ec270d 100644 --- a/pkgs/tools/networking/speedtest-go/default.nix +++ b/pkgs/tools/networking/speedtest-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "speedtest-go"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aVvowxwP9Mr1hmcgwizXPfy5527iR7cjsNaND/nmXUw="; + hash = "sha256-7wUgmIScrj47QigIKHLMcvaJ/LTRHcMnJGKPBUTzVYo="; }; vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 958c784c74a68..af9fec255370b 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stunnel"; - version = "5.70"; + version = "5.71"; outputs = [ "out" "doc" "man" ]; src = fetchurl { url = "https://www.stunnel.org/archive/${lib.versions.major finalAttrs.version}.x/stunnel-${finalAttrs.version}.tar.gz"; - hash = "sha256-e7x7npqYjXYwEyXbTBEOw2Cpj/uKIhx6zL/5wKi64vM="; + hash = "sha256-8COq6DfC0y3rkggxpe4QgeEceKXVc0D45vCCnwMQF/U="; # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix index 545f21a796a26..b89ffdd2862c3 100644 --- a/pkgs/tools/networking/swagger-codegen/default.nix +++ b/pkgs/tools/networking/swagger-codegen/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "2.4.31"; + version = "2.4.34"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-WEjvyHHKR2w0P0LuDdCtW9GbOLZnCa7oXzLAad9KWN8="; + sha256 = "sha256-OgaKWX9nUqhpgpdMlTiNk0AyBb2glnlYX5Ua03hDWBQ="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index cb0132a64ad2f..34f1fd4833510 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-gdDV5Cd/DjEqSiOF7j5a8QLtdJiFeNCnHoA4XD+yiGA="; + hash = "sha256-fMAPlPn53GkYKpraRS58XTF//IMZtzssaQpBkirEWfw="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-uq0v14cRGmstJabrERsa+vFRX6Bg8+5CU6iV8swrL/I="; + vendorHash = "sha256-un3faML5u9kmlsJw/hitoRcGYtVukF+V/dJMFyGhr8Q="; ldflags = [ "-s" "-w" "-buildid=" ]; diff --git a/pkgs/tools/networking/v2raya/default.nix b/pkgs/tools/networking/v2raya/default.nix index a2d539326e3cb..c861fd68c8bd4 100644 --- a/pkgs/tools/networking/v2raya/default.nix +++ b/pkgs/tools/networking/v2raya/default.nix @@ -11,13 +11,13 @@ }: let pname = "v2raya"; - version = "2.0.5"; + version = "2.2.4"; src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; rev = "v${version}"; - hash = "sha256-oMH4FutgI5mLz2sxDdPFUyDd80xT32r51HEQYhhnvcU="; + hash = "sha256-X2fCp9uVdt7fIW1C/tdRK1Tmr8mq6VBk6UBnt99E+1c="; postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; }; guiSrc = "${src}/gui"; @@ -30,17 +30,20 @@ let offlineCache = fetchYarnDeps { yarnLock = "${guiSrc}/yarn.lock"; - sha256 = "sha256-hVtETKhG9kX/4a4uO/aQ9sN2eTF6aAYaKDSHJIa0eWQ="; + sha256 = "sha256-pB0B5Iy6dLfU5CL2E9OBQGJKLJqYQRwPxx9aaCDg1Qk="; }; buildPhase = '' - export NODE_OPTIONS=--openssl-legacy-provider + runHook preBuild OUTPUT_DIR=$out yarn --offline build + runHook postBuild ''; configurePhase = '' + runHook preConfigure cp -r $node_modules node_modules chmod +w node_modules + runHook postConfigure ''; distPhase = "true"; @@ -59,7 +62,7 @@ buildGoModule { inherit pname version; src = "${src}/service"; - vendorHash = "sha256-nI+nqftJybAGcHCTMVjYPuLHxqE/kyjUzkspnkzUi+g="; + vendorHash = "sha256-lK6oTI9o8oLXPPMFO/Q97tIsdRd9smUk1v7GwwCFitg="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/v2raya/package.json b/pkgs/tools/networking/v2raya/package.json index 55c1c4705660f..3886aaa1616cc 100644 --- a/pkgs/tools/networking/v2raya/package.json +++ b/pkgs/tools/networking/v2raya/package.json @@ -8,6 +8,9 @@ "build": "vue-cli-service build", "lint": "vue-cli-service lint" }, + "resolutions": { + "@achrinza/node-ipc": "^10.1.9" + }, "dependencies": { "@mdi/font": "^5.8.55", "@nuintun/qrcode": "^3.3.0", diff --git a/pkgs/tools/networking/wireproxy/default.nix b/pkgs/tools/networking/wireproxy/default.nix index 2c88f40825d96..7a12e477c0505 100644 --- a/pkgs/tools/networking/wireproxy/default.nix +++ b/pkgs/tools/networking/wireproxy/default.nix @@ -1,9 +1,11 @@ { lib -, buildGoModule +, buildGo120Module , fetchFromGitHub +, testers +, wireproxy }: -buildGoModule rec { +buildGo120Module rec { pname = "wireproxy"; version = "1.0.6"; @@ -22,6 +24,12 @@ buildGoModule rec { vendorHash = "sha256-LBLEb2oVi5ILNtoOtmJZ7NC7hMvLZcexYAxwmb4iUBo="; + passthru.tests.version = testers.testVersion { + package = wireproxy; + command = "wireproxy --version"; + version = src.rev; + }; + meta = with lib; { description = "Wireguard client that exposes itself as a socks5 proxy"; homepage = "https://github.com/octeep/wireproxy"; diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index 3d6119f51ccab..7f0160c2081c1 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -14,6 +14,7 @@ , libsmartcols , libsolv , libxml2 +, pcre2 , rpm , sdbus-cpp , sqlite @@ -24,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.4"; + version = "5.1.6"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-zQK7RRn2C/6Avu5oPqSW7KVv6JT3s2hrcgBRkP6055U="; + hash = "sha256-yIv29mwCBk2H1HjJr2IYm/1eZU379jTNEuTuaoIu4TA="; }; nativeBuildInputs = [ cmake createrepo_c gettext help2man pkg-config ]; @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { libsmartcols libsolv libxml2 + pcre2.dev rpm sdbus-cpp sqlite @@ -61,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_TESTS=OFF" # TODO: fix man installation paths "-DWITH_MAN=OFF" + "-DWITH_PLUGIN_RHSM=OFF" # Red Hat Subscription Manager plugin # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly # (setting it to an absolute path causes include files to go to $out/$out/include, # because the absolute path is interpreted with root at $out). @@ -83,8 +86,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Next-generation RPM package management system"; homepage = "https://github.com/rpm-software-management/dnf5"; + changelog = "https://github.com/rpm-software-management/dnf5/releases/tag/${version}"; license = licenses.gpl2Plus; maintainers = with lib.maintainers; [ malt3 ]; + mainProgram = "dnf5"; platforms = platforms.linux ++ platforms.darwin; }; }) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 2f775a35627b6..9d04dd026404a 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.33.1"; + version = "2.34.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-5CNN0aKy9FnoqRwhbNVTUs04q+hkzoAWlDuDKMeT+1s="; + hash = "sha256-O7qxJ2TE62XDYljqvNsO3ssD/YhfOLfy9zF0W++T0Hw="; }; - vendorHash = "sha256-P96qMc9KHDMreuPI3xY/yI/+8qp/znQM/O2B6t6iFug="; + vendorHash = "sha256-qihPtpygHoIfGf2wj+klDWwL4sTHqDxi1jxjv57vUx4="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix deleted file mode 100644 index 4be57480afd33..0000000000000 --- a/pkgs/tools/package-management/nixops/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib, python2, poetry2nix, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? [] -, fetchurl, fetchpatch -}: - -let - inherit (poetry2nix.mkPoetryPackages { - projectDir = ./python-env; - python = python2; - overrides = [ - poetry2nix.defaultPoetryOverrides - (self: super: { - certifi = super.certifi.overridePythonAttrs (old: { - meta = old.meta // { - knownVulnerabilities = [ "CVE-2022-23491" ]; - }; - }); - pyjwt = super.pyjwt.overridePythonAttrs (old: { - meta = old.meta // { - knownVulnerabilities = lib.optionals (lib.versionOlder old.version "2.4.0") [ - "CVE-2022-29217" - ]; - }; - }); - }) - ]; - }) python; - pythonPackages = python.pkgs; - -in pythonPackages.buildPythonApplication rec { - pname = "nixops"; - version = "1.7"; - - src = fetchurl { - url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/NixOS/nixops/commit/fb6d4665e8efd858a215bbaaf079ec3f5ebc49b8.patch"; - sha256 = "1hbhykl811zsqlaj3y5m9d8lfsal6ps6n5p16ah6lqy2s18ap9d0"; - }) - ./optional-virtd.patch - ]; - - buildInputs = [ pythonPackages.libxslt ]; - - pythonPath = (with pythonPackages; - [ prettytable - boto - boto3 - hetzner - apache-libcloud - adal - # Go back to sqlite once Python 2.7.13 is released - pysqlite - datadog - python-digitalocean - ] - ++ lib.optional (!libvirt.passthru.libvirt.meta.insecure or true) libvirt - ++ nixopsAzurePackages); - - checkPhase = - # Ensure, that there are no (python) import errors - '' - SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt \ - HOME=$(pwd) \ - $out/bin/nixops --version - ''; - - postInstall = '' - make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \ - docdir=$out/share/doc/nixops mandir=$out/share/man - - mkdir -p $out/share/nix/nixops - cp -av "nix/"* $out/share/nix/nixops - - # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL - # the version of openssh is causing errors when have big networks (40+) - wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" - ''; - - meta = { - homepage = "https://github.com/NixOS/nixops"; - description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ aminechikhaoui eelco rob ]; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl3; - }; -} diff --git a/pkgs/tools/package-management/nixops/optional-virtd.patch b/pkgs/tools/package-management/nixops/optional-virtd.patch deleted file mode 100644 index 3697fdde8f263..0000000000000 --- a/pkgs/tools/package-management/nixops/optional-virtd.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/nixops/backends/libvirtd.py b/nixops/backends/libvirtd.py -index bc5f4af7..edd1348b 100644 ---- a/nixops/backends/libvirtd.py -+++ b/nixops/backends/libvirtd.py -@@ -8,12 +8,18 @@ import shutil - import string - import subprocess - import time --import libvirt - - from nixops.backends import MachineDefinition, MachineState - import nixops.known_hosts - import nixops.util - -+try: -+ import libvirt -+except: -+ class libvirt(object): -+ def __getattribute__(self, name): -+ raise ValueError("The libvirt backend has been disabled because of security issues.") -+ - # to prevent libvirt errors from appearing on screen, see - # https://www.redhat.com/archives/libvirt-users/2017-August/msg00011.html - diff --git a/pkgs/tools/package-management/nixops/python-env/poetry.lock b/pkgs/tools/package-management/nixops/python-env/poetry.lock deleted file mode 100644 index 7cc195c95f57e..0000000000000 --- a/pkgs/tools/package-management/nixops/python-env/poetry.lock +++ /dev/null @@ -1,644 +0,0 @@ -[[package]] -name = "adal" -version = "1.2.7" -description = "Note: This library is already replaced by MSAL Python, available here: https://pypi.org/project/msal/ .ADAL Python remains available here as a legacy. The ADAL for Python library makes it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -cryptography = ">=1.1.0" -PyJWT = ">=1.0.0,<3" -python-dateutil = ">=2.1.0,<3" -requests = ">=2.0.0,<3" - -[[package]] -name = "apache-libcloud" -version = "2.8.3" -description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see http://libcloud.apache.org" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4" - -[package.dependencies] -"backports.ssl-match-hostname" = {version = "*", markers = "python_version < \"2.7.9\""} -enum34 = {version = "*", markers = "python_version < \"3.4.0\""} -requests = ">=2.5.0" -typing = {version = "*", markers = "python_version < \"3.4.0\""} - -[[package]] -name = "backports.functools-lru-cache" -version = "1.6.4" -description = "Backport of functools.lru_cache" -category = "main" -optional = false -python-versions = ">=2.6" - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-black (>=0.3.7)", "pytest-mypy", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "pytest-checkdocs (>=2.4)"] - -[[package]] -name = "backports.ssl-match-hostname" -version = "3.7.0.1" -description = "The ssl.match_hostname() function from Python 3.5" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "boto" -version = "2.49.0" -description = "Amazon Web Services Library" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "boto3" -version = "1.17.112" -description = "The AWS SDK for Python" -category = "main" -optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" - -[package.dependencies] -botocore = ">=1.20.112,<1.21.0" -jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" - -[[package]] -name = "botocore" -version = "1.20.112" -description = "Low-level, data-driven core of boto 3." -category = "main" -optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" - -[package.dependencies] -jmespath = ">=0.7.1,<1.0.0" -python-dateutil = ">=2.1,<3.0.0" -urllib3 = ">=1.25.4,<1.27" - -[package.extras] -crt = ["awscrt (==0.11.24)"] - -[[package]] -name = "certifi" -version = "2021.10.8" -description = "Python package for providing Mozilla's CA Bundle." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "cffi" -version = "1.15.0" -description = "Foreign Function Interface for Python calling C code." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -pycparser = "*" - -[[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "configparser" -version = "4.0.2" -description = "Updated configparser from Python 3.7 for Python 2.6+." -category = "main" -optional = false -python-versions = ">=2.6" - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"] - -[[package]] -name = "contextlib2" -version = "0.6.0.post1" -description = "Backports and enhancements for the contextlib module" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "cryptography" -version = "3.3.2" -description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -category = "main" -optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*" - -[package.dependencies] -cffi = ">=1.12" -enum34 = {version = "*", markers = "python_version < \"3\""} -ipaddress = {version = "*", markers = "python_version < \"3\""} -six = ">=1.4.1" - -[package.extras] -docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] -docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] -pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] -ssh = ["bcrypt (>=3.1.5)"] -test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] - -[[package]] -name = "datadog" -version = "0.42.0" -description = "The Datadog Python library" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -configparser = {version = "<5", markers = "python_version < \"3.0\""} -requests = ">=2.6.0" -typing = {version = "*", markers = "python_version < \"3.5\""} - -[[package]] -name = "enum34" -version = "1.1.10" -description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "futures" -version = "3.3.0" -description = "Backport of the concurrent.futures package from Python 3" -category = "main" -optional = false -python-versions = ">=2.6, <3" - -[[package]] -name = "hetzner" -version = "0.8.3" -description = "High level access to the Hetzner robot" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "idna" -version = "2.10" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "importlib-metadata" -version = "2.1.2" -description = "Read metadata from Python packages" -category = "main" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" - -[package.dependencies] -configparser = {version = ">=3.5", markers = "python_version < \"3\""} -contextlib2 = {version = "*", markers = "python_version < \"3\""} -pathlib2 = {version = "*", markers = "python_version < \"3\""} -zipp = ">=0.5" - -[package.extras] -docs = ["sphinx", "rst.linker"] -testing = ["packaging", "pep517", "unittest2", "importlib-resources (>=1.3)"] - -[[package]] -name = "ipaddress" -version = "1.0.23" -description = "IPv4/IPv6 manipulation library" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "jmespath" -version = "0.10.0" -description = "JSON Matching Expressions" -category = "main" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" - -[[package]] -name = "jsonpickle" -version = "2.0.0" -description = "Python library for serializing any arbitrary object graph into JSON" -category = "main" -optional = false -python-versions = ">=2.7" - -[package.dependencies] -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["coverage (<5)", "pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "sklearn", "sqlalchemy", "enum34", "jsonlib"] -"testing.libs" = ["demjson", "simplejson", "ujson", "yajl"] - -[[package]] -name = "pathlib2" -version = "2.3.6" -description = "Object-oriented filesystem paths" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -scandir = {version = "*", markers = "python_version < \"3.5\""} -six = "*" - -[[package]] -name = "prettytable" -version = "1.0.1" -description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[package.dependencies] -wcwidth = "*" - -[package.extras] -tests = ["pytest", "pytest-cov"] - -[[package]] -name = "pycparser" -version = "2.21" -description = "C parser in Python" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "pyjwt" -version = "1.7.1" -description = "JSON Web Token implementation in Python" -category = "main" -optional = false -python-versions = "*" - -[package.extras] -crypto = ["cryptography (>=1.4)"] -flake8 = ["flake8", "flake8-import-order", "pep8-naming"] -test = ["pytest (>=4.0.1,<5.0.0)", "pytest-cov (>=2.6.0,<3.0.0)", "pytest-runner (>=4.2,<5.0.0)"] - -[[package]] -name = "pysqlite" -version = "2.8.3" -description = "DB-API 2.0 interface for SQLite 3.x" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "python-dateutil" -version = "2.8.2" -description = "Extensions to the standard Python datetime module" -category = "main" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" - -[package.dependencies] -six = ">=1.5" - -[[package]] -name = "python-digitalocean" -version = "1.17.0" -description = "digitalocean.com API to manage Droplets and Images" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -jsonpickle = "*" -requests = "*" - -[[package]] -name = "requests" -version = "2.27.1" -description = "Python HTTP for Humans." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" - -[package.dependencies] -certifi = ">=2017.4.17" -chardet = {version = ">=3.0.2,<5", markers = "python_version < \"3\""} -idna = {version = ">=2.5,<3", markers = "python_version < \"3\""} -urllib3 = ">=1.21.1,<1.27" - -[package.extras] -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] -use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] - -[[package]] -name = "s3transfer" -version = "0.4.2" -description = "An Amazon S3 Transfer Manager" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -botocore = ">=1.12.36,<2.0a.0" -futures = {version = ">=2.2.0,<4.0.0", markers = "python_version == \"2.7\""} - -[package.extras] -crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"] - -[[package]] -name = "scandir" -version = "1.10.0" -description = "scandir, a better directory iterator and faster os.walk()" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" - -[[package]] -name = "typing" -version = "3.10.0.0" -description = "Type Hints for Python" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <3.5" - -[[package]] -name = "urllib3" -version = "1.26.8" -description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" - -[package.extras] -brotli = ["brotlipy (>=0.6.0)"] -secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] - -[[package]] -name = "wcwidth" -version = "0.2.5" -description = "Measures the displayed width of unicode strings in a terminal" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -"backports.functools-lru-cache" = {version = ">=1.2.1", markers = "python_version < \"3.2\""} - -[[package]] -name = "zipp" -version = "1.2.0" -description = "Backport of pathlib-compatible object wrapper for zip files" -category = "main" -optional = false -python-versions = ">=2.7" - -[package.dependencies] -contextlib2 = {version = "*", markers = "python_version < \"3.4\""} - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"] - -[metadata] -lock-version = "1.1" -python-versions = "^2.7" -content-hash = "4d572971089aafa023518c48b1048ea91ffb2d35c9737d0f43bf1b0395ae2769" - -[metadata.files] -adal = [ - {file = "adal-1.2.7-py2.py3-none-any.whl", hash = "sha256:2a7451ed7441ddbc57703042204a3e30ef747478eea022c70f789fc7f084bc3d"}, - {file = "adal-1.2.7.tar.gz", hash = "sha256:d74f45b81317454d96e982fd1c50e6fb5c99ac2223728aea8764433a39f566f1"}, -] -apache-libcloud = [ - {file = "apache-libcloud-2.8.3.tar.gz", hash = "sha256:70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6"}, - {file = "apache_libcloud-2.8.3-py2.py3-none-any.whl", hash = "sha256:a3414c1ecc9bb9643fd11af18018b23922f4a2585babf9a4450c3531994935f2"}, -] -"backports.functools-lru-cache" = [ - {file = "backports.functools_lru_cache-1.6.4-py2.py3-none-any.whl", hash = "sha256:dbead04b9daa817909ec64e8d2855fb78feafe0b901d4568758e3a60559d8978"}, - {file = "backports.functools_lru_cache-1.6.4.tar.gz", hash = "sha256:d5ed2169378b67d3c545e5600d363a923b09c456dab1593914935a68ad478271"}, -] -"backports.ssl-match-hostname" = [ - {file = "backports.ssl_match_hostname-3.7.0.1.tar.gz", hash = "sha256:bb82e60f9fbf4c080eabd957c39f0641f0fc247d9a16e31e26d594d8f42b9fd2"}, -] -boto = [ - {file = "boto-2.49.0-py2.py3-none-any.whl", hash = "sha256:147758d41ae7240dc989f0039f27da8ca0d53734be0eb869ef16e3adcfa462e8"}, - {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, -] -boto3 = [ - {file = "boto3-1.17.112-py2.py3-none-any.whl", hash = "sha256:8716465313c50ad9e5c2ac1767642ca0ddf7d1729c3d5c884d82880c1a15a310"}, - {file = "boto3-1.17.112.tar.gz", hash = "sha256:08b6dacbe7ebe57ae8acfb7106b2728d946ae1e0c3da270caee1deb79ccbd8af"}, -] -botocore = [ - {file = "botocore-1.20.112-py2.py3-none-any.whl", hash = "sha256:6d51de0981a3ef19da9e6a3c73b5ab427e3c0c8b92200ebd38d087299683dd2b"}, - {file = "botocore-1.20.112.tar.gz", hash = "sha256:d0b9b70b6eb5b65bb7162da2aaf04b6b086b15cc7ea322ddc3ef2f5e07944dcf"}, -] -certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, -] -cffi = [ - {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"}, - {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"}, - {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"}, - {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"}, - {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"}, - {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"}, - {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"}, - {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"}, - {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"}, - {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"}, - {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"}, - {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"}, - {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"}, - {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"}, - {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"}, - {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"}, - {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, -] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, -] -configparser = [ - {file = "configparser-4.0.2-py2.py3-none-any.whl", hash = "sha256:254c1d9c79f60c45dfde850850883d5aaa7f19a23f13561243a050d5a7c3fe4c"}, - {file = "configparser-4.0.2.tar.gz", hash = "sha256:c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df"}, -] -contextlib2 = [ - {file = "contextlib2-0.6.0.post1-py2.py3-none-any.whl", hash = "sha256:3355078a159fbb44ee60ea80abd0d87b80b78c248643b49aa6d94673b413609b"}, - {file = "contextlib2-0.6.0.post1.tar.gz", hash = "sha256:01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"}, -] -cryptography = [ - {file = "cryptography-3.3.2-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:541dd758ad49b45920dda3b5b48c968f8b2533d8981bcdb43002798d8f7a89ed"}, - {file = "cryptography-3.3.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:49570438e60f19243e7e0d504527dd5fe9b4b967b5a1ff21cc12b57602dd85d3"}, - {file = "cryptography-3.3.2-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a9a4ac9648d39ce71c2f63fe7dc6db144b9fa567ddfc48b9fde1b54483d26042"}, - {file = "cryptography-3.3.2-cp27-cp27m-win32.whl", hash = "sha256:aa4969f24d536ae2268c902b2c3d62ab464b5a66bcb247630d208a79a8098e9b"}, - {file = "cryptography-3.3.2-cp27-cp27m-win_amd64.whl", hash = "sha256:1bd0ccb0a1ed775cd7e2144fe46df9dc03eefd722bbcf587b3e0616ea4a81eff"}, - {file = "cryptography-3.3.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e18e6ab84dfb0ab997faf8cca25a86ff15dfea4027b986322026cc99e0a892da"}, - {file = "cryptography-3.3.2-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:c7390f9b2119b2b43160abb34f63277a638504ef8df99f11cb52c1fda66a2e6f"}, - {file = "cryptography-3.3.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:0d7b69674b738068fa6ffade5c962ecd14969690585aaca0a1b1fc9058938a72"}, - {file = "cryptography-3.3.2-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:922f9602d67c15ade470c11d616f2b2364950602e370c76f0c94c94ae672742e"}, - {file = "cryptography-3.3.2-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:a0f0b96c572fc9f25c3f4ddbf4688b9b38c69836713fb255f4a2715d93cbaf44"}, - {file = "cryptography-3.3.2-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:a777c096a49d80f9d2979695b835b0f9c9edab73b59e4ceb51f19724dda887ed"}, - {file = "cryptography-3.3.2-cp36-abi3-win32.whl", hash = "sha256:3c284fc1e504e88e51c428db9c9274f2da9f73fdf5d7e13a36b8ecb039af6e6c"}, - {file = "cryptography-3.3.2-cp36-abi3-win_amd64.whl", hash = "sha256:7951a966613c4211b6612b0352f5bf29989955ee592c4a885d8c7d0f830d0433"}, - {file = "cryptography-3.3.2.tar.gz", hash = "sha256:5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed"}, -] -datadog = [ - {file = "datadog-0.42.0-py2.py3-none-any.whl", hash = "sha256:140b51f5db3f46d6f3ec022c05830c6b3e13e4f62c19c823e1227ac322b26667"}, - {file = "datadog-0.42.0.tar.gz", hash = "sha256:7a6fac17a7d09f1883ab9a45ce4ff7a16aa1a5eb3cc4c6cddac7f8c53e7d1e9b"}, -] -enum34 = [ - {file = "enum34-1.1.10-py2-none-any.whl", hash = "sha256:a98a201d6de3f2ab3db284e70a33b0f896fbf35f8086594e8c9e74b909058d53"}, - {file = "enum34-1.1.10-py3-none-any.whl", hash = "sha256:c3858660960c984d6ab0ebad691265180da2b43f07e061c0f8dca9ef3cffd328"}, - {file = "enum34-1.1.10.tar.gz", hash = "sha256:cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"}, -] -futures = [ - {file = "futures-3.3.0-py2-none-any.whl", hash = "sha256:49b3f5b064b6e3afc3316421a3f25f66c137ae88f068abbf72830170033c5e16"}, - {file = "futures-3.3.0.tar.gz", hash = "sha256:7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794"}, -] -hetzner = [ - {file = "hetzner-0.8.3.tar.gz", hash = "sha256:9a43dbbeb4a1f3efc86c5fe1c1d7039aaa635dfdb829506ec3aa34382d3a7114"}, -] -idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, -] -importlib-metadata = [ - {file = "importlib_metadata-2.1.2-py2.py3-none-any.whl", hash = "sha256:cd6a92d78385dd145f5f233b3a6919acf5e8e43922aa9b9dbe78573e3540eb56"}, - {file = "importlib_metadata-2.1.2.tar.gz", hash = "sha256:09db40742204610ef6826af16e49f0479d11d0d54687d0169ff7fddf8b3f557f"}, -] -ipaddress = [ - {file = "ipaddress-1.0.23-py2.py3-none-any.whl", hash = "sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc"}, - {file = "ipaddress-1.0.23.tar.gz", hash = "sha256:b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"}, -] -jmespath = [ - {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, - {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, -] -jsonpickle = [ - {file = "jsonpickle-2.0.0-py2.py3-none-any.whl", hash = "sha256:c1010994c1fbda87a48f8a56698605b598cb0fc6bb7e7927559fc1100e69aeac"}, - {file = "jsonpickle-2.0.0.tar.gz", hash = "sha256:0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"}, -] -pathlib2 = [ - {file = "pathlib2-2.3.6-py2.py3-none-any.whl", hash = "sha256:3a130b266b3a36134dcc79c17b3c7ac9634f083825ca6ea9d8f557ee6195c9c8"}, - {file = "pathlib2-2.3.6.tar.gz", hash = "sha256:7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"}, -] -prettytable = [ - {file = "prettytable-1.0.1-py2.py3-none-any.whl", hash = "sha256:e7e464e8f7ecfd9a74c67f8da35f2a7da3d827235ba0a4737bb6d4b19f4a04bb"}, - {file = "prettytable-1.0.1.tar.gz", hash = "sha256:6bb7f539903cb031fecb855b615cbcac8cd245ebc6fa51c6e23ab3386db89771"}, -] -pycparser = [ - {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, - {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, -] -pyjwt = [ - {file = "PyJWT-1.7.1-py2.py3-none-any.whl", hash = "sha256:5c6eca3c2940464d106b99ba83b00c6add741c9becaec087fb7ccdefea71350e"}, - {file = "PyJWT-1.7.1.tar.gz", hash = "sha256:8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"}, -] -pysqlite = [ - {file = "pysqlite-2.8.3.tar.gz", hash = "sha256:17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490"}, -] -python-dateutil = [ - {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, - {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, -] -python-digitalocean = [ - {file = "python-digitalocean-1.17.0.tar.gz", hash = "sha256:107854fde1aafa21774e8053cf253b04173613c94531f75d5a039ad770562b24"}, - {file = "python_digitalocean-1.17.0-py3-none-any.whl", hash = "sha256:0032168e022e85fca314eb3f8dfaabf82087f2ed40839eb28f1eeeeca5afb1fa"}, -] -requests = [ - {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, - {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, -] -s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, -] -scandir = [ - {file = "scandir-1.10.0-cp27-cp27m-win32.whl", hash = "sha256:92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188"}, - {file = "scandir-1.10.0-cp27-cp27m-win_amd64.whl", hash = "sha256:cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac"}, - {file = "scandir-1.10.0-cp34-cp34m-win32.whl", hash = "sha256:2c712840c2e2ee8dfaf36034080108d30060d759c7b73a01a52251cc8989f11f"}, - {file = "scandir-1.10.0-cp34-cp34m-win_amd64.whl", hash = "sha256:2586c94e907d99617887daed6c1d102b5ca28f1085f90446554abf1faf73123e"}, - {file = "scandir-1.10.0-cp35-cp35m-win32.whl", hash = "sha256:2b8e3888b11abb2217a32af0766bc06b65cc4a928d8727828ee68af5a967fa6f"}, - {file = "scandir-1.10.0-cp35-cp35m-win_amd64.whl", hash = "sha256:8c5922863e44ffc00c5c693190648daa6d15e7c1207ed02d6f46a8dcc2869d32"}, - {file = "scandir-1.10.0-cp36-cp36m-win32.whl", hash = "sha256:2ae41f43797ca0c11591c0c35f2f5875fa99f8797cb1a1fd440497ec0ae4b022"}, - {file = "scandir-1.10.0-cp36-cp36m-win_amd64.whl", hash = "sha256:7d2d7a06a252764061a020407b997dd036f7bd6a175a5ba2b345f0a357f0b3f4"}, - {file = "scandir-1.10.0-cp37-cp37m-win32.whl", hash = "sha256:67f15b6f83e6507fdc6fca22fedf6ef8b334b399ca27c6b568cbfaa82a364173"}, - {file = "scandir-1.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d"}, - {file = "scandir-1.10.0.tar.gz", hash = "sha256:4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae"}, -] -six = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] -typing = [ - {file = "typing-3.10.0.0-py2-none-any.whl", hash = "sha256:c7219ef20c5fbf413b4567092adfc46fa6203cb8454eda33c3fc1afe1398a308"}, - {file = "typing-3.10.0.0-py3-none-any.whl", hash = "sha256:12fbdfbe7d6cca1a42e485229afcb0b0c8259258cfb919b8a5e2a5c953742f89"}, - {file = "typing-3.10.0.0.tar.gz", hash = "sha256:13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"}, -] -urllib3 = [ - {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"}, - {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"}, -] -wcwidth = [ - {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"}, - {file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"}, -] -zipp = [ - {file = "zipp-1.2.0-py2.py3-none-any.whl", hash = "sha256:e0d9e63797e483a30d27e09fffd308c59a700d365ec34e93cc100844168bf921"}, - {file = "zipp-1.2.0.tar.gz", hash = "sha256:c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1"}, -] diff --git a/pkgs/tools/package-management/nixops/python-env/pyproject.toml b/pkgs/tools/package-management/nixops/python-env/pyproject.toml deleted file mode 100644 index 2c216e4022594..0000000000000 --- a/pkgs/tools/package-management/nixops/python-env/pyproject.toml +++ /dev/null @@ -1,24 +0,0 @@ -[tool.poetry] -name = "nixops-python-env" -version = "0.1.0" -description = "" -authors = ["Your Name <you@example.com>"] -license = "MIT" - -[tool.poetry.dependencies] -python = "^2.7" -prettytable = "^1.0.1" -boto = "^2.49.0" -boto3 = "^1.17.97" -hetzner = "^0.8.3" -apache-libcloud = "^2.8.3" -adal = "^1.2.7" -pysqlite = "^2.8.3" -datadog = "^0.42.0" -python-digitalocean = "^1.17.0" - -[tool.poetry.dev-dependencies] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" diff --git a/pkgs/tools/package-management/nixops/python-env/shell.nix b/pkgs/tools/package-management/nixops/python-env/shell.nix deleted file mode 100644 index 13fcab0e0faa5..0000000000000 --- a/pkgs/tools/package-management/nixops/python-env/shell.nix +++ /dev/null @@ -1,8 +0,0 @@ -let - pkgs = import ../../../../../. { }; -in pkgs.mkShell { - packages = [ - pkgs.python2 - pkgs.poetry - ]; -} diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index f62e6e246f691..49e044323cc83 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { libxml2 ]; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + meta = with lib; { description = "A lightweight package management system based upon ipkg"; homepage = "https://git.yoctoproject.org/cgit/cgit.cgi/opkg/"; diff --git a/pkgs/tools/security/cie-middleware-linux/default.nix b/pkgs/tools/security/cie-middleware-linux/default.nix index 7af3e9240f1e1..fa5ec2d2af830 100644 --- a/pkgs/tools/security/cie-middleware-linux/default.nix +++ b/pkgs/tools/security/cie-middleware-linux/default.nix @@ -20,13 +20,13 @@ let pname = "cie-middleware-linux"; - version = "1.4.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "M0rf30"; repo = pname; - rev = "${version}-podofo"; - sha256 = "sha256-Kyr9OTiY6roJ/wVJS/1aWfrrzDNQbuRTJQqo0akbMUU="; + rev = version; + sha256 = "sha256-Z8K2Ibg5bBfSql5HEapKgdfiCf/EIKTTD15oVeysQGk="; }; gradle = gradle_7; @@ -44,6 +44,7 @@ let buildPhase = '' # Run the fetchDeps task export GRADLE_USER_HOME=$(mktemp -d) + ls -l gradle --no-daemon -b cie-java/build.gradle fetchDeps ''; @@ -60,7 +61,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-WzT5vYF9yCMU2A7EkLZyjgWrN3gD7pnkPXc3hDFqpD8="; + outputHash = "sha256-jtaH8dBpnx8KMJe+jzJfkvcx1NO4nL5jsRO4+GI+d0c="; }; in @@ -84,7 +85,7 @@ stdenv.mkDerivation { buildInputs = [ cryptopp fontconfig - podofo + podofo.dev openssl pcsclite curl @@ -95,6 +96,10 @@ stdenv.mkDerivation { # substitute the cieid command with this $out/bin/cieid substituteInPlace libs/pkcs11/src/CSP/AbilitaCIE.cpp \ --replace 'file = "cieid"' 'file = "'$out'/bin/cieid"' + + # revert https://github.com/M0Rf30/cie-middleware-linux/commit/1a389d8 + sed -i libs/meson.build \ + -e "s@podofo_dep = .\+@podofo_dep = dependency('libpodofo')@g" ''; # Note: we use pushd/popd to juggle between the diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index bcfadcc4da711..2b51ba0f7f942 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "9.2.3"; + version = "9.4.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-gCKmaioBko4UsfhPBcpVxHC7knhZGZU54HZFu/rHIbw="; + hash = "sha256-rAvSC+MqgS47n/DFbGoeyvN1GyidvQ37TS+buSYwxME="; }; proxyVendor = true; - vendorHash = "sha256-YN1y+K/9EdZ7RlZRVWK/HEppZv/dX6XrkaqIlZVoC8c="; + vendorHash = "sha256-xghScwfR82Q9lhx2cNc1JZShppCKQR+tZynk+ee/81c="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/security/der-ascii/default.nix b/pkgs/tools/security/der-ascii/default.nix index 5fc3b179b3ad1..28cab27731b13 100644 --- a/pkgs/tools/security/der-ascii/default.nix +++ b/pkgs/tools/security/der-ascii/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "der-ascii"; - version = "0.1.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1my93m1rx08kn2yms6k8w43byr8k61r1nra4b082j8b393wwxkqc"; + sha256 = "sha256-LgxGSZQNxwx08mK9G8mSuBFTOd3pC1mvz3Wz7Y+6XR4="; }; vendorHash = null; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 73a297548e70f..4212d86afb989 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-10-24"; + version = "2023-10-26"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-F3UPg7wBpm1iK2hZ9YOC4bRsvGHn7j4U5y4w7qpF+tM="; + hash = "sha256-P+T3TM2MeHaN+ApgOMEFmyWv+AzQshVUfhbI+n/vozs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 4d085fb9980a6..9c40c051bebcc 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6muoKiryWTGIoy1U3kWjuka0X1+gcrUQOvbuas26H1M="; + sha256 = "sha256-LT8J9s008XQtDtNdH1ungQREqQUrlTsoxnlRLKimqLY="; # 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; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-i9RK9kNSB9FOnVbYcHLBHt8KKBQCNsEDONNm1IxgTJc="; + vendorHash = "sha256-ImZJXdOfMepMFU1z47XyNU39NGGdiCzQji2/tKVfibQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/go-exploitdb/default.nix b/pkgs/tools/security/go-exploitdb/default.nix index 345b40fbaf142..d400cd22a6f05 100644 --- a/pkgs/tools/security/go-exploitdb/default.nix +++ b/pkgs/tools/security/go-exploitdb/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-exploitdb"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "vulsio"; repo = "go-exploitdb"; rev = "refs/tags/v${version}"; - hash = "sha256-iBOpgeL/cLoQufla0MpQs/0icRWUj1HngnAwOcKLSsQ="; + hash = "sha256-xQQnMlj5dxvvGPqzMyMVloJQe5qY2EPQkYaw3RpgxjI="; }; - vendorHash = "sha256-e+E8qcc5sRlb9clOFUrOzVwJlp3AFnZ6/lNAxaBe+hQ="; + vendorHash = "sha256-1HvhphLJH0572au2iSXVjN35JCpZr1hesnMrIpdOBRc="; ldflags = [ "-s" diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 44f7b5dd0fc16..40869e8258027 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -53,6 +53,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/orhun/gpg-tui"; changelog = "https://github.com/orhun/gpg-tui/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda matthiasbeyer ]; }; } diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix index 3885316271b9e..7bb89718baca7 100644 --- a/pkgs/tools/security/honggfuzz/default.nix +++ b/pkgs/tools/security/honggfuzz/default.nix @@ -4,21 +4,20 @@ , makeWrapper , clang , llvm -# TODO: switch to latest versions when 2.6 release is out to include -# https://github.com/google/honggfuzz/commit/90fdf81006614664ef05e5e3c6f94d91610f11b2 -, libbfd_2_38, libopcodes_2_38 +, libbfd +, libopcodes , libunwind , libblocksruntime }: stdenv.mkDerivation rec { pname = "honggfuzz"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - sha256 = "sha256-TkyUKmiiSAfCnfQhSOUxuce6+dRyMmHy7vFK59jPIxM="; + sha256 = "sha256-/ra6g0qjjC8Lo8/n2XEbwnZ95yDHcGhYd5+TTvQ6FAc="; }; postPatch = '' @@ -30,7 +29,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ llvm ]; - propagatedBuildInputs = [ libbfd_2_38 libopcodes_2_38 libunwind libblocksruntime ]; + propagatedBuildInputs = [ libbfd libopcodes libunwind libblocksruntime ]; + + # Fortify causes build failures: 'str*' defined both normally and as 'alias' attribute + hardeningDisable = [ "fortify" ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 28665e618d04d..0d35206b82f6a 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "keybase"; - version = "6.2.2"; + version = "6.2.3"; modRoot = "go"; subPackages = [ "kbnm" "keybase" ]; @@ -16,7 +16,7 @@ buildGoModule rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - hash = "sha256-1vJCuAkJmehFcVYLwp3UIlQiGji7mHVczCBtXq9Fl68="; + hash = "sha256-uZIoFivyFqC+AeFTJaEw2BbP7qoOVF8gtSIdUStxsHU="; }; vendorHash = "sha256-tXEEVEfjoKub2A4m7F3hDc5ABJ+R+axwX1+1j7e3BAM="; diff --git a/pkgs/tools/security/kubeclarity/default.nix b/pkgs/tools/security/kubeclarity/default.nix index ca4cb1bfb5923..4ad4044adbaa6 100644 --- a/pkgs/tools/security/kubeclarity/default.nix +++ b/pkgs/tools/security/kubeclarity/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubeclarity"; - version = "2.21.1"; + version = "2.22.0"; src = fetchFromGitHub { owner = "openclarity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+kWqw8o5KlVciWIB8cCVkMuiqW0wpIfua5qVgXZG3ww="; + hash = "sha256-VpTLf4Z2l9Ix92GzcyJvj4j2j+aff8nc2qW9+2uaPBs="; }; vendorHash = "sha256-kYdKCHqzDbfCGMlTMPSHAQkSLyhkCl/OvV7CF5jdyaY="; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index ae6e1d78f6fa8..78b564263c78c 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5Z40wc8ihN2UR3DyMCaD0MOKpgbUQX0OJMyZw2gVNYM="; + hash = "sha256-vttAIkQzZKkqKer/rnX9irNev3i7y8kfTqO4LH1xANo="; }; - vendorHash = "sha256-CaeYAw7QU/KySFDSkUr4oHrG3wyPHxty3KCZ6zlPqIk="; + vendorHash = "sha256-cEp/bMOWoAfpFoi9zVcSoYyPwL9hVnoOzRzCPacrSiM="; subPackages = [ "cmd/nuclei/" diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 4fa1609629939..e6eff66bb60f8 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.11"; + version = "2.36.12"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-Sx/MAgjPcUzg4sX0O3CobAXCZQi2msZu6dKZ9q7/K+k="; + sha256 = "sha256-egsAUaGYe06hlPUE4J4acdrfMlDEY/8g0g9KPPJyMlI="; }; - vendorHash = "sha256-T5x8C1cKyJaHVJbf2xNabD3XXwde2lOOCa8GHjdFlh0="; + vendorHash = "sha256-hdt/XhxMuR6YlvY/Qu2AjY5F75YvYLlv0LfuMwJQkl4="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 6a1dc84fe11fd..1c1b058973602 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -21,6 +21,7 @@ buildGoModule rec { homepage = "https://github.com/getsops/sops"; description = "Simple and flexible tool for managing secrets"; changelog = "https://github.com/getsops/sops/blob/v${version}/CHANGELOG.rst"; + mainProgram = "sops"; maintainers = [ maintainers.marsam ]; license = licenses.mpl20; }; diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 13e42efa78881..d91172ec26e67 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.7.2"; + version = "1.8.2"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3D7TlL4SulLAqpVIMJ4Yl2OWnNsMYMLVJqgGhOYMiio="; + sha256 = "sha256-+xHsNp/Zk+0D1iwGJNjgCvSjepGQEJXWnkWHa6Et9jA="; }; - vendorHash = "sha256-Vct++sjkkosBOY0Uho58MHSQoL5121kYbQTf1j+HFUk="; + vendorHash = "sha256-mh3LIwUKIyH75AvWX+YgGi5VAU/EzZw5OSpAFIG6ueo="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index de2ec7dfb05a5..e510bf2e2b2c0 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.60.3"; + version = "3.61.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-864bq0LK2lRWmbQ7JTGc9gtMsTnoKMLkjyEdTNUBFRg="; + hash = "sha256-thUDdfNSQHybP5y03Jh94u8lHlj0FSuJP+U+d1OqKI8="; }; - vendorHash = "sha256-TNxZatI9l+dX2WI7SnTH975yrgyuB4VjTJOkaSr5mxc="; + vendorHash = "sha256-KEU2G5x2d0N+H8p9MXL9yzK1lC0YqWuuxcLw/cboUzs="; ldflags = [ "-s" diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 441e359e13db4..45aed59dee8fa 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.35"; + version = "3.36"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-8LMpgayxBebHb0MXYmjlqqtndSiL42/yEQpgamxt9kI="; + sha256 = "sha256-w1k1DGgGYL2K/fZ30HMQE2vMcT6ZaaweM+KTcHKVEq4="; }; buildInputs = [ python3 zlib ] diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index 589460e6a893c..4b9b2d0099325 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lB6vJqb6/Qwj3odCJzyQ0+xEl5V/ZPj9cAJGNfiYAOY="; + sha256 = "sha256-61HLWSGACnonjp/n14sVo8DdVOUbOpIQHpPL0PmKmpI="; }; - cargoSha256 = "sha256-Ff5vGc90VxmyKQSsjUfoI1NL95DmD1SJx3eC1SP6rt4="; + cargoSha256 = "sha256-yxpM4aUPVfaMuYwj50C/Uwh/diraJLON1mNjuYJR6Ck="; nativeBuildInputs = [ installShellFiles ]; @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/orhun/kmon/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ figsoda misuzu ]; + maintainers = with maintainers; [ figsoda misuzu matthiasbeyer ]; }; } diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index aaa597d4c7863..3c48c53bf90c5 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -118,6 +118,10 @@ stdenv.mkDerivation rec { ]; postFixup = '' + # remove once https://github.com/netdata/netdata/pull/16300 merged + substituteInPlace $out/bin/netdata-claim.sh \ + --replace /bin/echo echo + wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]} wrapProgram $out/libexec/netdata/plugins.d/cgroup-network-helper.sh --prefix PATH : ${lib.makeBinPath [ bash ]} wrapProgram $out/bin/netdatacli --set NETDATA_PIPENAME /run/netdata/ipc diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index b406c5b4a3124..b8de3110306c0 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2308.0"; + version = "8.2310.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - hash = "sha256-AghrkSHocs6mnl0PbI4tjr/zMjSzytVQNmU3jTry48k="; + hash = "sha256-INnOeSvwp+0HA9vwlBSQ+L5lX0i1W0vr3Agnu7DdvxE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 3c387cf28708e..f511323f9e558 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -34,7 +34,6 @@ }: let python-deps = ps: with ps; [ - pip boto3 botocore cachetools @@ -56,7 +55,7 @@ let websocket-client ply ]; - myPy3 = (python3.withPackages python-deps); + py = python3.withPackages python-deps; in stdenv.mkDerivation rec { pname = "syslog-ng"; @@ -68,7 +67,7 @@ stdenv.mkDerivation rec { rev = "syslog-ng-${version}"; hash = "sha256-NXwd4dyPfnHO3yjl3GPAMQYqenfpp7xFOil2G1e66w4="; }; - nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config which bison flex libxslt perl myPy3 ]; + nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config which bison flex libxslt perl ]; buildInputs = [ libcap @@ -76,7 +75,7 @@ stdenv.mkDerivation rec { openssl eventlog glib - myPy3 + py systemd riemann_c_client protobufc @@ -100,7 +99,7 @@ stdenv.mkDerivation rec { "--enable-dynamic-linking" "--enable-systemd" "--enable-smtp" - "--with-python-packages=system" + "--with-python-packages=none" "--with-hiredis=system" "--with-ivykis=system" "--with-librabbitmq-client=system" diff --git a/pkgs/tools/system/systeroid/default.nix b/pkgs/tools/system/systeroid/default.nix index dca6ee3f46803..4cedd6db8a17b 100644 --- a/pkgs/tools/system/systeroid/default.nix +++ b/pkgs/tools/system/systeroid/default.nix @@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/orhun/systeroid"; changelog = "https://github.com/orhun/systeroid/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/tools/text/dt/default.nix index bc4c0dd9938e9..303feb0fe9422 100644 --- a/pkgs/tools/text/dt/default.nix +++ b/pkgs/tools/text/dt/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dt"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "so-dang-cool"; repo = "dt"; rev = "v${finalAttrs.version}"; - hash = "sha256-u9MI6mrP+QXr3VDgmXW7GRkHKCiDoA9HlznTEGNsck4="; + hash = "sha256-i8oMrsPcINVK5kXzrN+lcPqBfxIeed8W+NF7Qd0crrk="; }; nativeBuildInputs = [ zig_0_11.hook ]; diff --git a/pkgs/tools/text/mecab/default.nix b/pkgs/tools/text/mecab/default.nix index 3cca6776d3a91..8d11343515d0a 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/tools/text/mecab/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation (finalAttrs: ((mecab-base finalAttrs) // { pname = "mecab"; postInstall = '' - sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc" + mkdir -p $out/lib/mecab/dic + ln -s ${mecab-ipadic} $out/lib/mecab/dic/ipadic ''; meta = with lib; { diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index cbca59bdc6e58..4271fe131dac9 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "the_platinum_searcher"; - version = "2.1.5"; + version = "2.2.0"; src = fetchFromGitHub { owner = "monochromegane"; repo = "the_platinum_searcher"; rev = "v${version}"; - hash = "sha256-AJsFLleZf5yhLY5UZnaQUBQYntzBLXFh6jU2UtKg8/g="; + hash = "sha256-FNHlALFwMbajaHWOehdSFeQmvZSuCZLdqGqLZ7DF+pI="; }; vendorHash = "sha256-GIjPgu0e+duN5MeWcRaF5xUFCkqe2aZJCwGbLUMko08="; diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 2a01b58c3a6c3..e9889c45e0299 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "poedit"; - version = "3.3.2"; + version = "3.4"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; rev = "v${version}-oss"; - hash = "sha256-4WImcTr2nWIdsYJ9ADztvjKEzHK4F8qpJ0QGMOfB3ng="; + hash = "sha256-Z2DT+RO35EcJFOnrjmJ8v2tsINQnsPkbFhZW9OZqob4="; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/tools/text/scraper/default.nix index d325646a35d2b..7c5b1a89b2525 100644 --- a/pkgs/tools/text/scraper/default.nix +++ b/pkgs/tools/text/scraper/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "scraper"; - version = "0.17.1"; + version = "0.18.0"; src = fetchCrate { inherit pname version; - hash = "sha256-SVrQi9VxTzUHkdFdieOAIBhKvyrZqi3xKGooHkCEmhQ="; + hash = "sha256-/OVUtRQH6Sc0TggN8UEA1GhVD4dXv8h5MFAXswgwSFE="; }; - cargoHash = "sha256-/Lut38gFO4XtrBHXr4sfcII+bWgcCDrHf5/PKPrDiDs="; + cargoHash = "sha256-zi6Jgibrx5kckqTj4nHBtiCFuHYmz4cyMwFkNQ6VXjc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index 89c31d0440aac..3f8ef799a6bf0 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { - version = "9.1"; + version = "9.2"; pname = "tab"; src = fetchFromGitHub { owner = "ivan-tkatchev"; repo = pname; rev = version; - sha256 = "sha256-AhgWeV/ojB8jM16A5ggrOD1YjWfRVcoQbkd3S2bgdyE="; + hash = "sha256-UOXfnpzYMKDdp8EeBo2HsVPGn61hkCqHe8olX9KAgOU="; }; # gcc12; see https://github.com/ivan-tkatchev/tab/commit/673bdac998 diff --git a/pkgs/tools/text/tesh/default.nix b/pkgs/tools/text/tesh/default.nix index 0b702ae0052a4..abff7771add23 100644 --- a/pkgs/tools/text/tesh/default.nix +++ b/pkgs/tools/text/tesh/default.nix @@ -1,7 +1,7 @@ { python3Packages, fetchFromGitHub, fetchpatch }: let - version = "0.3.0"; + version = "0.3.2"; in python3Packages.buildPythonPackage rec { pname = "tesh"; inherit version; @@ -12,24 +12,9 @@ in python3Packages.buildPythonPackage rec { owner = "OceanSprint"; repo = "tesh"; rev = version; - hash = "sha256-/CSYz2YXbjKZszb1HMOCS+srVJ+TcFSeLeuz9VvtlI4="; + hash = "sha256-GIwg7Cv7tkLu81dmKT65c34eeVnRR5MIYfNwTE7j2Vs="; }; - patches = [ - # https://github.com/OceanSprint/tesh/pull/49 - (fetchpatch { - name = "replace-poetry-with-poetry-core-1.patch"; - url = "https://github.com/OceanSprint/tesh/commit/49b90f5a3c9cf111931393248943b1da966dc3ec.patch"; - hash = "sha256-s+eGO4NXTGbyXcLP37kCg4GDrjAsYIlOwNDR1Q7+1Uc="; - }) - # https://github.com/OceanSprint/tesh/pull/50 - (fetchpatch { - name = "replace-poetry-with-poetry-core-2.patch"; - url = "https://github.com/OceanSprint/tesh/commit/66798b54f28dc0b72159ee3a2144895cf945eaf0.patch"; - hash = "sha256-f3uL7TZlkrTOWYihwWNfhrY5/xlBrclAMnbxRNXCGJw="; - }) - ]; - checkInputs = [ python3Packages.pytest ]; nativeBuildInputs = [ python3Packages.poetry-core ]; propagatedBuildInputs = with python3Packages; [ click pexpect ]; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 608ec5345aabd..5b507b954ab94 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-X2tRjQ948fnyCn7vQbpmDqktMfP4A/s7bVfrKDed5nw="; + hash = "sha256-Us1HZ2MXYgJcEyhdE9tFoVcuqirgVDi5Qbu+I35ItpU="; }; buildInputs = [ diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 8b341298f3112..6d77faac76a9f 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -65,10 +65,12 @@ in cp -r lib-satysfi/dist/ $out/share/satysfi/ cp -r \ ${ipaexfont}/share/fonts/opentype/* \ - ${junicode}/share/fonts/junicode-ttf/* \ ${lmodern}/share/fonts/opentype/public/lm/* \ ${lmmath}/share/fonts/opentype/latinmodern-math.otf \ - $out/share/satysfi/dist/fonts + ${junicode}/share/fonts/truetype/Junicode-{Bold,BoldItalic,Italic}.ttf \ + $out/share/satysfi/dist/fonts/ + cp ${junicode}/share/fonts/truetype/Junicode-Regular.ttf \ + $out/share/satysfi/dist/fonts/Junicode.ttf ''; meta = with lib; { diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index edf456d3094e5..72a67045f56b4 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -17,14 +17,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "23.3.1"; + version = "23.3.3"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-3UxTqlhLZi/3/buWqDGto4cZN03uONbA8HEWQtaIRxU="; + hash = "sha256-49UvGrv40hyR3A2BndlQKwQqCC1ZaLm97IUKNW12sJo="; }; patches = [ diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index 1c99d63741a79..3b1a4988f47d4 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -34,6 +34,16 @@ let url = "https://github.com/systemd/systemd/commit/4947de275a5553399854cc748f4f13e4ae2ba069.patch"; hash = "sha256-YIZZyc3f8pQO9fMAxiNhDdV8TtL4pXoh+hwHBzRWtfo="; }) + # repart: make sure rewinddir() is called before readdir() when performing rm -rf. Remove when upgrading to systemd 255. + (fetchpatch { + url = "https://github.com/systemd/systemd/commit/6bbb893b90e2dcb05fb310ba4608f9c9dc587845.patch"; + hash = "sha256-A6cF2QAeYHGc0u0V1JMxIcV5shzf5x3Q6K+blZOWSn4="; + }) + # Set timezone to UTC when invoking mcopy. Remove when upgrading to systemd 255. + (fetchpatch { + url = "https://github.com/systemd/systemd/commit/b2942c76adc5bb6a3e073aa5cee57834ee3a9813.patch"; + hash = "sha256-phGln3Gs9p8CsEe+1laGrm9xcUJWVbNBW0W8oR9/7YU="; + }) ]; })).override { withRepart = true; diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix index 79cc1635a9cd9..bd4ef671de461 100644 --- a/pkgs/tools/wayland/swayrbar/default.nix +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayrbar"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "swayrbar-${version}"; - sha256 = "sha256-Vv+Hw+iJAi2GnfkiYitDyH3H58tydUDa6GcWITok7Oc="; + sha256 = "sha256-41zlVT060Fu90N4oiZ6lWSZdJJSZjyk3GEA/u+bVNCI="; }; - cargoHash = "sha256-5alzkHzwuymo6bXFgabYQ3LWJDib0+ESQCSIPmINViY="; + cargoHash = "sha256-/MUolnEdYlBTfmUB/j9vHaVpU63upeMoScjHl38cGjo="; # don't build swayr buildAndTestSubdir = pname; diff --git a/pkgs/tools/wayland/wluma/Cargo.lock b/pkgs/tools/wayland/wluma/Cargo.lock index 93da6d375921f..22a0f9a329db2 100644 --- a/pkgs/tools/wayland/wluma/Cargo.lock +++ b/pkgs/tools/wayland/wluma/Cargo.lock @@ -21,15 +21,6 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] name = "anyhow" version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -60,24 +51,24 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bindgen" -version = "0.56.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ "bitflags", "cexpr", "clang-sys", - "clap", - "env_logger 0.8.4", "lazy_static", "lazycell", "log", "peeking_take_while", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", + "syn 2.0.22", "which", ] @@ -107,11 +98,11 @@ checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" [[package]] name = "cexpr" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "nom 5.1.2", + "nom 7.1.3", ] [[package]] @@ -147,21 +138,6 @@ dependencies = [ ] [[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] name = "codespan-reporting" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -242,7 +218,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.109", ] [[package]] @@ -259,7 +235,7 @@ checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -392,22 +368,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] -name = "env_logger" -version = "0.8.4" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "env_logger" @@ -633,9 +596,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libloading" @@ -756,6 +719,12 @@ dependencies = [ ] [[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] name = "mio" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -769,9 +738,9 @@ dependencies = [ [[package]] name = "mockall" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" dependencies = [ "cfg-if", "downcast", @@ -784,14 +753,14 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -817,12 +786,12 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.2" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr 2.5.0", - "version_check", + "minimal-lexical", ] [[package]] @@ -927,19 +896,29 @@ dependencies = [ ] [[package]] +name = "prettyplease" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282" +dependencies = [ + "proc-macro2", + "syn 2.0.22", +] + +[[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "fe8df9bd9fe9d1742a9e17f8129712801b428f6d4c6059d79bacea58f0b0142d" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -966,9 +945,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.1" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr 2.5.0", @@ -977,9 +956,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "resize-slice" @@ -1031,7 +1010,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1061,9 +1040,9 @@ dependencies = [ [[package]] name = "shlex" -version = "0.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "smallvec" @@ -1082,16 +1061,21 @@ dependencies = [ ] [[package]] -name = "strsim" -version = "0.8.0" +name = "syn" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] [[package]] name = "syn" -version = "1.0.107" +version = "2.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" dependencies = [ "proc-macro2", "quote", @@ -1114,15 +1098,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] name = "thiserror" version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1139,7 +1114,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1196,9 +1171,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-width" @@ -1220,9 +1195,9 @@ checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2" [[package]] name = "v4l" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9946a2fda19c7a729dc72e28b9fd9c653e9b7de954ffe3aecaf51977f88762" +checksum = "d8fbfea44a46799d62c55323f3c55d06df722fbe577851d848d328a1041c3403" dependencies = [ "bitflags", "libc", @@ -1231,26 +1206,14 @@ dependencies = [ [[package]] name = "v4l-sys" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91dc47f9668a0a1a0af7ba194f2d543a68c2ef9eb61888f89565d60b34247fe" +checksum = "16214e9b9476f0e76d117945c9c18a46a2602643c917a75b718ae2cf5395fa30" dependencies = [ "bindgen", ] [[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] name = "void" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1289,7 +1252,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -1311,7 +1274,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1386,11 +1349,13 @@ dependencies = [ [[package]] name = "which" -version = "3.1.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ + "either", "libc", + "once_cell", ] [[package]] @@ -1489,12 +1454,12 @@ checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "wluma" -version = "4.2.0" +version = "4.3.0" dependencies = [ "ash", "chrono", "ddc-hi", - "env_logger 0.9.3", + "env_logger", "inotify", "itertools", "lazy_static", diff --git a/pkgs/tools/wayland/wluma/default.nix b/pkgs/tools/wayland/wluma/default.nix index e393d0aff3162..0dfc572c9b20e 100644 --- a/pkgs/tools/wayland/wluma/default.nix +++ b/pkgs/tools/wayland/wluma/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "wluma"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "maximbaz"; repo = "wluma"; rev = version; - sha256 = "sha256-6qZlwjzBPDkr2YHzDYeKQOuoozV7rpl8dojqTTzInqg="; + sha256 = "sha256-FaX87k8LdBhrBX4qvokSHkcNaQZ0+oSbkn9d0dK6FGo="; }; cargoLock = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ed87a4a123a22..85ac74fae7dbd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -124,6 +124,7 @@ mapAliases ({ ### C ### callPackage_i686 = pkgsi686Linux.callPackage; + cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 cask = emacs.pkgs.cask; # Added 2022-11-12 cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 @@ -133,6 +134,8 @@ mapAliases ({ chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 chocolateDoom = chocolate-doom; # Added 2023-05-01 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 + chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 + chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 citra = citra-nightly; # added 2022-05-17 clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 @@ -316,6 +319,8 @@ mapAliases ({ godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 + google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 + google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 go-thumbnailer = thud; # Added 2023-09-21 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 @@ -327,6 +332,9 @@ mapAliases ({ gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 graylog = throw "graylog is now available in versions 3.3 up to 5.0. Please mind the upgrade path and choose the appropriate version. Direct upgrading from 3.3 to 4.3 or above is not supported"; # Added 2023-04-24 + graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09 + graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 + graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 gringo = clingo; # added 2022-11-27 gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 @@ -335,6 +343,7 @@ mapAliases ({ gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 grub2_full = grub2; # Added 2022-11-18 grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 + guile-disarchive = disarchive; # Added 2023-10-27 guile-lint = throw "'guile-lint' has been removed, please use 'guild lint' instead"; # Added 2023-10-16 ### H ### @@ -449,6 +458,7 @@ mapAliases ({ librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 libseat = seatd; # Added 2021-06-24 + libsigcxx12 = throw "'libsigcxx12' has been removed, please use newer versions"; # Added 2023-10-20 libsForQt515 = libsForQt5; # Added 2022-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 @@ -483,6 +493,7 @@ mapAliases ({ linuxPackages_6_3 = linuxKernel.packages.linux_6_3; linuxPackages_6_4 = linuxKernel.packages.linux_6_4; linuxPackages_6_5 = linuxKernel.packages.linux_6_5; + linuxPackages_6_6 = linuxKernel.packages.linux_6_6; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; @@ -507,6 +518,7 @@ mapAliases ({ linux_6_3 = linuxKernel.kernels.linux_6_3; linux_6_4 = linuxKernel.kernels.linux_6_4; linux_6_5 = linuxKernel.kernels.linux_6_5; + linux_6_6 = linuxKernel.kernels.linux_6_6; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; @@ -597,6 +609,7 @@ mapAliases ({ nix_2_4 = nixVersions.nix_2_4; nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; + nixops = throw "'nixops' has been removed. Please use 'nixops_unstable' for the time being."; # Added 2023-10-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = nmap; # Added 2021-04-06 @@ -696,6 +709,7 @@ mapAliases ({ pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10 pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt5 = pinentry-qt; # Added 2020-02-11 + poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eacb266e2ff79..546e6a6e66d81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -364,6 +364,8 @@ with pkgs; blst = callPackage ../development/libraries/blst { }; + bloom = qt6Packages.callPackage ../development/tools/bloom { }; + bloodhound-py = callPackage ../tools/security/bloodhound-py { }; bodyclose = callPackage ../development/tools/bodyclose { }; @@ -642,6 +644,8 @@ with pkgs; efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; + elektroid = callPackage ../applications/audio/elektroid { }; + eludris = callPackage ../tools/misc/eludris { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -1080,7 +1084,7 @@ with pkgs; mya = callPackage ../applications/misc/mya { }; mysql-shell = callPackage ../development/tools/mysql-shell { - inherit (darwin) cctools developer_cmds DarwinTools; + inherit (darwin) cctools DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; antlr = antlr4_10; boost = boost177; # Configure checks for specific version. @@ -1116,7 +1120,7 @@ with pkgs; fetchs3 = callPackage ../build-support/fetchs3 { }; - fetchFromBittorrent = callPackage ../build-support/fetchbittorrent { }; + fetchtorrent = callPackage ../build-support/fetchtorrent { }; fetchsvn = if stdenv.buildPlatform != stdenv.hostPlatform # hack around splicing being crummy with things that (correctly) don't eval. @@ -1586,8 +1590,8 @@ with pkgs; }; honggfuzz = callPackage ../tools/security/honggfuzz { - clang = clang_12; - llvm = llvm_12; + clang = clang_16; + llvm = llvm_16; }; aflplusplus = callPackage ../tools/security/aflplusplus { @@ -1708,6 +1712,7 @@ with pkgs; butler = callPackage ../games/itch/butler.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; + buildGoModule = buildGo120Module; }; carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { }; @@ -3986,7 +3991,9 @@ with pkgs; lesspass-cli = callPackage ../tools/security/lesspass-cli { }; - livebook = callPackage ../servers/web-apps/livebook { }; + livebook = callPackage ../servers/web-apps/livebook { + elixir = elixir_1_15; + }; lsix = callPackage ../tools/graphics/lsix { }; @@ -4678,7 +4685,10 @@ with pkgs; cloudbrute = callPackage ../tools/security/cloudbrute { }; - cloudflared = callPackage ../applications/networking/cloudflared { }; + cloudflared = callPackage ../applications/networking/cloudflared { + # https://github.com/cloudflare/cloudflared/issues/1054 + buildGoModule = buildGo120Module; + }; cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { }; @@ -7780,7 +7790,7 @@ with pkgs; schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_24; + electron = electron_25; }; schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' #!/bin/sh @@ -8841,12 +8851,6 @@ with pkgs; grails = callPackage ../development/web/grails { jdk = null; }; - graylog-3_3 = callPackage ../tools/misc/graylog/3.3.nix { }; - - graylog-4_0 = callPackage ../tools/misc/graylog/4.0.nix { }; - - graylog-4_3 = callPackage ../tools/misc/graylog/4.3.nix { }; - graylog-5_0 = callPackage ../tools/misc/graylog/5.0.nix { }; graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { }; @@ -10310,7 +10314,7 @@ with pkgs; npmHooks = callPackage ../build-support/node/build-npm-package/hooks { }; - inherit (callPackage ../build-support/node/fetch-npm-deps { }) + inherit (callPackages ../build-support/node/fetch-npm-deps { }) fetchNpmDeps prefetch-npm-deps; nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs; @@ -10948,7 +10952,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_22; + electron = electron_25; # blank screen with electron_26 }; mosh = callPackage ../tools/networking/mosh { }; @@ -11774,8 +11778,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; }; - owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; - oxefmsynth = callPackage ../applications/audio/oxefmsynth { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -13241,7 +13243,7 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair { }; sketchybar = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/sketchybar { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreWLAN CoreVideo DisplayServices IOKit MediaRemote SkyLight; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Carbon CoreAudio CoreWLAN CoreVideo DisplayServices IOKit MediaRemote SkyLight; }; sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { }; @@ -15455,6 +15457,9 @@ with pkgs; ### DEVELOPMENT / COMPILERS + temurin-bin-21 = javaPackages.compiler.temurin-bin.jdk-21; + temurin-jre-bin-21 = javaPackages.compiler.temurin-bin.jre-21; + temurin-bin-20 = javaPackages.compiler.temurin-bin.jdk-20; temurin-jre-bin-20 = javaPackages.compiler.temurin-bin.jre-20; @@ -17166,7 +17171,7 @@ with pkgs; cargo-sort = callPackage ../development/tools/rust/cargo-sort { }; cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-supply-chain = callPackage ../development/tools/rust/cargo-supply-chain { }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; @@ -17761,6 +17766,11 @@ with pkgs; luarocks = luaPackages.luarocks; luarocks-nix = luaPackages.luarocks-nix; + luarocks-packages-updater = callPackage ../development/lua-modules/updater { + inherit (python3Packages) buildPythonApplication ; + }; + + luau = callPackage ../development/interpreters/luau { }; lune = callPackage ../development/interpreters/lune { }; @@ -17980,10 +17990,6 @@ with pkgs; poetryPlugins = recurseIntoAttrs poetry.plugins; - poetry2nix = callPackage ../development/tools/poetry2nix/poetry2nix { - inherit pkgs lib; - }; - poetry2conda = callPackage ../tools/package-management/poetry2conda { }; pip-audit = callPackage ../development/tools/pip-audit { }; @@ -18387,9 +18393,7 @@ with pkgs; glslls = callPackage ../development/tools/language-servers/glslls { }; - gopls = callPackage ../development/tools/language-servers/gopls { - buildGoModule = buildGo121Module; - }; + gopls = callPackage ../development/tools/language-servers/gopls { }; helm-ls = callPackage ../development/tools/language-servers/helm-ls { }; @@ -19652,7 +19656,11 @@ with pkgs; mermerd = callPackage ../development/tools/database/mermerd { }; - python-matter-server = with python3Packages; toPythonApplication python-matter-server; + python-matter-server = with python3Packages; toPythonApplication ( + python-matter-server.overridePythonAttrs (oldAttrs: { + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ oldAttrs.passthru.optional-dependencies.server; + }) + ); minify = callPackage ../development/web/minify { }; @@ -23452,8 +23460,6 @@ with pkgs; libsigcxx = callPackage ../development/libraries/libsigcxx { }; - libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; - libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { }; libsigsegv = callPackage ../development/libraries/libsigsegv { }; @@ -26035,10 +26041,6 @@ with pkgs; }; # Steel Bank Common Lisp - sbclBootstrap = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; - faslExt = "fasl"; - }; sbcl_2_3_8 = wrapLisp { pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.8"; }; faslExt = "fasl"; @@ -26343,6 +26345,7 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; }; envoy = callPackage ../servers/http/envoy { + go = go_1_20; jdk = openjdk11_headless; gn = gn1924; }; @@ -27342,7 +27345,6 @@ with pkgs; snipe-it = callPackage ../servers/web-apps/snipe-it { php = php81; - phpPackages = php81Packages; }; sogo = callPackage ../servers/web-apps/sogo { }; @@ -29021,6 +29023,8 @@ with pkgs; aileron = callPackage ../data/fonts/aileron { }; + alacritty-theme = callPackage ../data/themes/alacritty-theme { }; + albatross = callPackage ../data/themes/albatross { }; alegreya = callPackage ../data/fonts/alegreya { }; @@ -30082,6 +30086,7 @@ with pkgs; tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { inherit (gnome) adwaita-icon-theme; + inherit (libsForQt5) breeze-icons; }; tela-icon-theme = callPackage ../data/icons/tela-icon-theme { }; @@ -30525,8 +30530,6 @@ with pkgs; brutefir = callPackage ../applications/audio/brutefir { }; - cadence = libsForQt5.callPackage ../applications/audio/cadence { }; - cheesecutter = callPackage ../applications/audio/cheesecutter { }; cutecapture = callPackage ../applications/video/cutecapture { }; @@ -30754,8 +30757,6 @@ with pkgs; caerbannog = callPackage ../applications/misc/caerbannog { }; - cardboard = callPackage ../applications/window-managers/cardboard { }; - cardo = callPackage ../data/fonts/cardo { }; cage = callPackage ../applications/window-managers/cage { @@ -30872,10 +30873,6 @@ with pkgs; chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); - chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); - - chromiumDev = lowPrio (chromium.override { channel = "dev"; }); - chuck = callPackage ../applications/audio/chuck { inherit (darwin) DarwinTools; inherit (darwin.apple_sdk.frameworks) AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport; @@ -31048,6 +31045,8 @@ with pkgs; dablin = callPackage ../applications/radio/dablin { }; + daktilo = callPackage ../tools/misc/daktilo { }; + darcs = haskell.lib.compose.overrideCabal (drv: { configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }) (haskell.lib.compose.justStaticExecutables haskellPackages.darcs); @@ -31949,6 +31948,10 @@ with pkgs; flex-ndax = callPackage ../applications/radio/flex-ndax { }; + floorp-unwrapped = callPackage ../applications/networking/browsers/floorp { }; + + floorp = wrapFirefox floorp-unwrapped { }; + fluxbox = callPackage ../applications/window-managers/fluxbox { }; hackedbox = callPackage ../applications/window-managers/hackedbox { }; @@ -32270,10 +32273,6 @@ with pkgs; google-chrome = callPackage ../applications/networking/browsers/google-chrome { }; - google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; - - google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - go-graft = callPackage ../applications/networking/go-graft { }; gostatic = callPackage ../applications/misc/gostatic { }; @@ -32999,12 +32998,15 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { }; - k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { }; - inherit (callPackage ../applications/networking/cluster/k3s { }) - k3s_1_26 - k3s_1_27 - ; + k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { + buildGoModule = buildGo120Module; + }; + k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { + buildGoModule = buildGo120Module; + }; + inherit (callPackage ../applications/networking/cluster/k3s { + buildGoModule = buildGo120Module; + }) k3s_1_26 k3s_1_27; k3s = k3s_1_27; k3sup = callPackage ../applications/networking/cluster/k3sup { }; @@ -35454,6 +35456,8 @@ with pkgs; super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; + super-slicer-beta = super-slicer.beta; + super-slicer-latest = super-slicer.latest; snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; @@ -35682,7 +35686,9 @@ with pkgs; teams = callPackage ../applications/networking/instant-messengers/teams { }; - teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { }; + teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { + electron = electron_27; + }; teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { }; @@ -37556,6 +37562,8 @@ with pkgs; brogue = callPackage ../games/brogue { }; + brogue-ce = callPackage ../games/brogue-ce { }; + brutalmaze = callPackage ../games/brutalmaze { }; bsdgames = callPackage ../games/bsdgames { }; @@ -40557,11 +40565,7 @@ with pkgs; nixStatic = pkgsStatic.nix; - nixops = callPackage ../tools/package-management/nixops { }; - - nixops_unstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); - - nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; + nixops_unstable = callPackage ../applications/networking/cluster/nixops { }; /* Evaluate a NixOS configuration using this evaluation of Nixpkgs. @@ -41892,9 +41896,7 @@ with pkgs; stayrtr = callPackage ../servers/stayrtr { }; - sunshine = callPackage ../servers/sunshine { - ffmpeg_5-full = ffmpeg_5-full.override { nv-codec-headers = nv-codec-headers-11; }; - }; + sunshine = callPackage ../servers/sunshine { }; sentencepiece = callPackage ../development/libraries/sentencepiece { }; @@ -41945,7 +41947,7 @@ with pkgs; inherit (callPackage ../applications/misc/zettlr { texlive = texlive.combined.scheme-medium; - }) zettlr zettlr-beta; + }) zettlr; unpoller = callPackage ../servers/monitoring/unpoller { }; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 85383eca38e5b..a4bafcc71dd15 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -215,7 +215,7 @@ in { ../development/compilers/openjdk/21.nix ../development/compilers/zulu/21.nix { - openjdk21-bootstrap = temurin-bin.jdk-20; + openjdk21-bootstrap = temurin-bin.jdk-21; openjfx = openjfx21; }; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index c9d57a8d14706..4fa6c3064558b 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -84,6 +84,8 @@ let self = rec { orftvthek = callPackage ../applications/video/kodi/addons/orftvthek { }; + radioparadise = callPackage ../applications/video/kodi/addons/radioparadise { }; + svtplay = callPackage ../applications/video/kodi/addons/svtplay { }; steam-controller = callPackage ../applications/video/kodi/addons/steam-controller { }; @@ -92,6 +94,8 @@ let self = rec { steam-library = callPackage ../applications/video/kodi/addons/steam-library { }; + somafm = callPackage ../applications/video/kodi/addons/somafm { }; + pdfreader = callPackage ../applications/video/kodi/addons/pdfreader { }; pvr-hts = callPackage ../applications/video/kodi/addons/pvr-hts { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d796fa7164d04..e4b1133109f9d 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -178,6 +178,14 @@ in { ]; }; + linux_6_6 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.6"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { # A special branch that tracks the kernel under the release process @@ -573,6 +581,7 @@ in { linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5); + linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 @@ -633,7 +642,7 @@ in { packageAliases = { linux_default = packages.linux_6_1; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_5; + linux_latest = packages.linux_6_6; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_6_1; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0d7e6321d548f..5357761aa23f0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,6 +36,7 @@ mapAliases ({ abodepy = jaraco-abode; # added 2023-02-01 acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 + aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 amazon_kclpy = amazon-kclpy; # added 2023-08-08 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 @@ -128,6 +129,7 @@ mapAliases ({ eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 EasyProcess = easyprocess; # added 2023-02-19 email_validator = email-validator; # added 2022-06-22 + enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27 et_xmlfile = et-xmlfile; # added 2023-10-16 ev3dev2 = python-ev3dev2; # added 2023-06-19 Fabric = fabric; # addedd 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 774ffab03a2f9..2293e7c1643b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -304,8 +304,6 @@ self: super: with self; { aionanoleaf = callPackage ../development/python-modules/aionanoleaf { }; - aionotify = callPackage ../development/python-modules/aionotify { }; - aionotion = callPackage ../development/python-modules/aionotion { }; aiooncue = callPackage ../development/python-modules/aiooncue { }; @@ -2124,6 +2122,8 @@ self: super: with self; { cloudflare = callPackage ../development/python-modules/cloudflare { }; + cloudpathlib = callPackage ../development/python-modules/cloudpathlib { }; + cloudpickle = callPackage ../development/python-modules/cloudpickle { }; cloudscraper = callPackage ../development/python-modules/cloudscraper { }; @@ -2238,8 +2238,12 @@ self: super: with self; { compiledb = callPackage ../development/python-modules/compiledb { }; + complycube = callPackage ../development/python-modules/complycube { }; + compreffor = callPackage ../development/python-modules/compreffor { }; + compressai = callPackage ../development/python-modules/compressai { }; + concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { }; conda = callPackage ../development/python-modules/conda { }; @@ -2894,6 +2898,8 @@ self: super: with self; { django-allauth = callPackage ../development/python-modules/django-allauth { }; + django-allauth-2fa = callPackage ../development/python-modules/django-allauth-2fa { }; + django-anymail = callPackage ../development/python-modules/django-anymail { }; django-annoying = callPackage ../development/python-modules/django-annoying { }; @@ -3052,6 +3058,8 @@ self: super: with self; { django-prometheus = callPackage ../development/python-modules/django-prometheus { }; + django-pwa = callPackage ../development/python-modules/django-pwa { }; + django-q = callPackage ../development/python-modules/django-q { }; django-scheduler = callPackage ../development/python-modules/django-scheduler { }; @@ -3527,8 +3535,6 @@ self: super: with self; { energyzero = callPackage ../development/python-modules/energyzero { }; - enhancements = callPackage ../development/python-modules/enhancements { }; - enlighten = callPackage ../development/python-modules/enlighten { }; enocean = callPackage ../development/python-modules/enocean { }; @@ -4091,6 +4097,8 @@ self: super: with self; { flit-scm = callPackage ../development/python-modules/flit-scm { }; + floret = callPackage ../development/python-modules/floret { }; + flow-record = callPackage ../development/python-modules/flow-record { }; flower = callPackage ../development/python-modules/flower { }; @@ -5974,6 +5982,8 @@ self: super: with self; { krakenex = callPackage ../development/python-modules/krakenex { }; + krfzf-py = callPackage ../development/python-modules/krfzf-py { }; + kubernetes = callPackage ../development/python-modules/kubernetes { }; l18n = callPackage ../development/python-modules/l18n { }; @@ -11494,6 +11504,8 @@ self: super: with self; { python-olm = callPackage ../development/python-modules/python-olm { }; + python-on-whales = callPackage ../development/python-modules/python-on-whales { }; + python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { }; python-openstackclient = callPackage ../development/python-modules/python-openstackclient { }; @@ -11638,6 +11650,8 @@ self: super: with self; { pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + pytorch-msssim = callPackage ../development/python-modules/pytorch-msssim { }; + pytorch-pfn-extras = callPackage ../development/python-modules/pytorch-pfn-extras { }; pytraccar = callPackage ../development/python-modules/pytraccar { }; @@ -13681,16 +13695,62 @@ self: super: with self; { inherit (pkgs.config) cudaSupport; }; - tensorflow-build = callPackage ../development/python-modules/tensorflow { + tensorflow-build = let + compat = rec { + protobufTF = pkgs.protobuf3_21.override { + abseil-cpp = pkgs.abseil-cpp; + }; + grpcTF = (pkgs.grpc.overrideAttrs ( + oldAttrs: rec { + # nvcc fails on recent grpc versions, so we use the latest patch level + # of the grpc version bundled by upstream tensorflow to allow CUDA + # support + version = "1.27.3"; + src = pkgs.fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + hash = "sha256-PpiOT4ZJe1uMp5j+ReQulC9jpT0xoR2sAl6vRYKA0AA="; + fetchSubmodules = true; + }; + patches = [ ]; + postPatch = '' + sed -i "s/-std=c++11/-std=c++17/" CMakeLists.txt + echo "set(CMAKE_CXX_STANDARD 17)" >> CMakeLists.txt + ''; + }) + ).override { + protobuf = protobufTF; + }; + protobuf-pythonTF = self.protobuf.override { + protobuf = protobufTF; + }; + grpcioTF = self.grpcio.override { + protobuf = protobufTF; + grpc = grpcTF; + }; + tensorboard-plugin-profileTF = self.tensorboard-plugin-profile.override { + protobuf = protobuf-pythonTF; + }; + tensorboardTF = self.tensorboard.override { + grpcio = grpcioTF; + protobuf = protobuf-pythonTF; + tensorboard-plugin-profile = tensorboard-plugin-profileTF; + }; + }; + in + callPackage ../development/python-modules/tensorflow { inherit (pkgs.darwin) cctools; inherit (pkgs.config) cudaSupport; inherit (self.tensorflow-bin) cudaPackages; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; flatbuffers-core = pkgs.flatbuffers; flatbuffers-python = self.flatbuffers; - protobuf-core = pkgs.protobuf; - protobuf-python = self.protobuf; - lmdb-core = pkgs.lmdb; + protobuf-core = compat.protobufTF; + protobuf-python = compat.protobuf-pythonTF; + grpc = compat.grpcTF; + grpcio = compat.grpcioTF; + tensorboard = compat.tensorboardTF; }; tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { }; @@ -15488,6 +15548,8 @@ self: super: with self; { wcwidth = callPackage ../development/python-modules/wcwidth { }; + weasel = callPackage ../development/python-modules/weasel { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; weaviate-client = callPackage ../development/python-modules/weaviate-client { }; @@ -15604,6 +15666,8 @@ self: super: with self; { withings-api = callPackage ../development/python-modules/withings-api { }; + withings-sync = callPackage ../development/python-modules/withings-sync { }; + wktutils = callPackage ../development/python-modules/wktutils { }; wled = callPackage ../development/python-modules/wled { }; |