diff options
532 files changed, 20118 insertions, 8494 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a206164d668..f8278d1cbe4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -48,6 +48,8 @@ /pkgs/build-support/setup-hooks/auto-patchelf.sh @layus /pkgs/build-support/setup-hooks/auto-patchelf.py @layus /pkgs/pkgs-lib @infinisil +## Format generators/serializers +/pkgs/pkgs-lib/formats/libconfig @ckiee # pkgs/by-name /pkgs/test/nixpkgs-check-by-name @infinisil diff --git a/.github/ISSUE_TEMPLATE/unreproducible_package.md b/.github/ISSUE_TEMPLATE/unreproducible_package.md index 13988026f8d..8046e809a21 100644 --- a/.github/ISSUE_TEMPLATE/unreproducible_package.md +++ b/.github/ISSUE_TEMPLATE/unreproducible_package.md @@ -7,25 +7,81 @@ assignees: '' --- -Building this package twice does not produce the bit-by-bit identical result each time, making it harder to detect CI breaches. You can read more about this at https://reproducible-builds.org/ . +<!-- +Hello dear reporter, -Fixing bit-by-bit reproducibility also has additional advantages, such as avoiding hard-to-reproduce bugs, making content-addressed storage more effective and reducing rebuilds in such systems. +Thank you for bringing attention to this issue. Your insights are valuable to +us, and we appreciate the time you took to document the problem. + +I wanted to kindly point out that in this issue template, it would be beneficial +to replace the placeholder `<package>` with the actual, canonical name of the +package you're reporting the issue for. Doing so will provide better context and +facilitate quicker troubleshooting for anyone who reads this issue in the +future. + +Best regards +--> + +Building this package multiple times does not yield bit-by-bit identical +results, complicating the detection of Continuous Integration (CI) breaches. For +more information on this issue, visit +[reproducible-builds.org](https://reproducible-builds.org/). + +Fixing bit-by-bit reproducibility also has additional advantages, such as +avoiding hard-to-reproduce bugs, making content-addressed storage more effective +and reducing rebuilds in such systems. ### Steps To Reproduce +In the following steps, replace `<package>` with the canonical name of the +package. + +#### 1. Build the package + +This step will build the package. Specific arguments are passed to the command +to keep the build artifacts so we can compare them in case of differences. + +Execute the following command: + ``` -nix-build '<nixpkgs>' -A ... && nix-build '<nixpkgs>' -A ... --check --keep-failed +nix-build '<nixpkgs>' -A <package> && nix-build '<nixpkgs>' -A <package> --check --keep-failed ``` -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. +Or using the new command line style: + +``` +nix build nixpkgs#<package> && nix build nixpkgs#<package> --rebuild --keep-failed +``` + +#### 2. Compare the build artifacts + +If the previous command completes successfully, no differences were found and +there's nothing to do, builds are reproducible. +If it terminates with the error message `error: derivation '<X>' may not be +deterministic: output '<Y>' differs from '<Z>'`, use `diffoscope` to investigate +the discrepancies between the two build outputs. You may need to add the +`--exclude-directory-metadata recursive` option to ignore files and directories +metadata (*e.g. timestamp*) differences. + +``` +nix run nixpkgs#diffoscopeMinimal -- --exclude-directory-metadata recursive <Y> <Z> +``` + +#### 3. Examine the build log + +To examine the build log, use: + +``` +nix-store --read-log $(nix-instantiate '<nixpkgs>' -A <package>) +``` -To view the build log of the build that produced the artifact in the binary cache: +Or with the new command line style: ``` -nix-store --read-log $(nix-instantiate '<nixpkgs>' -A ...) +nix log $(nix path-info --derivation nixpkgs#<package>) ``` ### Additional context -(please share the relevant fragment of the diffoscope output here, -and any additional analysis you may have done) +(please share the relevant fragment of the diffoscope output here, and any +additional analysis you may have done) diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index a4c81daa54b..777e94c16f1 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -38,6 +38,24 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under - Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example `scheme-basic`, into the combination. +- TeX Live packages are also available under `texlive.pkgs` as derivations with outputs `out`, `tex`, `texdoc`, `texsource`, `tlpkg`, `man`, `info`. They cannot be installed outside of `texlive.combine` but are available for other uses. To repackage a font, for instance, use + + ```nix + stdenvNoCC.mkDerivation rec { + src = texlive.pkgs.iwona; + + inherit (src) pname version; + + installPhase = '' + runHook preInstall + install -Dm644 fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype + runHook postInstall + ''; + } + ``` + + See `biber`, `iwona` for complete examples. + ## Custom packages {#sec-language-texlive-custom-packages} You may find that you need to use an external TeX package. A derivation for such package has to provide the contents of the "texmf" directory in its output and provide the appropriate `tlType` attribute (one of `"run"`, `"bin"`, `"doc"`, `"source"`). Dependencies on other TeX packages can be listed in the attribute `tlDeps`. diff --git a/lib/fileset/README.md b/lib/fileset/README.md index ebe13f08fde..16ab58e2f26 100644 --- a/lib/fileset/README.md +++ b/lib/fileset/README.md @@ -225,6 +225,9 @@ Arguments: This use case makes little sense for files that are already in the store. This should be a separate abstraction as e.g. `pkgs.drvLayout` instead, which could have a similar interface but be specific to derivations. Additional capabilities could be supported that can't be done at evaluation time, such as renaming files, creating new directories, setting executable bits, etc. +- (+) An API for filtering/transforming Nix store paths could be much more powerful, + because it's not limited to just what is possible at evaluation time with `builtins.path`. + Operations such as moving and adding files would be supported. ### Single files diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index 0342be3e037..4a97633b4a8 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -9,6 +9,7 @@ let _fileFilter _printFileset _intersection + _difference ; inherit (builtins) @@ -369,6 +370,58 @@ If a directory does not recursively contain any file, it is omitted from the sto (elemAt filesets 1); /* + The file set containing all files from the first file set that are not in the second file set. + See also [Difference (set theory)](https://en.wikipedia.org/wiki/Complement_(set_theory)#Relative_complement). + + The given file sets are evaluated as lazily as possible, + with the first argument being evaluated first if needed. + + Type: + union :: FileSet -> FileSet -> FileSet + + Example: + # Create a file set containing all files from the current directory, + # except ones under ./tests + difference ./. ./tests + + let + # A set of Nix-related files + nixFiles = unions [ ./default.nix ./nix ./tests/default.nix ]; + in + # Create a file set containing all files under ./tests, except ones in `nixFiles`, + # meaning only without ./tests/default.nix + difference ./tests nixFiles + */ + difference = + # The positive file set. + # The result can only contain files that are also in this file set. + # + # This argument can also be a path, + # which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + positive: + # The negative file set. + # The result will never contain files that are also in this file set. + # + # This argument can also be a path, + # which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + negative: + let + filesets = _coerceMany "lib.fileset.difference" [ + { + context = "first argument (positive set)"; + value = positive; + } + { + context = "second argument (negative set)"; + value = negative; + } + ]; + in + _difference + (elemAt filesets 0) + (elemAt filesets 1); + + /* Incrementally evaluate and trace a file set in a pretty way. This function is only intended for debugging purposes. The exact tracing format is unspecified and may change. diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index 76b95c6ae47..b919a5de3ee 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -651,6 +651,86 @@ rec { # In all other cases it's the rhs rhs; + # Compute the set difference between two file sets. + # The filesets must already be coerced and validated to be in the same filesystem root. + # Type: Fileset -> Fileset -> Fileset + _difference = positive: negative: + let + # The common base components prefix, e.g. + # (/foo/bar, /foo/bar/baz) -> /foo/bar + # (/foo/bar, /foo/baz) -> /foo + commonBaseComponentsLength = + # TODO: Have a `lib.lists.commonPrefixLength` function such that we don't need the list allocation from commonPrefix here + length ( + commonPrefix + positive._internalBaseComponents + negative._internalBaseComponents + ); + + # We need filesetTree's with the same base to be able to compute the difference between them + # This here is the filesetTree from the negative file set, but for a base path that matches the positive file set. + # Examples: + # For `difference /foo /foo/bar`, `negativeTreeWithPositiveBase = { bar = "directory"; }` + # because under the base path of `/foo`, only `bar` from the negative file set is included + # For `difference /foo/bar /foo`, `negativeTreeWithPositiveBase = "directory"` + # because under the base path of `/foo/bar`, everything from the negative file set is included + # For `difference /foo /bar`, `negativeTreeWithPositiveBase = null` + # because under the base path of `/foo`, nothing from the negative file set is included + negativeTreeWithPositiveBase = + if commonBaseComponentsLength == length positive._internalBaseComponents then + # The common prefix is the same as the positive base path, so the second path is equal or longer. + # We need to _shorten_ the negative filesetTree to the same base path as the positive one + # E.g. for `difference /foo /foo/bar` the common prefix is /foo, equal to the positive file set's base + # So we need to shorten the base of the tree for the negative argument from /foo/bar to just /foo + _shortenTreeBase positive._internalBaseComponents negative + else if commonBaseComponentsLength == length negative._internalBaseComponents then + # The common prefix is the same as the negative base path, so the first path is longer. + # We need to lengthen the negative filesetTree to the same base path as the positive one. + # E.g. for `difference /foo/bar /foo` the common prefix is /foo, equal to the negative file set's base + # So we need to lengthen the base of the tree for the negative argument from /foo to /foo/bar + _lengthenTreeBase positive._internalBaseComponents negative + else + # The common prefix is neither the first nor the second path. + # This means there's no overlap between the two file sets, + # and nothing from the negative argument should get removed from the positive one + # E.g for `difference /foo /bar`, we remove nothing to get the same as `/foo` + null; + + resultingTree = + _differenceTree + positive._internalBase + positive._internalTree + negativeTreeWithPositiveBase; + in + # If the first file set is empty, we can never have any files in the result + if positive._internalIsEmptyWithoutBase then + _emptyWithoutBase + # If the second file set is empty, nothing gets removed, so the result is just the first file set + else if negative._internalIsEmptyWithoutBase then + positive + else + # We use the positive file set base for the result, + # because only files from the positive side may be included, + # which is what base path is for + _create positive._internalBase resultingTree; + + # Computes the set difference of two filesetTree's + # Type: Path -> filesetTree -> filesetTree + _differenceTree = path: lhs: rhs: + # If the lhs doesn't have any files, or the right hand side includes all files + if lhs == null || isString rhs then + # The result will always be empty + null + # If the right hand side has no files + else if rhs == null then + # The result is always the left hand side, because nothing gets removed + lhs + else + # Otherwise we always have two attribute sets to recurse into + mapAttrs (name: lhsValue: + _differenceTree (path + "/${name}") lhsValue (rhs.${name} or null) + ) (_directoryEntries path lhs); + _fileFilter = predicate: fileset: let recurse = path: tree: diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh index 5b756b8fc59..2df0727bde3 100755 --- a/lib/fileset/tests.sh +++ b/lib/fileset/tests.sh @@ -684,6 +684,104 @@ tree=( ) checkFileset 'intersection (unions [ ./a/b ./c/d ./c/e ]) (unions [ ./a ./c/d/f ./c/e ])' +## Difference + +# Subtracting something from itself results in nothing +tree=( + [a]=0 +) +checkFileset 'difference ./. ./.' + +# The tree of the second argument should not be evaluated if not needed +checkFileset 'difference _emptyWithoutBase (_create ./. (abort "This should not be used!"))' +checkFileset 'difference (_create ./. null) (_create ./. (abort "This should not be used!"))' + +# Subtracting nothing gives the same thing back +tree=( + [a]=1 +) +checkFileset 'difference ./. _emptyWithoutBase' +checkFileset 'difference ./. (_create ./. null)' + +# Subtracting doesn't influence the base path +mkdir a b +touch {a,b}/x +expectEqual 'toSource { root = ./a; fileset = difference ./a ./b; }' 'toSource { root = ./a; fileset = ./a; }' +rm -rf -- * + +# Also not the other way around +mkdir a +expectFailure 'toSource { root = ./a; fileset = difference ./. ./a; }' '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 -- * + +# Difference actually works +# We test all combinations of ./., ./a, ./a/x and ./b +tree=( + [a/x]=0 + [a/y]=0 + [b]=0 + [c]=0 +) +checkFileset 'difference ./. ./.' +checkFileset 'difference ./a ./.' +checkFileset 'difference ./a/x ./.' +checkFileset 'difference ./b ./.' +checkFileset 'difference ./a ./a' +checkFileset 'difference ./a/x ./a' +checkFileset 'difference ./a/x ./a/x' +checkFileset 'difference ./b ./b' +tree=( + [a/x]=0 + [a/y]=0 + [b]=1 + [c]=1 +) +checkFileset 'difference ./. ./a' +tree=( + [a/x]=1 + [a/y]=1 + [b]=0 + [c]=0 +) +checkFileset 'difference ./a ./b' +tree=( + [a/x]=1 + [a/y]=0 + [b]=0 + [c]=0 +) +checkFileset 'difference ./a/x ./b' +tree=( + [a/x]=0 + [a/y]=1 + [b]=0 + [c]=0 +) +checkFileset 'difference ./a ./a/x' +tree=( + [a/x]=0 + [a/y]=0 + [b]=1 + [c]=0 +) +checkFileset 'difference ./b ./a' +checkFileset 'difference ./b ./a/x' +tree=( + [a/x]=0 + [a/y]=1 + [b]=1 + [c]=1 +) +checkFileset 'difference ./. ./a/x' +tree=( + [a/x]=1 + [a/y]=1 + [b]=0 + [c]=1 +) +checkFileset 'difference ./. ./b' ## File filter diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 3444e95e15a..3b5fdc9e8ea 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -45,7 +45,7 @@ rec { } ``` - This is where `fix` comes in, it contains the syntactic that's not in `f` anymore. + This is where `fix` comes in, it contains the syntactic recursion that's not in `f` anymore. ```nix nix-repl> fix = f: diff --git a/lib/meta.nix b/lib/meta.nix index 44730a71551..2e817c42327 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -162,5 +162,12 @@ rec { getExe' pkgs.imagemagick "convert" => "/nix/store/5rs48jamq7k6sal98ymj9l4k2bnwq515-imagemagick-7.1.1-15/bin/convert" */ - getExe' = x: y: "${lib.getBin x}/bin/${y}"; + getExe' = x: y: + assert lib.assertMsg (lib.isDerivation x) + "lib.meta.getExe': The first argument is of type ${builtins.typeOf x}, but it should be a derivation instead."; + assert lib.assertMsg (lib.isString y) + "lib.meta.getExe': The second argument is of type ${builtins.typeOf y}, but it should be a string instead."; + assert lib.assertMsg (builtins.length (lib.splitString "/" y) == 1) + "lib.meta.getExe': The second argument \"${y}\" is a nested path with a \"/\" character, but it should just be the name of the executable instead."; + "${lib.getBin x}/bin/${y}"; } diff --git a/lib/tests/filesystem.sh b/lib/tests/filesystem.sh index cfd333d0001..7e7e03bc667 100755 --- a/lib/tests/filesystem.sh +++ b/lib/tests/filesystem.sh @@ -64,8 +64,14 @@ expectSuccess "pathType $PWD/directory" '"directory"' expectSuccess "pathType $PWD/regular" '"regular"' expectSuccess "pathType $PWD/symlink" '"symlink"' expectSuccess "pathType $PWD/fifo" '"unknown"' -# Different errors depending on whether the builtins.readFilePath primop is available or not -expectFailure "pathType $PWD/non-existent" "error: (evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'|getting status of '$PWD/non-existent': No such file or directory)" + +# Only check error message when a Nixpkgs-specified error is thrown, +# which is only the case when `readFileType` is not available +# and the fallback implementation needs to be used. +if [[ "$(nix-instantiate --eval --expr 'builtins ? readFileType')" == false ]]; then + expectFailure "pathType $PWD/non-existent" \ + "error: evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'" +fi expectSuccess "pathIsDirectory /." "true" expectSuccess "pathIsDirectory $PWD/directory" "true" diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 2e7fda2b1f8..47853f47278 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -1906,4 +1906,32 @@ runTests { expr = (with types; either int (listOf (either bool str))).description; expected = "signed integer or list of (boolean or string)"; }; + +# Meta + testGetExe'Output = { + expr = getExe' { + type = "derivation"; + out = "somelonghash"; + bin = "somelonghash"; + } "executable"; + expected = "somelonghash/bin/executable"; + }; + + testGetExeOutput = { + expr = getExe { + type = "derivation"; + out = "somelonghash"; + bin = "somelonghash"; + meta.mainProgram = "mainProgram"; + }; + expected = "somelonghash/bin/mainProgram"; + }; + + testGetExe'FailureFirstArg = testingThrow ( + getExe' "not a derivation" "executable" + ); + + testGetExe'FailureSecondArg = testingThrow ( + getExe' { type = "derivation"; } "dir/executable" + ); } diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a9dcb0b64e4..a970f9363a6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -446,6 +446,13 @@ githubId = 25236206; name = "Adrian Dole"; }; + adriangl = { + email = "adrian@lauterer.it"; + matrix = "@adriangl:pvv.ntnu.no"; + github = "adrlau"; + githubId = 25004152; + name = "Adrian Gunnar Lauterer"; + }; AdsonCicilioti = { name = "Adson Cicilioti"; email = "adson.cicilioti@live.com"; @@ -3048,6 +3055,9 @@ email = "chayleaf-nix@pavluk.org"; github = "chayleaf"; githubId = 9590981; + keys = [{ + fingerprint = "4314 3701 154D 9E5F 7051 7ECF 7817 1AD4 6227 E68E"; + }]; matrix = "@chayleaf:matrix.pavluk.org"; name = "Anna Pavlyuk"; }; @@ -5969,6 +5979,11 @@ githubId = 119691; name = "Michael Gough"; }; + franciscod = { + github = "franciscod"; + githubId = 726447; + name = "Francisco Demartino"; + }; franzmondlichtmann = { name = "Franz Schroepf"; email = "franz-schroepf@t-online.de"; @@ -6111,7 +6126,7 @@ }; fugi = { email = "me@fugi.dev"; - github = "FugiMuffi"; + github = "fugidev"; githubId = 21362942; name = "Fugi"; }; @@ -6478,6 +6493,12 @@ githubId = 1713676; name = "Luis G. Torres"; }; + giomf = { + email = "giomf@mailbox.org"; + github = "giomf"; + githubId = 35076723; + name = "Guillaume Fournier"; + }; giorgiga = { email = "giorgio.gallo@bitnic.it"; github = "giorgiga"; @@ -12111,6 +12132,14 @@ github = "MrTarantoga"; githubId = 53876219; }; + mrtnvgr = { + name = "Egor Martynov"; + github = "mrtnvgr"; + githubId = 48406064; + keys = [{ + fingerprint = "6FAD DB43 D5A5 FE52 6835 0943 5B33 79E9 81EF 48B1"; + }]; + }; mrVanDalo = { email = "contact@ingolf-wagner.de"; github = "mrVanDalo"; @@ -17144,6 +17173,12 @@ githubId = 7075751; name = "Patrick Hilhorst"; }; + sysedwinistrator = { + email = "edwin.mowen@gmail.com"; + github = "sysedwinistrator"; + githubId = 71331875; + name = "Edwin Mackenzie-Owen"; + }; szczyp = { email = "qb@szczyp.com"; github = "Szczyp"; @@ -18862,6 +18897,13 @@ fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862"; }]; }; + wamirez = { + email = "wamirez@protonmail.com"; + matrix = "@wamirez:matrix.org"; + github = "wamirez"; + githubId = 24505474; + name = "Daniel Ramirez"; + }; wamserma = { name = "Markus S. Wamser"; email = "github-dev@mail2013.wamser.eu"; diff --git a/nixos/modules/image/repart.md b/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md index 6d0675f21a0..6d0675f21a0 100644 --- a/nixos/modules/image/repart.md +++ b/nixos/doc/manual/installation/building-images-via-systemd-repart.chapter.md diff --git a/nixos/doc/manual/installation/installation.md b/nixos/doc/manual/installation/installation.md index 14059425660..f3b1773d865 100644 --- a/nixos/doc/manual/installation/installation.md +++ b/nixos/doc/manual/installation/installation.md @@ -8,4 +8,5 @@ installing.chapter.md changing-config.chapter.md upgrading.chapter.md building-nixos.chapter.md +building-images-via-systemd-repart.chapter.md ``` diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 74d29ab1cf9..11da28aac34 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -38,6 +38,8 @@ true`. This is generally safe behavior, but for anyone needing to opt out from the check `users.users.${USERNAME}.ignoreShellProgramCheck = true` will do the job. +- Cassandra now defaults to 4.x, updated from 3.11.x. + ## New Services {#sec-release-23.11-new-services} - [MCHPRS](https://github.com/MCHPR/MCHPRS), a multithreaded Minecraft server built for redstone. Available as [services.mchprs](#opt-services.mchprs.enable). @@ -72,6 +74,8 @@ - [LibreNMS](https://www.librenms.org), a auto-discovering PHP/MySQL/SNMP based network monitoring. Available as [services.librenms](#opt-services.librenms.enable). +- [Livebook](https://livebook.dev/), an interactive notebook with support for Elixir, graphs, machine learning, and more. + - [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable). - [stalwart-mail](https://stalw.art), an all-in-one email server (SMTP, IMAP, JMAP). Available as [services.stalwart-mail](#opt-services.stalwart-mail.enable). @@ -337,6 +341,8 @@ - `service.borgmatic.settings.location` and `services.borgmatic.configurations.<name>.location` are deprecated, please move your options out of sections to the global scope. +- `privacyidea` (and the corresponding `privacyidea-ldap-proxy`) has been removed from nixpkgs because it has severely outdated dependencies that became unmaintainable with nixpkgs' python package-set. + - `dagger` was removed because using a package called `dagger` and packaging it from source violates their trademark policy. - `win-virtio` package was renamed to `virtio-win` to be consistent with the upstream package name. @@ -407,6 +413,8 @@ - `services.hedgedoc` has been heavily refactored, reducing the amount of declared options in the module. Most of the options should still work without any changes. Some options have been deprecated, as they no longer have any effect. See [#244941](https://github.com/NixOS/nixpkgs/pull/244941) for more details. +- The [services.woodpecker-server](#opt-services.woodpecker-server.environmentFile) type was changed to list of paths to be more consistent to the woodpecker-agent module + - The module [services.ankisyncd](#opt-services.ankisyncd.package) has been switched to [anki-sync-server-rs](https://github.com/ankicommunity/anki-sync-server-rs) from the old python version, which was difficult to update, had not been updated in a while, and did not support recent versions of anki. Unfortunately all servers supporting new clients (newer version of anki-sync-server, anki's built in sync server and this new rust package) do not support the older sync protocol that was used in the old server, so such old clients will also need updating and in particular the anki package in nixpkgs is also being updated in this release. The module update takes care of the new config syntax and the data itself (user login and cards) are compatible, so users of the module will be able to just log in again after updating both client and server without any extra action. @@ -488,10 +496,14 @@ The module update takes care of the new config syntax and the data itself (user If you use this feature, updates to CoreDNS may require updating `vendorHash` by following these steps again. +- `postgresql_11` has been removed since it'll stop receiving fixes on November 9 2023. + - `ffmpeg` default upgraded from `ffmpeg_5` to `ffmpeg_6`. - `fusuma` now enables the following plugins: [appmatcher](https://github.com/iberianpig/fusuma-plugin-appmatcher), [keypress](https://github.com/iberianpig/fusuma-plugin-keypress), [sendkey](https://github.com/iberianpig/fusuma-plugin-sendkey), [tap](https://github.com/iberianpig/fusuma-plugin-tap) and [wmctrl](https://github.com/iberianpig/fusuma-plugin-wmctrl). +- `services.bitcoind` now properly respects the `enable` option. + ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} - The use of `sourceRoot = "source";`, `sourceRoot = "source/subdir";`, and similar lines in package derivations using the default `unpackPhase` is deprecated as it requires `unpackPhase` to always produce a directory named "source". Use `sourceRoot = src.name`, `sourceRoot = "${src.name}/subdir";`, or `setSourceRoot = "sourceRoot=$(echo */subdir)";` or similar instead. diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 5669aae0bc1..7b600464bb4 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -20,12 +20,16 @@ in rec { pkgs.runCommand "unit-${mkPathSafeName name}" { preferLocalBuild = true; allowSubstitutes = false; - inherit (unit) text; + # unit.text can be null. But variables that are null listed in + # passAsFile are ignored by nix, resulting in no file being created, + # making the mv operation fail. + text = optionalString (unit.text != null) unit.text; + passAsFile = [ "text" ]; } '' name=${shellEscape name} mkdir -p "$out/$(dirname -- "$name")" - echo -n "$text" > "$out/$name" + mv "$textPath" "$out/$name" '' else pkgs.runCommand "unit-${mkPathSafeName name}-disabled" diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index 4abc846b085..a7ca7a5c74a 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -98,8 +98,7 @@ in nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault ""); systemd.tmpfiles.rules = lib.mkIf cfg.channel.enable [ - "f /root/.nix-channels -" - ''w "/root/.nix-channels" - - - - "${config.system.defaultChannel} nixos\n"'' + ''f /root/.nix-channels - - - - ${config.system.defaultChannel} nixos\n'' ]; }; } diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix index e567485c9d3..41e6110885b 100644 --- a/nixos/modules/image/repart.nix +++ b/nixos/modules/image/repart.nix @@ -34,12 +34,13 @@ let }; }); default = { }; - example = lib.literalExpression '' { - "/EFI/BOOT/BOOTX64.EFI".source = - "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; + example = lib.literalExpression '' + { + "/EFI/BOOT/BOOTX64.EFI".source = + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; - "/loader/entries/nixos.conf".source = systemdBootEntry; - } + "/loader/entries/nixos.conf".source = systemdBootEntry; + } ''; description = lib.mdDoc "The contents to end up in the filesystem image."; }; @@ -90,34 +91,33 @@ in package = lib.mkPackageOption pkgs "systemd-repart" { default = "systemd"; - example = lib.literalExpression '' - pkgs.systemdMinimal.override { withCryptsetup = true; } - ''; + example = "pkgs.systemdMinimal.override { withCryptsetup = true; }"; }; partitions = lib.mkOption { type = with lib.types; attrsOf (submodule partitionOptions); default = { }; - example = lib.literalExpression '' { - "10-esp" = { - contents = { - "/EFI/BOOT/BOOTX64.EFI".source = - "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; - } - repartConfig = { - Type = "esp"; - Format = "fat"; + example = lib.literalExpression '' + { + "10-esp" = { + contents = { + "/EFI/BOOT/BOOTX64.EFI".source = + "''${pkgs.systemd}/lib/systemd/boot/efi/systemd-bootx64.efi"; + } + repartConfig = { + Type = "esp"; + Format = "fat"; + }; }; - }; - "20-root" = { - storePaths = [ config.system.build.toplevel ]; - repartConfig = { - Type = "root"; - Format = "ext4"; - Minimize = "guess"; + "20-root" = { + storePaths = [ config.system.build.toplevel ]; + repartConfig = { + Type = "root"; + Format = "ext4"; + Minimize = "guess"; + }; }; }; - }; ''; description = lib.mdDoc '' Specify partitions as a set of the names of the partitions with their @@ -208,10 +208,7 @@ in | tee repart-output.json ''; - meta = { - maintainers = with lib.maintainers; [ nikstur ]; - doc = ./repart.md; - }; + meta.maintainers = with lib.maintainers; [ nikstur ]; }; } diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index 8426ba8fac0..bc70dc985fe 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -3,8 +3,6 @@ { config, lib, pkgs, ... }: -with lib; - let # This is copied into the installer image, so it's important that it is filtered # to avoid including a large .git directory. @@ -27,38 +25,40 @@ let if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs fi - ${optionalString (config.system.nixos.revision != null) '' + ${lib.optionalString (config.system.nixos.revision != null) '' echo -n ${config.system.nixos.revision} > $out/nixos/.git-revision ''} echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix echo ${config.system.nixos.versionSuffix} | sed -e s/pre// > $out/nixos/svn-revision ''; - in { - # Pin the nixpkgs flake in the installer to our cleaned up nixpkgs source. - # FIXME: this might be surprising and is really only needed for offline installations, - # see discussion in https://github.com/NixOS/nixpkgs/pull/204178#issuecomment-1336289021 - nix.registry.nixpkgs.to = { - type = "path"; - path = "${channelSources}/nixos"; - }; + options.system.installer.channel.enable = (lib.mkEnableOption "bundling NixOS/Nixpkgs channel in the installer") // { default = true; }; + config = lib.mkIf config.system.installer.channel.enable { + # Pin the nixpkgs flake in the installer to our cleaned up nixpkgs source. + # FIXME: this might be surprising and is really only needed for offline installations, + # see discussion in https://github.com/NixOS/nixpkgs/pull/204178#issuecomment-1336289021 + nix.registry.nixpkgs.to = { + type = "path"; + path = "${channelSources}/nixos"; + }; - # Provide the NixOS/Nixpkgs sources in /etc/nixos. This is required - # for nixos-install. - boot.postBootCommands = mkAfter - '' - if ! [ -e /var/lib/nixos/did-channel-init ]; then - echo "unpacking the NixOS/Nixpkgs sources..." - mkdir -p /nix/var/nix/profiles/per-user/root - ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \ - -i ${channelSources} --quiet --option build-use-substitutes false \ - ${optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root - mkdir -m 0700 -p /root/.nix-defexpr - ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels - mkdir -m 0755 -p /var/lib/nixos - touch /var/lib/nixos/did-channel-init - fi - ''; + # Provide the NixOS/Nixpkgs sources in /etc/nixos. This is required + # for nixos-install. + boot.postBootCommands = lib.mkAfter + '' + if ! [ -e /var/lib/nixos/did-channel-init ]; then + echo "unpacking the NixOS/Nixpkgs sources..." + mkdir -p /nix/var/nix/profiles/per-user/root + ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \ + -i ${channelSources} --quiet --option build-use-substitutes false \ + ${lib.optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root + mkdir -m 0700 -p /root/.nix-defexpr + ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels + mkdir -m 0755 -p /var/lib/nixos + touch /var/lib/nixos/did-channel-init + fi + ''; + }; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bfac651f5a8..2a6ca202024 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -485,6 +485,7 @@ ./services/development/hoogle.nix ./services/development/jupyter/default.nix ./services/development/jupyterhub/default.nix + ./services/development/livebook.nix ./services/development/lorri.nix ./services/development/rstudio-server/default.nix ./services/development/zammad.nix @@ -1175,7 +1176,6 @@ ./services/security/opensnitch.nix ./services/security/pass-secret-service.nix ./services/security/physlock.nix - ./services/security/privacyidea.nix ./services/security/shibboleth-sp.nix ./services/security/sks.nix ./services/security/sshguard.nix @@ -1530,5 +1530,9 @@ ./virtualisation/waydroid.nix ./virtualisation/xe-guest-utilities.nix ./virtualisation/xen-dom0.nix - { documentation.nixos.extraModules = [ ./virtualisation/qemu-vm.nix ]; } + { documentation.nixos.extraModules = [ + ./virtualisation/qemu-vm.nix + ./image/repart.nix + ]; + } ] diff --git a/nixos/modules/programs/direnv.nix b/nixos/modules/programs/direnv.nix index 77a6568e73b..2566fa7699b 100644 --- a/nixos/modules/programs/direnv.nix +++ b/nixos/modules/programs/direnv.nix @@ -54,7 +54,7 @@ in { }; imports = [ - (lib.mkRemovedOptionModule ["programs" "direnv" "persistDerivations"] "persistDerivations was removed as it is on longer necessary") + (lib.mkRemovedOptionModule ["programs" "direnv" "persistDerivations"] "persistDerivations was removed as it is no longer necessary") ]; config = lib.mkIf cfg.enable { diff --git a/nixos/modules/services/backup/postgresql-wal-receiver.nix b/nixos/modules/services/backup/postgresql-wal-receiver.nix index 01fd57f5c50..773dc0ba447 100644 --- a/nixos/modules/services/backup/postgresql-wal-receiver.nix +++ b/nixos/modules/services/backup/postgresql-wal-receiver.nix @@ -7,7 +7,7 @@ let options = { postgresqlPackage = mkOption { type = types.package; - example = literalExpression "pkgs.postgresql_11"; + example = literalExpression "pkgs.postgresql_15"; description = lib.mdDoc '' PostgreSQL package to use. ''; @@ -124,7 +124,7 @@ in { example = literalExpression '' { main = { - postgresqlPackage = pkgs.postgresql_11; + postgresqlPackage = pkgs.postgresql_15; directory = /mnt/pg_wal/main/; slot = "main_wal_receiver"; connection = "postgresql://user@somehost"; diff --git a/nixos/modules/services/continuous-integration/woodpecker/server.nix b/nixos/modules/services/continuous-integration/woodpecker/server.nix index cae5ed7cf11..dc8f1567f1e 100644 --- a/nixos/modules/services/continuous-integration/woodpecker/server.nix +++ b/nixos/modules/services/continuous-integration/woodpecker/server.nix @@ -31,8 +31,8 @@ in description = lib.mdDoc "woodpecker-server config environment variables, for other options read the [documentation](https://woodpecker-ci.org/docs/administration/server-config)"; }; environmentFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; + type = with lib.types; coercedTo path (f: [ f ]) (listOf path); + default = [ ]; example = "/root/woodpecker-server.env"; description = lib.mdDoc '' File to load environment variables @@ -61,7 +61,7 @@ in StateDirectoryMode = "0700"; UMask = "0007"; ConfigurationDirectory = "woodpecker-server"; - EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile; + EnvironmentFile = cfg.environmentFile; ExecStart = "${cfg.package}/bin/woodpecker-server"; Restart = "on-failure"; RestartSec = 15; diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 4d66ee38be4..e4b679a3eee 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -17,9 +17,9 @@ PostgreSQL is an advanced, free relational database. To enable PostgreSQL, add the following to your {file}`configuration.nix`: ``` services.postgresql.enable = true; -services.postgresql.package = pkgs.postgresql_11; +services.postgresql.package = pkgs.postgresql_15; ``` -Note that you are required to specify the desired version of PostgreSQL (e.g. `pkgs.postgresql_11`). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for [](#opt-services.postgresql.package) such as the most recent release of PostgreSQL. +Note that you are required to specify the desired version of PostgreSQL (e.g. `pkgs.postgresql_15`). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for [](#opt-services.postgresql.package) such as the most recent release of PostgreSQL. <!-- After running {command}`nixos-rebuild`, you can verify @@ -119,27 +119,27 @@ A complete list of options for the PostgreSQL module may be found [here](#opt-se ## Plugins {#module-services-postgres-plugins} -Plugins collection for each PostgreSQL version can be accessed with `.pkgs`. For example, for `pkgs.postgresql_11` package, its plugin collection is accessed by `pkgs.postgresql_11.pkgs`: +Plugins collection for each PostgreSQL version can be accessed with `.pkgs`. For example, for `pkgs.postgresql_15` package, its plugin collection is accessed by `pkgs.postgresql_15.pkgs`: ```ShellSession $ nix repl '<nixpkgs>' Loading '<nixpkgs>'... Added 10574 variables. -nix-repl> postgresql_11.pkgs.<TAB><TAB> -postgresql_11.pkgs.cstore_fdw postgresql_11.pkgs.pg_repack -postgresql_11.pkgs.pg_auto_failover postgresql_11.pkgs.pg_safeupdate -postgresql_11.pkgs.pg_bigm postgresql_11.pkgs.pg_similarity -postgresql_11.pkgs.pg_cron postgresql_11.pkgs.pg_topn -postgresql_11.pkgs.pg_hll postgresql_11.pkgs.pgjwt -postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga +nix-repl> postgresql_15.pkgs.<TAB><TAB> +postgresql_15.pkgs.cstore_fdw postgresql_15.pkgs.pg_repack +postgresql_15.pkgs.pg_auto_failover postgresql_15.pkgs.pg_safeupdate +postgresql_15.pkgs.pg_bigm postgresql_15.pkgs.pg_similarity +postgresql_15.pkgs.pg_cron postgresql_15.pkgs.pg_topn +postgresql_15.pkgs.pg_hll postgresql_15.pkgs.pgjwt +postgresql_15.pkgs.pg_partman postgresql_15.pkgs.pgroonga ... ``` To add plugins via NixOS configuration, set `services.postgresql.extraPlugins`: ``` -services.postgresql.package = pkgs.postgresql_11; -services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ +services.postgresql.package = pkgs.postgresql_12; +services.postgresql.extraPlugins = with pkgs.postgresql_12.pkgs; [ pg_repack postgis ]; @@ -148,7 +148,7 @@ services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function `.withPackages`. For example, creating a custom PostgreSQL package in an overlay can look like: ``` self: super: { - postgresql_custom = self.postgresql_11.withPackages (ps: [ + postgresql_custom = self.postgresql_12.withPackages (ps: [ ps.pg_repack ps.postgis ]); @@ -158,9 +158,9 @@ self: super: { Here's a recipe on how to override a particular plugin through an overlay: ``` self: super: { - postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // { - pkgs = super.postgresql_11.pkgs // { - pg_repack = super.postgresql_11.pkgs.pg_repack.overrideAttrs (_: { + postgresql_15 = super.postgresql_15.override { this = self.postgresql_15; } // { + pkgs = super.postgresql_15.pkgs // { + pg_repack = super.postgresql_15.pkgs.pg_repack.overrideAttrs (_: { name = "pg_repack-v20181024"; src = self.fetchzip { url = "https://github.com/reorg/pg_repack/archive/923fa2f3c709a506e111cc963034bf2fd127aa00.tar.gz"; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 2d4ef056318..21e6a60e32a 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -55,7 +55,7 @@ in package = mkOption { type = types.package; - example = literalExpression "pkgs.postgresql_11"; + example = literalExpression "pkgs.postgresql_15"; description = lib.mdDoc '' PostgreSQL package to use. ''; @@ -78,7 +78,7 @@ in dataDir = mkOption { type = types.path; defaultText = literalExpression ''"/var/lib/postgresql/''${config.services.postgresql.package.psqlSchema}"''; - example = "/var/lib/postgresql/11"; + example = "/var/lib/postgresql/15"; description = lib.mdDoc '' The data directory for PostgreSQL. If left as the default value this directory will automatically be created before the PostgreSQL server starts, otherwise @@ -387,7 +387,7 @@ in extraPlugins = mkOption { type = types.listOf types.path; default = []; - example = literalExpression "with pkgs.postgresql_11.pkgs; [ postgis pg_repack ]"; + example = literalExpression "with pkgs.postgresql_15.pkgs; [ postgis pg_repack ]"; description = lib.mdDoc '' List of PostgreSQL plugins. PostgreSQL version for each plugin should match version for `services.postgresql.package` value. @@ -399,7 +399,7 @@ in default = {}; description = lib.mdDoc '' PostgreSQL configuration. Refer to - <https://www.postgresql.org/docs/11/config-setting.html#CONFIG-SETTING-CONFIGURATION-FILE> + <https://www.postgresql.org/docs/15/config-setting.html#CONFIG-SETTING-CONFIGURATION-FILE> for an overview of `postgresql.conf`. ::: {.note} @@ -461,7 +461,7 @@ in base = if versionAtLeast config.system.stateVersion "23.11" then pkgs.postgresql_15 else if versionAtLeast config.system.stateVersion "22.05" then pkgs.postgresql_14 else if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13 - else if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 + else if versionAtLeast config.system.stateVersion "20.03" then mkThrow "11" else if versionAtLeast config.system.stateVersion "17.09" then mkThrow "9_6" else mkThrow "9_5"; in diff --git a/nixos/modules/services/development/livebook.md b/nixos/modules/services/development/livebook.md new file mode 100644 index 00000000000..73ddc57f617 --- /dev/null +++ b/nixos/modules/services/development/livebook.md @@ -0,0 +1,39 @@ +# Livebook {#module-services-livebook} + +[Livebook](https://livebook.dev/) is a web application for writing +interactive and collaborative code notebooks. + +## Basic Usage {#module-services-livebook-basic-usage} + +Enabling the `livebook` service creates a user +[`systemd`](https://www.freedesktop.org/wiki/Software/systemd/) unit +which runs the server. + +``` +{ ... }: + +{ + services.livebook = { + enableUserService = true; + port = 20123; + # See note below about security + environmentFile = pkgs.writeText "livebook.env" '' + LIVEBOOK_PASSWORD = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + ''; + }; +} +``` + +::: {.note} + +The Livebook server has the ability to run any command as the user it +is running under, so securing access to it with a password is highly +recommended. + +Putting the password in the Nix configuration like above is an easy +way to get started but it is not recommended in the real world because +the `livebook.env` file will be added to the world-readable Nix store. +A better approach would be to put the password in some secure +user-readable location and set `environmentFile = /home/user/secure/livebook.env`. + +::: diff --git a/nixos/modules/services/development/livebook.nix b/nixos/modules/services/development/livebook.nix new file mode 100644 index 00000000000..3991a4125ec --- /dev/null +++ b/nixos/modules/services/development/livebook.nix @@ -0,0 +1,90 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.livebook; +in +{ + options.services.livebook = { + # Since livebook doesn't have a granular permission system (a user + # either has access to all the data or none at all), the decision + # was made to run this as a user service. If that changes in the + # future, this can be changed to a system service. + enableUserService = mkEnableOption "a user service for Livebook"; + + environmentFile = mkOption { + type = types.path; + description = lib.mdDoc '' + Environment file as defined in {manpage}`systemd.exec(5)` passed to the service. + + This must contain at least `LIVEBOOK_PASSWORD` or + `LIVEBOOK_TOKEN_ENABLED=false`. See `livebook server --help` + for other options.''; + }; + + erlang_node_short_name = mkOption { + type = with types; nullOr str; + default = null; + example = "livebook"; + description = "A short name for the distributed node."; + }; + + erlang_node_name = mkOption { + type = with types; nullOr str; + default = null; + example = "livebook@127.0.0.1"; + description = "The name for the app distributed node."; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = "The port to start the web application on."; + }; + + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = lib.mdDoc '' + The address to start the web application on. Must be a valid IPv4 or + IPv6 address. + ''; + }; + + options = mkOption { + type = with types; attrsOf str; + default = { }; + description = lib.mdDoc '' + Additional options to pass as command-line arguments to the server. + ''; + example = literalExpression '' + { + cookie = "a value shared by all nodes in this cluster"; + } + ''; + }; + }; + + config = mkIf cfg.enableUserService { + systemd.user.services.livebook = { + serviceConfig = { + Restart = "always"; + EnvironmentFile = cfg.environmentFile; + ExecStart = + let + args = lib.cli.toGNUCommandLineShell { } ({ + inherit (cfg) port; + ip = cfg.address; + name = cfg.erlang_node_name; + sname = cfg.erlang_node_short_name; + } // cfg.options); + in + "${pkgs.livebook}/bin/livebook server ${args}"; + }; + path = [ pkgs.bash ]; + wantedBy = [ "default.target" ]; + }; + }; + + meta.doc = ./livebook.md; +} diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 0e6fa65667a..789b06af19b 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -455,6 +455,7 @@ in { "govee_ble" "homekit_controller" "inkbird" + "improv_ble" "keymitt_ble" "led_ble" "medcom_ble" diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 9b8bd62809c..1e0a8d0f928 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -332,12 +332,28 @@ in # during migrations bindsTo = [ "paperless-scheduler.service" ]; after = [ "paperless-scheduler.service" ]; + # Setup PAPERLESS_SECRET_KEY. + # If this environment variable is left unset, paperless-ngx defaults + # to a well-known value, which is insecure. + script = let + secretKeyFile = "${cfg.dataDir}/nixos-paperless-secret-key"; + in '' + if [[ ! -f '${secretKeyFile}' ]]; then + ( + umask 0377 + tr -dc A-Za-z0-9 < /dev/urandom | head -c64 | ${pkgs.moreutils}/bin/sponge '${secretKeyFile}' + ) + fi + export PAPERLESS_SECRET_KEY=$(cat '${secretKeyFile}') + if [[ ! $PAPERLESS_SECRET_KEY ]]; then + echo "PAPERLESS_SECRET_KEY is empty, refusing to start." + exit 1 + fi + exec ${pkg.python.pkgs.gunicorn}/bin/gunicorn \ + -c ${pkg}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application + ''; serviceConfig = defaultServiceConfig // { User = cfg.user; - ExecStart = '' - ${pkg.python.pkgs.gunicorn}/bin/gunicorn \ - -c ${pkg}/lib/paperless-ngx/gunicorn.conf.py paperless.asgi:application - ''; Restart = "on-failure"; # gunicorn needs setuid, liblapack needs mbind @@ -349,7 +365,6 @@ in CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; }; environment = env // { - PATH = mkForce pkg.path; PYTHONPATH = "${pkg.python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/lib/paperless-ngx/src"; }; # Allow the web interface to access the private /tmp directory of the server. diff --git a/nixos/modules/services/monitoring/grafana-image-renderer.nix b/nixos/modules/services/monitoring/grafana-image-renderer.nix index 36258866646..afe9eb4d7b9 100644 --- a/nixos/modules/services/monitoring/grafana-image-renderer.nix +++ b/nixos/modules/services/monitoring/grafana-image-renderer.nix @@ -108,7 +108,7 @@ in { services.grafana.settings.rendering = mkIf cfg.provisionGrafana { server_url = "http://localhost:${toString cfg.settings.service.port}/render"; - callback_url = "http://localhost:${toString config.services.grafana.settings.server.http_port}"; + callback_url = "http://${config.services.grafana.settings.server.http_addr}:${toString config.services.grafana.settings.server.http_port}"; }; services.grafana-image-renderer.chromium = mkDefault pkgs.chromium; diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix index a86d52b7202..a48066b43b1 100644 --- a/nixos/modules/services/networking/bitcoind.nix +++ b/nixos/modules/services/networking/bitcoind.nix @@ -3,8 +3,7 @@ with lib; let - - eachBitcoind = config.services.bitcoind; + eachBitcoind = filterAttrs (bitcoindName: cfg: cfg.enable) config.services.bitcoind; rpcUserOpts = { name, ... }: { options = { diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix deleted file mode 100644 index 664335cb58e..00000000000 --- a/nixos/modules/services/security/privacyidea.nix +++ /dev/null @@ -1,458 +0,0 @@ -{ config, lib, options, pkgs, ... }: - -with lib; - -let - cfg = config.services.privacyidea; - opt = options.services.privacyidea; - - uwsgi = pkgs.uwsgi.override { plugins = [ "python3" ]; python3 = pkgs.python310; }; - python = uwsgi.python3; - penv = python.withPackages (const [ pkgs.privacyidea ]); - logCfg = pkgs.writeText "privacyidea-log.cfg" '' - [formatters] - keys=detail - - [handlers] - keys=stream - - [formatter_detail] - class=privacyidea.lib.log.SecureFormatter - format=[%(asctime)s][%(process)d][%(thread)d][%(levelname)s][%(name)s:%(lineno)d] %(message)s - - [handler_stream] - class=StreamHandler - level=NOTSET - formatter=detail - args=(sys.stdout,) - - [loggers] - keys=root,privacyidea - - [logger_privacyidea] - handlers=stream - qualname=privacyidea - level=INFO - - [logger_root] - handlers=stream - level=ERROR - ''; - - piCfgFile = pkgs.writeText "privacyidea.cfg" '' - SUPERUSER_REALM = [ '${concatStringsSep "', '" cfg.superuserRealm}' ] - SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2:///privacyidea' - SECRET_KEY = '${cfg.secretKey}' - PI_PEPPER = '${cfg.pepper}' - PI_ENCFILE = '${cfg.encFile}' - PI_AUDIT_KEY_PRIVATE = '${cfg.auditKeyPrivate}' - PI_AUDIT_KEY_PUBLIC = '${cfg.auditKeyPublic}' - PI_LOGCONFIG = '${logCfg}' - ${cfg.extraConfig} - ''; - - renderValue = x: - if isList x then concatMapStringsSep "," (x: ''"${x}"'') x - else if isString x && hasInfix "," x then ''"${x}"'' - else x; - - ldapProxyConfig = pkgs.writeText "ldap-proxy.ini" - (generators.toINI {} - (flip mapAttrs cfg.ldap-proxy.settings - (const (mapAttrs (const renderValue))))); - - privacyidea-token-janitor = pkgs.writeShellScriptBin "privacyidea-token-janitor" '' - exec -a privacyidea-token-janitor \ - /run/wrappers/bin/sudo -u ${cfg.user} \ - env PRIVACYIDEA_CONFIGFILE=${cfg.stateDir}/privacyidea.cfg \ - ${penv}/bin/privacyidea-token-janitor $@ - ''; -in - -{ - options = { - services.privacyidea = { - enable = mkEnableOption (lib.mdDoc "PrivacyIDEA"); - - environmentFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/root/privacyidea.env"; - description = lib.mdDoc '' - File to load as environment file. Environment variables - from this file will be interpolated into the config file - using `envsubst` which is helpful for specifying - secrets: - ``` - { services.privacyidea.secretKey = "$SECRET"; } - ``` - - The environment-file can now specify the actual secret key: - ``` - SECRET=veryverytopsecret - ``` - ''; - }; - - stateDir = mkOption { - type = types.str; - default = "/var/lib/privacyidea"; - description = lib.mdDoc '' - Directory where all PrivacyIDEA files will be placed by default. - ''; - }; - - superuserRealm = mkOption { - type = types.listOf types.str; - default = [ "super" "administrators" ]; - description = lib.mdDoc '' - The realm where users are allowed to login as administrators. - ''; - }; - - secretKey = mkOption { - type = types.str; - example = "t0p s3cr3t"; - description = lib.mdDoc '' - This is used to encrypt the auth_token. - ''; - }; - - pepper = mkOption { - type = types.str; - example = "Never know..."; - description = lib.mdDoc '' - This is used to encrypt the admin passwords. - ''; - }; - - encFile = mkOption { - type = types.str; - default = "${cfg.stateDir}/enckey"; - defaultText = literalExpression ''"''${config.${opt.stateDir}}/enckey"''; - description = lib.mdDoc '' - This is used to encrypt the token data and token passwords - ''; - }; - - auditKeyPrivate = mkOption { - type = types.str; - default = "${cfg.stateDir}/private.pem"; - defaultText = literalExpression ''"''${config.${opt.stateDir}}/private.pem"''; - description = lib.mdDoc '' - Private Key for signing the audit log. - ''; - }; - - auditKeyPublic = mkOption { - type = types.str; - default = "${cfg.stateDir}/public.pem"; - defaultText = literalExpression ''"''${config.${opt.stateDir}}/public.pem"''; - description = lib.mdDoc '' - Public key for checking signatures of the audit log. - ''; - }; - - adminPasswordFile = mkOption { - type = types.path; - description = lib.mdDoc "File containing password for the admin user"; - }; - - adminEmail = mkOption { - type = types.str; - example = "admin@example.com"; - description = lib.mdDoc "Mail address for the admin user"; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = lib.mdDoc '' - Extra configuration options for pi.cfg. - ''; - }; - - user = mkOption { - type = types.str; - default = "privacyidea"; - description = lib.mdDoc "User account under which PrivacyIDEA runs."; - }; - - group = mkOption { - type = types.str; - default = "privacyidea"; - description = lib.mdDoc "Group account under which PrivacyIDEA runs."; - }; - - tokenjanitor = { - enable = mkEnableOption (lib.mdDoc "automatic runs of the token janitor"); - interval = mkOption { - default = "quarterly"; - type = types.str; - description = lib.mdDoc '' - Interval in which the cleanup program is supposed to run. - See {manpage}`systemd.time(7)` for further information. - ''; - }; - action = mkOption { - type = types.enum [ "delete" "mark" "disable" "unassign" ]; - description = lib.mdDoc '' - Which action to take for matching tokens. - ''; - }; - unassigned = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - Whether to search for **unassigned** tokens - and apply [](#opt-services.privacyidea.tokenjanitor.action) - onto them. - ''; - }; - orphaned = mkOption { - default = true; - type = types.bool; - description = lib.mdDoc '' - Whether to search for **orphaned** tokens - and apply [](#opt-services.privacyidea.tokenjanitor.action) - onto them. - ''; - }; - }; - - ldap-proxy = { - enable = mkEnableOption (lib.mdDoc "PrivacyIDEA LDAP Proxy"); - - configFile = mkOption { - type = types.nullOr types.path; - default = null; - description = lib.mdDoc '' - Path to PrivacyIDEA LDAP Proxy configuration (proxy.ini). - ''; - }; - - user = mkOption { - type = types.str; - default = "pi-ldap-proxy"; - description = lib.mdDoc "User account under which PrivacyIDEA LDAP proxy runs."; - }; - - group = mkOption { - type = types.str; - default = "pi-ldap-proxy"; - description = lib.mdDoc "Group account under which PrivacyIDEA LDAP proxy runs."; - }; - - settings = mkOption { - type = with types; attrsOf (attrsOf (oneOf [ str bool int (listOf str) ])); - default = {}; - description = lib.mdDoc '' - Attribute-set containing the settings for `privacyidea-ldap-proxy`. - It's possible to pass secrets using env-vars as substitutes and - use the option [](#opt-services.privacyidea.ldap-proxy.environmentFile) - to inject them via `envsubst`. - ''; - }; - - environmentFile = mkOption { - default = null; - type = types.nullOr types.str; - description = lib.mdDoc '' - Environment file containing secrets to be substituted into - [](#opt-services.privacyidea.ldap-proxy.settings). - ''; - }; - }; - }; - }; - - config = mkMerge [ - - (mkIf cfg.enable { - - assertions = [ - { - assertion = cfg.tokenjanitor.enable -> (cfg.tokenjanitor.orphaned || cfg.tokenjanitor.unassigned); - message = '' - privacyidea-token-janitor has no effect if neither orphaned nor unassigned tokens - are to be searched. - ''; - } - ]; - - environment.systemPackages = [ pkgs.privacyidea (hiPrio privacyidea-token-janitor) ]; - - services.postgresql.enable = mkDefault true; - - systemd.services.privacyidea-tokenjanitor = mkIf cfg.tokenjanitor.enable { - environment.PRIVACYIDEA_CONFIGFILE = "${cfg.stateDir}/privacyidea.cfg"; - path = [ penv ]; - serviceConfig = { - CapabilityBoundingSet = [ "" ]; - ExecStart = "${pkgs.writeShellScript "pi-token-janitor" '' - ${optionalString cfg.tokenjanitor.orphaned '' - echo >&2 "Removing orphaned tokens..." - privacyidea-token-janitor find \ - --orphaned true \ - --action ${cfg.tokenjanitor.action} - ''} - ${optionalString cfg.tokenjanitor.unassigned '' - echo >&2 "Removing unassigned tokens..." - privacyidea-token-janitor find \ - --assigned false \ - --action ${cfg.tokenjanitor.action} - ''} - ''}"; - Group = cfg.group; - LockPersonality = true; - MemoryDenyWriteExecute = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectSystem = "strict"; - ReadWritePaths = cfg.stateDir; - Type = "oneshot"; - User = cfg.user; - WorkingDirectory = cfg.stateDir; - }; - }; - systemd.timers.privacyidea-tokenjanitor = mkIf cfg.tokenjanitor.enable { - wantedBy = [ "timers.target" ]; - timerConfig.OnCalendar = cfg.tokenjanitor.interval; - timerConfig.Persistent = true; - }; - - systemd.services.privacyidea = let - piuwsgi = pkgs.writeText "uwsgi.json" (builtins.toJSON { - uwsgi = { - buffer-size = 8192; - plugins = [ "python3" ]; - pythonpath = "${penv}/${uwsgi.python3.sitePackages}"; - socket = "/run/privacyidea/socket"; - uid = cfg.user; - gid = cfg.group; - chmod-socket = 770; - chown-socket = "${cfg.user}:nginx"; - chdir = cfg.stateDir; - wsgi-file = "${penv}/etc/privacyidea/privacyideaapp.wsgi"; - processes = 4; - harakiri = 60; - reload-mercy = 8; - stats = "/run/privacyidea/stats.socket"; - max-requests = 2000; - limit-as = 1024; - reload-on-as = 512; - reload-on-rss = 256; - no-orphans = true; - vacuum = true; - }; - }); - in { - wantedBy = [ "multi-user.target" ]; - after = [ "postgresql.service" ]; - path = with pkgs; [ openssl ]; - environment.PRIVACYIDEA_CONFIGFILE = "${cfg.stateDir}/privacyidea.cfg"; - preStart = let - pi-manage = "${config.security.sudo.package}/bin/sudo -u privacyidea -HE ${penv}/bin/pi-manage"; - pgsu = config.services.postgresql.superUser; - psql = config.services.postgresql.package; - in '' - mkdir -p ${cfg.stateDir} /run/privacyidea - chown ${cfg.user}:${cfg.group} -R ${cfg.stateDir} /run/privacyidea - umask 077 - ${lib.getBin pkgs.envsubst}/bin/envsubst -o ${cfg.stateDir}/privacyidea.cfg \ - -i "${piCfgFile}" - chown ${cfg.user}:${cfg.group} ${cfg.stateDir}/privacyidea.cfg - if ! test -e "${cfg.stateDir}/db-created"; then - ${config.security.sudo.package}/bin/sudo -u ${pgsu} ${psql}/bin/createuser --no-superuser --no-createdb --no-createrole ${cfg.user} - ${config.security.sudo.package}/bin/sudo -u ${pgsu} ${psql}/bin/createdb --owner ${cfg.user} privacyidea - ${pi-manage} create_enckey - ${pi-manage} create_audit_keys - ${pi-manage} createdb - ${pi-manage} admin add admin -e ${cfg.adminEmail} -p "$(cat ${cfg.adminPasswordFile})" - ${pi-manage} db stamp head -d ${penv}/lib/privacyidea/migrations - touch "${cfg.stateDir}/db-created" - chmod g+r "${cfg.stateDir}/enckey" "${cfg.stateDir}/private.pem" - fi - ${pi-manage} db upgrade -d ${penv}/lib/privacyidea/migrations - ''; - serviceConfig = { - Type = "notify"; - ExecStart = "${uwsgi}/bin/uwsgi --json ${piuwsgi}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; - ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; - NotifyAccess = "main"; - KillSignal = "SIGQUIT"; - }; - }; - - users.users.privacyidea = mkIf (cfg.user == "privacyidea") { - group = cfg.group; - isSystemUser = true; - }; - - users.groups.privacyidea = mkIf (cfg.group == "privacyidea") {}; - }) - - (mkIf cfg.ldap-proxy.enable { - - assertions = [ - { assertion = let - xor = a: b: a && !b || !a && b; - in xor (cfg.ldap-proxy.settings == {}) (cfg.ldap-proxy.configFile == null); - message = "configFile & settings are mutually exclusive for services.privacyidea.ldap-proxy!"; - } - ]; - - warnings = mkIf (cfg.ldap-proxy.configFile != null) [ - "Using services.privacyidea.ldap-proxy.configFile is deprecated! Use the RFC42-style settings option instead!" - ]; - - systemd.services.privacyidea-ldap-proxy = let - ldap-proxy-env = pkgs.python3.withPackages (ps: [ ps.privacyidea-ldap-proxy ]); - in { - description = "privacyIDEA LDAP proxy"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - User = cfg.ldap-proxy.user; - Group = cfg.ldap-proxy.group; - StateDirectory = "privacyidea-ldap-proxy"; - EnvironmentFile = mkIf (cfg.ldap-proxy.environmentFile != null) - [ cfg.ldap-proxy.environmentFile ]; - ExecStartPre = - "${pkgs.writeShellScript "substitute-secrets-ldap-proxy" '' - umask 0077 - ${pkgs.envsubst}/bin/envsubst \ - -i ${ldapProxyConfig} \ - -o $STATE_DIRECTORY/ldap-proxy.ini - ''}"; - ExecStart = let - configPath = if cfg.ldap-proxy.settings != {} - then "%S/privacyidea-ldap-proxy/ldap-proxy.ini" - else cfg.ldap-proxy.configFile; - in '' - ${ldap-proxy-env}/bin/twistd \ - --nodaemon \ - --pidfile= \ - -u ${cfg.ldap-proxy.user} \ - -g ${cfg.ldap-proxy.group} \ - ldap-proxy \ - -c ${configPath} - ''; - Restart = "always"; - }; - }; - - users.users.pi-ldap-proxy = mkIf (cfg.ldap-proxy.user == "pi-ldap-proxy") { - group = cfg.ldap-proxy.group; - isSystemUser = true; - }; - - users.groups.pi-ldap-proxy = mkIf (cfg.ldap-proxy.group == "pi-ldap-proxy") {}; - }) - ]; - -} diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 17e170c33de..a2246761141 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -352,6 +352,7 @@ in { }; storage = { tmp = lib.mkDefault "/var/lib/peertube/storage/tmp/"; + tmp_persistent = lib.mkDefault "/var/lib/peertube/storage/tmp_persistent/"; bin = lib.mkDefault "/var/lib/peertube/storage/bin/"; avatars = lib.mkDefault "/var/lib/peertube/storage/avatars/"; videos = lib.mkDefault "/var/lib/peertube/storage/videos/"; @@ -521,6 +522,21 @@ in { ''; }; + locations."~ ^/api/v1/runners/jobs/[^/]+/(update|success)$" = { + tryFiles = "/dev/null @api"; + root = cfg.settings.storage.tmp; + priority = 1135; + + extraConfig = '' + client_max_body_size 12G; + add_header X-File-Maximum-Size 8G always; + '' + lib.optionalString cfg.enableWebHttps '' + add_header Strict-Transport-Security 'max-age=63072000; includeSubDomains'; + '' + lib.optionalString config.services.nginx.virtualHosts.${cfg.localDomain}.http3 '' + add_header Alt-Svc 'h3=":443"; ma=86400'; + ''; + }; + locations."~ ^/api/v1/(videos|video-playlists|video-channels|users/me)" = { tryFiles = "/dev/null @api"; priority = 1140; @@ -607,72 +623,33 @@ in { ''; }; - locations."^~ /lazy-static/avatars/" = { - tryFiles = "$uri @api"; - root = cfg.settings.storage.avatars; - priority = 1330; - extraConfig = '' - if ($request_method = 'OPTIONS') { - ${nginxCommonHeaders} - add_header Access-Control-Max-Age 1728000; - add_header Cache-Control 'no-cache'; - add_header Content-Type 'text/plain charset=UTF-8'; - add_header Content-Length 0; - return 204; - } - - ${nginxCommonHeaders} - add_header Cache-Control 'public, max-age=7200'; - - rewrite ^/lazy-static/avatars/(.*)$ /$1 break; - ''; - }; - - locations."^~ /lazy-static/banners/" = { - tryFiles = "$uri @api"; - root = cfg.settings.storage.avatars; - priority = 1340; + locations."^~ /download/" = { + proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}"; + priority = 1410; extraConfig = '' - if ($request_method = 'OPTIONS') { - ${nginxCommonHeaders} - add_header Access-Control-Max-Age 1728000; - add_header Cache-Control 'no-cache'; - add_header Content-Type 'text/plain charset=UTF-8'; - add_header Content-Length 0; - return 204; - } - - ${nginxCommonHeaders} - add_header Cache-Control 'public, max-age=7200'; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; - rewrite ^/lazy-static/banners/(.*)$ /$1 break; + proxy_limit_rate 5M; ''; }; - locations."^~ /lazy-static/previews/" = { - tryFiles = "$uri @api"; - root = cfg.settings.storage.previews; - priority = 1350; + locations."^~ /static/streaming-playlists/private/" = { + proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}"; + priority = 1420; extraConfig = '' - if ($request_method = 'OPTIONS') { - ${nginxCommonHeaders} - add_header Access-Control-Max-Age 1728000; - add_header Cache-Control 'no-cache'; - add_header Content-Type 'text/plain charset=UTF-8'; - add_header Content-Length 0; - return 204; - } - - ${nginxCommonHeaders} - add_header Cache-Control 'public, max-age=7200'; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; - rewrite ^/lazy-static/previews/(.*)$ /$1 break; + proxy_limit_rate 5M; ''; }; - locations."^~ /static/streaming-playlists/private/" = { + locations."^~ /static/web-videos/private/" = { proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}"; - priority = 1410; + priority = 1430; extraConfig = '' proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $host; @@ -684,7 +661,7 @@ in { locations."^~ /static/webseed/private/" = { proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}"; - priority = 1420; + priority = 1440; extraConfig = '' proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $host; @@ -694,31 +671,45 @@ in { ''; }; - locations."^~ /static/thumbnails/" = { + locations."^~ /static/redundancy/" = { tryFiles = "$uri @api"; - root = cfg.settings.storage.thumbnails; - priority = 1430; + root = cfg.settings.storage.redundancy; + priority = 1450; extraConfig = '' + set $peertube_limit_rate 800k; + + if ($request_uri ~ -fragmented.mp4$) { + set $peertube_limit_rate 5M; + } + if ($request_method = 'OPTIONS') { ${nginxCommonHeaders} add_header Access-Control-Max-Age 1728000; - add_header Cache-Control 'no-cache'; add_header Content-Type 'text/plain charset=UTF-8'; add_header Content-Length 0; return 204; } + if ($request_method = 'GET') { + ${nginxCommonHeaders} + + access_log off; + } - ${nginxCommonHeaders} - add_header Cache-Control 'public, max-age=7200'; + aio threads; + sendfile on; + sendfile_max_chunk 1M; + + limit_rate $peertube_limit_rate; + limit_rate_after 5M; - rewrite ^/static/thumbnails/(.*)$ /$1 break; + rewrite ^/static/redundancy/(.*)$ /$1 break; ''; }; - locations."^~ /static/redundancy/" = { + locations."^~ /static/streaming-playlists/" = { tryFiles = "$uri @api"; - root = cfg.settings.storage.redundancy; - priority = 1440; + root = cfg.settings.storage.streaming_playlists; + priority = 1460; extraConfig = '' set $peertube_limit_rate 800k; @@ -746,14 +737,14 @@ in { limit_rate $peertube_limit_rate; limit_rate_after 5M; - rewrite ^/static/redundancy/(.*)$ /$1 break; + rewrite ^/static/streaming-playlists/(.*)$ /$1 break; ''; }; - locations."^~ /static/streaming-playlists/" = { + locations."^~ /static/web-videos/" = { tryFiles = "$uri @api"; root = cfg.settings.storage.streaming_playlists; - priority = 1450; + priority = 1470; extraConfig = '' set $peertube_limit_rate 800k; @@ -788,7 +779,7 @@ in { locations."^~ /static/webseed/" = { tryFiles = "$uri @api"; root = cfg.settings.storage.videos; - priority = 1460; + priority = 1480; extraConfig = '' set $peertube_limit_rate 800k; diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 71f5d7a752c..65e97d53724 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -239,6 +239,26 @@ let mkService = name: container: let dependsOn = map (x: "${cfg.backend}-${x}.service") container.dependsOn; escapedName = escapeShellArg name; + preStartScript = pkgs.writeShellApplication { + name = "pre-start"; + runtimeInputs = [ ]; + text = '' + ${cfg.backend} rm -f ${name} || true + ${optionalString (isValidLogin container.login) '' + cat ${container.login.passwordFile} | \ + ${cfg.backend} login \ + ${container.login.registry} \ + --username ${container.login.username} \ + --password-stdin + ''} + ${optionalString (container.imageFile != null) '' + ${cfg.backend} load -i ${container.imageFile} + ''} + ${optionalString (cfg.backend == "podman") '' + rm -f /run/podman-${escapedName}.ctr-id + ''} + ''; + }; in { wantedBy = [] ++ optional (container.autoStart) "multi-user.target"; after = lib.optionals (cfg.backend == "docker") [ "docker.service" "docker.socket" ] @@ -253,23 +273,6 @@ let else if cfg.backend == "podman" then [ config.virtualisation.podman.package ] else throw "Unhandled backend: ${cfg.backend}"; - preStart = '' - ${cfg.backend} rm -f ${name} || true - ${optionalString (isValidLogin container.login) '' - cat ${container.login.passwordFile} | \ - ${cfg.backend} login \ - ${container.login.registry} \ - --username ${container.login.username} \ - --password-stdin - ''} - ${optionalString (container.imageFile != null) '' - ${cfg.backend} load -i ${container.imageFile} - ''} - ${optionalString (cfg.backend == "podman") '' - rm -f /run/podman-${escapedName}.ctr-id - ''} - ''; - script = concatStringsSep " \\\n " ([ "exec ${cfg.backend} run" "--rm" @@ -318,7 +321,7 @@ let ### # ExecReload = ...; ### - + ExecStartPre = [ "${preStartScript}/bin/pre-start" ]; TimeoutStartSec = 0; TimeoutStopSec = 120; Restart = "always"; diff --git a/nixos/tests/activation/nix-channel.nix b/nixos/tests/activation/nix-channel.nix index 8416ff0347a..d26ea98e56c 100644 --- a/nixos/tests/activation/nix-channel.nix +++ b/nixos/tests/activation/nix-channel.nix @@ -10,7 +10,17 @@ nix.channel.enable = true; }; - testScript = '' - print(machine.succeed("cat /root/.nix-channels")) + testScript = { nodes, ... }: '' + machine.start(allow_reboot=True) + + assert machine.succeed("cat /root/.nix-channels") == "${nodes.machine.system.defaultChannel} nixos\n" + + nixpkgs_unstable_channel = "https://nixos.org/channels/nixpkgs-unstable nixpkgs" + machine.succeed(f"echo '{nixpkgs_unstable_channel}' > /root/.nix-channels") + + machine.reboot() + + assert machine.succeed("cat /root/.nix-channels") == f"{nixpkgs_unstable_channel}\n" ''; + } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2f6d5a8dae8..f7f8ac8fec8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -306,6 +306,7 @@ in { forgejo = handleTest ./forgejo.nix { }; freenet = handleTest ./freenet.nix {}; freeswitch = handleTest ./freeswitch.nix {}; + freetube = discoverTests (import ./freetube.nix); freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; freshrss-pgsql = handleTest ./freshrss-pgsql.nix {}; frigate = handleTest ./frigate.nix {}; @@ -371,6 +372,7 @@ in { honk = runTest ./honk.nix; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); invidious = handleTest ./invidious.nix {}; + livebook-service = handleTest ./livebook-service.nix {}; oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {}; odoo = handleTest ./odoo.nix {}; odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; }; @@ -571,7 +573,6 @@ in { nginx-njs = handleTest ./nginx-njs.nix {}; nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {}; nginx-pubhtml = handleTest ./nginx-pubhtml.nix {}; - nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nginx-status-page = handleTest ./nginx-status-page.nix {}; nginx-tmpdir = handleTest ./nginx-tmpdir.nix {}; @@ -683,7 +684,6 @@ in { predictable-interface-names = handleTest ./predictable-interface-names.nix {}; printing-socket = handleTest ./printing.nix { socket = true; }; printing-service = handleTest ./printing.nix { socket = false; }; - privacyidea = handleTest ./privacyidea.nix {}; privoxy = handleTest ./privoxy.nix {}; prometheus = handleTest ./prometheus.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix index 2a138923190..7637b55a2b1 100644 --- a/nixos/tests/cinnamon.nix +++ b/nixos/tests/cinnamon.nix @@ -14,27 +14,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { testScript = { nodes, ... }: let user = nodes.machine.users.users.alice; - uid = toString user.uid; - bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus"; - display = "DISPLAY=:0.0"; - env = "${bus} ${display}"; - gdbus = "${env} gdbus"; + env = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus DISPLAY=:0"; su = command: "su - ${user.name} -c '${env} ${command}'"; # Call javascript in cinnamon (the shell), returns a tuple (success, output), # where `success` is true if the dbus call was successful and `output` is what # the javascript evaluates to. - eval = "call --session -d org.Cinnamon -o /org/Cinnamon -m org.Cinnamon.Eval"; - - # Should be 2 (RunState.RUNNING) when startup is done. - # https://github.com/linuxmint/cinnamon/blob/5.4.0/js/ui/main.js#L183-L187 - getRunState = su "${gdbus} ${eval} Main.runState"; - - # Start gnome-terminal. - gnomeTerminalCommand = su "gnome-terminal"; - - # Hopefully gnome-terminal's wm class. - wmClass = su "${gdbus} ${eval} global.display.focus_window.wm_class"; + eval = name: su "gdbus call --session -d org.Cinnamon -o /org/Cinnamon -m org.Cinnamon.Eval ${name}"; in '' machine.wait_for_unit("display-manager.service") @@ -54,13 +40,43 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("Wait for the Cinnamon shell"): # Correct output should be (true, '2') - machine.wait_until_succeeds("${getRunState} | grep -q 'true,..2'") + # https://github.com/linuxmint/cinnamon/blob/5.4.0/js/ui/main.js#L183-L187 + machine.wait_until_succeeds("${eval "Main.runState"} | grep -q 'true,..2'") + + with subtest("Check if Cinnamon components actually start"): + for i in ["csd-media-keys", "cinnamon-killer-daemon", "xapp-sn-watcher", "nemo-desktop"]: + machine.wait_until_succeeds(f"pgrep -f {i}") + machine.wait_until_succeeds("journalctl -b --grep 'Loaded applet menu@cinnamon.org'") + machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'") + + with subtest("Open Cinnamon Settings"): + machine.succeed("${su "cinnamon-settings themes >&2 &"}") + machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'cinnamon-settings'") + machine.wait_for_text('(Style|Appearance|Color)') + machine.sleep(2) + machine.screenshot("cinnamon_settings") + + with subtest("Lock the screen"): + machine.succeed("${su "cinnamon-screensaver-command -l >&2 &"}") + machine.wait_until_succeeds("${su "cinnamon-screensaver-command -q"} | grep 'The screensaver is active'") + machine.sleep(2) + machine.screenshot("cinnamon_screensaver") + machine.send_chars("${user.password}\n", delay=0.2) + machine.wait_until_succeeds("${su "cinnamon-screensaver-command -q"} | grep 'The screensaver is inactive'") + machine.sleep(2) with subtest("Open GNOME Terminal"): - machine.succeed("${gnomeTerminalCommand}") - # Correct output should be (true, '"Gnome-terminal"') - machine.wait_until_succeeds("${wmClass} | grep -q 'true,...Gnome-terminal'") - machine.sleep(20) - machine.screenshot("screen") + machine.succeed("${su "gnome-terminal"}") + machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'gnome-terminal'") + machine.sleep(2) + + with subtest("Open virtual keyboard"): + machine.succeed("${su "dbus-send --print-reply --dest=org.Cinnamon /org/Cinnamon org.Cinnamon.ToggleKeyboard"}") + machine.wait_for_text('(Ctrl|Alt)') + machine.sleep(2) + machine.screenshot("cinnamon_virtual_keyboard") + + with subtest("Check if Cinnamon has ever coredumped"): + machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'") ''; }) diff --git a/nixos/tests/freetube.nix b/nixos/tests/freetube.nix new file mode 100644 index 00000000000..f285384b68e --- /dev/null +++ b/nixos/tests/freetube.nix @@ -0,0 +1,41 @@ +let + tests = { + wayland = { pkgs, ... }: { + imports = [ ./common/wayland-cage.nix ]; + services.cage.program = "${pkgs.freetube}/bin/freetube"; + virtualisation.memorySize = 2047; + environment.variables.NIXOS_OZONE_WL = "1"; + environment.variables.DISPLAY = "do not use"; + }; + xorg = { pkgs, ... }: { + imports = [ ./common/user-account.nix ./common/x11.nix ]; + virtualisation.memorySize = 2047; + services.xserver.enable = true; + services.xserver.displayManager.sessionCommands = '' + ${pkgs.freetube}/bin/freetube + ''; + test-support.displayManager.auto.user = "alice"; + }; + }; + + mkTest = name: machine: + import ./make-test-python.nix ({ pkgs, ... }: { + inherit name; + nodes = { "${name}" = machine; }; + meta.maintainers = with pkgs.lib.maintainers; [ kirillrdy ]; + enableOCR = true; + + testScript = '' + start_all() + machine.wait_for_unit('graphical.target') + machine.wait_for_text('Your Subscription list is currently empty') + machine.send_key("ctrl-r") + machine.wait_for_text('Your Subscription list is currently empty') + machine.screenshot("main.png") + machine.send_key("ctrl-comma") + machine.wait_for_text('General Settings', timeout=30) + machine.screenshot("preferences.png") + ''; + }); +in +builtins.mapAttrs (k: v: mkTest k v { }) tests diff --git a/nixos/tests/livebook-service.nix b/nixos/tests/livebook-service.nix new file mode 100644 index 00000000000..9397e3cb75f --- /dev/null +++ b/nixos/tests/livebook-service.nix @@ -0,0 +1,43 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "livebook-service"; + + nodes = { + machine = { config, pkgs, ... }: { + imports = [ + ./common/user-account.nix + ]; + + services.livebook = { + enableUserService = true; + port = 20123; + environmentFile = pkgs.writeText "livebook.env" '' + LIVEBOOK_PASSWORD = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + ''; + options = { + cookie = "chocolate chip"; + }; + }; + }; + }; + + testScript = { nodes, ... }: + let + user = nodes.machine.config.users.users.alice; + sudo = lib.concatStringsSep " " [ + "XDG_RUNTIME_DIR=/run/user/${toString user.uid}" + "sudo" + "--preserve-env=XDG_RUNTIME_DIR" + "-u" + "alice" + ]; + in + '' + machine.wait_for_unit("multi-user.target") + + machine.succeed("loginctl enable-linger alice") + machine.wait_until_succeeds("${sudo} systemctl --user is-active livebook.service") + machine.wait_for_open_port(20123) + + machine.succeed("curl -L localhost:20123 | grep 'Type password'") + ''; +}) diff --git a/nixos/tests/nginx-sandbox.nix b/nixos/tests/nginx-sandbox.nix deleted file mode 100644 index 92ba30a09cf..00000000000 --- a/nixos/tests/nginx-sandbox.nix +++ /dev/null @@ -1,65 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ... }: { - name = "nginx-sandbox"; - meta = with pkgs.lib.maintainers; { - maintainers = [ izorkin ]; - }; - - # This test checks the creation and reading of a file in sandbox mode. Used simple lua script. - - nodes.machine = { pkgs, ... }: { - nixpkgs.overlays = [ - (self: super: { - nginx-lua = super.nginx.override { - modules = [ - pkgs.nginxModules.lua - ]; - }; - }) - ]; - services.nginx.enable = true; - services.nginx.package = pkgs.nginx-lua; - services.nginx.virtualHosts.localhost = { - extraConfig = '' - location /test1-write { - content_by_lua_block { - local create = os.execute('${pkgs.coreutils}/bin/mkdir /tmp/test1-read') - local create = os.execute('${pkgs.coreutils}/bin/touch /tmp/test1-read/foo.txt') - local echo = os.execute('${pkgs.coreutils}/bin/echo worked > /tmp/test1-read/foo.txt') - } - } - location /test1-read { - root /tmp; - } - location /test2-write { - content_by_lua_block { - local create = os.execute('${pkgs.coreutils}/bin/mkdir /var/web/test2-read') - local create = os.execute('${pkgs.coreutils}/bin/touch /var/web/test2-read/bar.txt') - local echo = os.execute('${pkgs.coreutils}/bin/echo error-worked > /var/web/test2-read/bar.txt') - } - } - location /test2-read { - root /var/web; - } - ''; - }; - users.users.foo.isNormalUser = true; - }; - - testScript = '' - machine.wait_for_unit("nginx") - machine.wait_for_open_port(80) - - # Checking write in temporary folder - machine.succeed("$(curl -vvv http://localhost/test1-write)") - machine.succeed('test "$(curl -fvvv http://localhost/test1-read/foo.txt)" = worked') - - # Checking write in protected folder. In sandbox mode for the nginx service, the folder /var/web is mounted - # in read-only mode. - machine.succeed("mkdir -p /var/web") - machine.succeed("chown nginx:nginx /var/web") - machine.succeed("$(curl -vvv http://localhost/test2-write)") - assert "404 Not Found" in machine.succeed( - "curl -vvv -s http://localhost/test2-read/bar.txt" - ) - ''; -}) diff --git a/nixos/tests/openresty-lua.nix b/nixos/tests/openresty-lua.nix index b177b3c194d..9e987398f51 100644 --- a/nixos/tests/openresty-lua.nix +++ b/nixos/tests/openresty-lua.nix @@ -16,6 +16,12 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: nodes = { webserver = { pkgs, lib, ... }: { + networking = { + extraHosts = '' + 127.0.0.1 default.test + 127.0.0.1 sandbox.test + ''; + }; services.nginx = { enable = true; package = pkgs.openresty; @@ -24,7 +30,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: lua_package_path '${luaPath};;'; ''; - virtualHosts."default" = { + virtualHosts."default.test" = { default = true; locations."/" = { extraConfig = '' @@ -36,6 +42,33 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: ''; }; }; + + virtualHosts."sandbox.test" = { + locations."/test1-write" = { + extraConfig = '' + content_by_lua_block { + local create = os.execute('${pkgs.coreutils}/bin/mkdir /tmp/test1-read') + local create = os.execute('${pkgs.coreutils}/bin/touch /tmp/test1-read/foo.txt') + local echo = os.execute('${pkgs.coreutils}/bin/echo worked > /tmp/test1-read/foo.txt') + } + ''; + }; + locations."/test1-read" = { + root = "/tmp"; + }; + locations."/test2-write" = { + extraConfig = '' + content_by_lua_block { + local create = os.execute('${pkgs.coreutils}/bin/mkdir /var/web/test2-read') + local create = os.execute('${pkgs.coreutils}/bin/touch /var/web/test2-read/bar.txt') + local echo = os.execute('${pkgs.coreutils}/bin/echo error-worked > /var/web/test2-read/bar.txt') + } + ''; + }; + locations."/test2-read" = { + root = "/var/web"; + }; + }; }; }; }; @@ -51,5 +84,18 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: f"curl -w '%{{http_code}}' --head --fail {url}" ) assert http_code.split("\n")[-1] == "200" + + # This test checks the creation and reading of a file in sandbox mode. + # Checking write in temporary folder + webserver.succeed("$(curl -vvv http://sandbox.test/test1-write)") + webserver.succeed('test "$(curl -fvvv http://sandbox.test/test1-read/foo.txt)" = worked') + # Checking write in protected folder. In sandbox mode for the nginx service, the folder /var/web is mounted + # in read-only mode. + webserver.succeed("mkdir -p /var/web") + webserver.succeed("chown nginx:nginx /var/web") + webserver.succeed("$(curl -vvv http://sandbox.test/test2-write)") + assert "404 Not Found" in machine.succeed( + "curl -vvv -s http://sandbox.test/test2-read/bar.txt" + ) ''; }) diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index b44849e0a14..c0dd24cf6ad 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -219,8 +219,6 @@ let in concatMapAttrs (name: package: { ${name} = make-postgresql-test name package false; + ${name + "-backup-all"} = make-postgresql-test "${name + "-backup-all"}" package true; ${name + "-clauses"} = mk-ensure-clauses-test name package; }) postgresql-versions - // { - postgresql_11-backup-all = make-postgresql-test "postgresql_11-backup-all" postgresql-versions.postgresql_11 true; - } diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index 42183625c7c..51d5e8ae59b 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -36,7 +36,7 @@ in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd, systemdStage networking.useDHCP = !withNetworkd; # Check if predictable interface names are working in stage-1 - boot.initrd.postDeviceCommands = script; + boot.initrd.postDeviceCommands = lib.mkIf (!systemdStage1) script; boot.initrd.systemd = lib.mkIf systemdStage1 { enable = true; diff --git a/nixos/tests/privacyidea.nix b/nixos/tests/privacyidea.nix deleted file mode 100644 index 401ad72c37b..00000000000 --- a/nixos/tests/privacyidea.nix +++ /dev/null @@ -1,43 +0,0 @@ -# Miscellaneous small tests that don't warrant their own VM run. - -import ./make-test-python.nix ({ pkgs, ...} : rec { - name = "privacyidea"; - meta = with pkgs.lib.maintainers; { - maintainers = [ ]; - }; - - nodes.machine = { ... }: { - virtualisation.cores = 2; - - services.privacyidea = { - enable = true; - secretKey = "$SECRET_KEY"; - pepper = "$PEPPER"; - adminPasswordFile = pkgs.writeText "admin-password" "testing"; - adminEmail = "root@localhost"; - - # Don't try this at home! - environmentFile = pkgs.writeText "pi-secrets.env" '' - SECRET_KEY=testing - PEPPER=testing - ''; - }; - services.nginx = { - enable = true; - virtualHosts."_".locations."/".extraConfig = '' - uwsgi_pass unix:/run/privacyidea/socket; - ''; - }; - }; - - testScript = '' - machine.start() - machine.wait_for_unit("multi-user.target") - machine.succeed("curl --fail http://localhost | grep privacyIDEA") - machine.succeed("grep \"SECRET_KEY = 'testing'\" /var/lib/privacyidea/privacyidea.cfg") - machine.succeed("grep \"PI_PEPPER = 'testing'\" /var/lib/privacyidea/privacyidea.cfg") - machine.succeed( - "curl --fail http://localhost/auth -F username=admin -F password=testing | grep token" - ) - ''; -}) diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 731cb63c4da..70d199d43b1 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "23.09"; + version = "23.10"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - hash = "sha256-q42ry47y4tTkUbejv6iN5jXcadXSSTPQ3omhMUevfqU="; + hash = "sha256-6Wt2sC7vdrz2Fkl08bNLfnGu+pAV7b5lZUmsx1wtJRE="; }; prePatch = '' diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index be3845be656..50993b056a8 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.72.1"; + version = "1.73"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-dGoldr0JvXri4XfSn/DKeJw/wsBaj+AKoKWdbEgo8lg="; + hash = "sha256-f5deXMSyZIDKPO7hsNONes/kTFLFodx4nuEjZzkR5Aw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index 576124d9684..10bd25e1167 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "pocket-casts"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "felicianotech"; repo = "pocket-casts-desktop-app"; rev = "v${version}"; - sha256 = "sha256-WMv2G4b7kYnWy0pz8YyI2eTdefs1mtWau+HQLiRygjE="; + sha256 = "sha256-d4uVeHy4/91Ki6Wk6GlOt2lcK6U+M7fOryiOYA7q/x4="; }; desktopItems = [ diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 940a281a1ce..276fdbf32e2 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.64"; + version = "1.65.1"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-b/1YksgXKXi6Tyntd03yWKZAAjvmG4HxsVYLVXoiMaA="; + sha256 = "sha256-0bZGiulLeAZ8bR0lj0Bm7te3T3YhxSOBFgMgWADRkIY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 01d35ba2597..645ba0e1686 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -1,9 +1,17 @@ -{ lib, mkDerivation, fetchFromGitLab -, cmake, pkg-config -, alsa-lib, pipewire +{ lib +, stdenv +, fetchFromGitLab +, cmake +, pkg-config +, wrapQtAppsHook +, qtbase +, qtsvg +, qtwayland +, alsa-lib +, pipewire }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; version = "0.5.3"; @@ -11,13 +19,15 @@ mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-50KaVpNB5/CTLs2bRbXEinYM23AZxZO/ForrVPFDN8U="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ alsa-lib pipewire ]; + buildInputs = [ qtbase qtsvg qtwayland alsa-lib pipewire ]; + + cmakeFlags = [ "-DCONFIG_WAYLAND=ON" ]; meta = with lib; { description = "Qt graph manager for PipeWire, similar to QjackCtl."; @@ -30,5 +40,6 @@ mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ kanashimia exi Scrumplex ]; + mainProgram = "qpwgraph"; }; -} +}) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index a3e02f05875..ae887720b07 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.0"; + version = "7.02"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-lHXy1xSwhNht6dt30e35nE1ZpOm8oTMMpoZJI7ELsjg="; - aarch64-linux = "sha256-a/e8DQ9NvbLyZHqg7pUxm+kV7i5vKCjeq9EOO0/5TJk="; + x86_64-linux = "sha256-86BGWaZ+zkxgC1Tz14lkBniwhs26G4EPpG2LjsSe9io="; + aarch64-linux = "sha256-kJfy4ji5YBv5ztilkAIuPswu3O9pwBL0coD6wU1gU5c="; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index 806f01dc121..2c15d1e205d 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "tetraproc"; - version = "0.8.6"; + version = "0.9.2"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "02155ljfwgvfgq9z258fb4z7jrz7qx022d054fj5gr0v007cv0r7"; + sha256 = "sha256-kRak33RuYusG6U5FOf9b9vOJUjNK3zqoLL0V/bWBJqs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index 584d6927d73..586431bd463 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-iHVrJySNdbZ9RXP7QgsDy2o2U/EISAp1/9NFpcEOGeI="; + sha256 = "sha256-hSunoltau1eG0DDM/bxZ/ssxd7pbutNC34Nwtbu9Fqk="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/editors/codux/default.nix b/pkgs/applications/editors/codux/default.nix index 207c3cf0bbc..3df06b23ff0 100644 --- a/pkgs/applications/editors/codux/default.nix +++ b/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.10.0"; + version = "15.13.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-lz1dDbYq7aTGQoED07K8I9E0/XsnSlPL81/4W8Vix3E="; + sha256 = "sha256-63t3v6abr9cZ0mKSPogevKwcFsvGh2udBPRn4k4XAd4="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 2cf64953628..c2754d7fc30 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -688,6 +688,27 @@ let --replace '"mozc_emacs_helper"' '"${pkgs.ibus-engines.mozc}/lib/mozc/mozc_emacs_helper"' ''; }); + + # Build a helper executable that interacts with the macOS Dictionary.app + osx-dictionary = + if pkgs.stdenv.isDarwin + then super.osx-dictionary.overrideAttrs (old: { + buildInputs = + old.buildInputs ++ + (with pkgs.darwin.apple_sdk.frameworks; [CoreServices Foundation]); + dontUnpack = false; + buildPhase = (old.buildPhase or "") + '' + cd source + $CXX -O3 -framework CoreServices -framework Foundation osx-dictionary.m -o osx-dictionary-cli + ''; + postInstall = (old.postInstall or "") + "\n" + '' + outd=$out/share/emacs/site-lisp/elpa/osx-dictionary-* + mkdir -p $out/bin + install -m444 -t $out/bin osx-dictionary-cli + rm $outd/osx-dictionary.m + ''; + }) + else super.osx-dictionary; }; in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super); diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock index 614363cffba..92518ad77c5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock +++ b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[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", ] @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -67,15 +67,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -91,9 +91,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -101,15 +101,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[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", @@ -124,9 +124,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[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", @@ -156,22 +156,27 @@ 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 = "bstr" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] [[package]] name = "built" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96f9cdd34d6eb553f9ea20e5bf84abb7b13c729f113fc1d8e49dc00ad9fa8738" +checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" dependencies = [ "cargo-lock", "git2", @@ -197,26 +202,33 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cargo-lock" -version = "8.0.3" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" +checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ "semver", "serde", - "toml", + "toml 0.7.6", "url", ] [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -239,10 +251,19 @@ dependencies = [ ] [[package]] +name = "chrono-humanize" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b" +dependencies = [ + "chrono", +] + +[[package]] name = "clap" -version = "4.3.1" +version = "4.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28" +checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3" dependencies = [ "clap_builder", "clap_derive", @@ -251,22 +272,21 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.1" +version = "4.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" +checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.1" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e9ef9a08ee1c0e1f2e162121665ac45ac3783b0f897db7244ae75ad9a8f65b" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", @@ -341,6 +361,16 @@ 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", + "memchr", +] + +[[package]] name = "console" version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -353,6 +383,16 @@ dependencies = [ ] [[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" @@ -381,9 +421,9 @@ 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", "cfg-if", @@ -394,14 +434,20 @@ dependencies = [ [[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", ] [[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + +[[package]] name = "directories" version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -411,6 +457,13 @@ dependencies = [ ] [[package]] +name = "dirs" +version = "0.1.0" +dependencies = [ + "directories", +] + +[[package]] name = "dirs-sys" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -425,15 +478,14 @@ dependencies = [ name = "dumb_analyzer" version = "0.1.0" dependencies = [ - "once_cell", "serde_json", ] [[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 = "encode_unicode" @@ -460,10 +512,16 @@ 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.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -521,9 +579,9 @@ 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", ] @@ -628,9 +686,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -639,17 +697,17 @@ dependencies = [ [[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 = "git2" -version = "0.16.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -658,11 +716,11 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick 1.0.4", "bstr", "fnv", "log", @@ -710,9 +768,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -720,7 +778,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -734,6 +792,12 @@ 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" + +[[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -741,18 +805,18 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] -name = "hermit-abi" -version = "0.3.1" +name = "home" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] [[package]] name = "http" @@ -784,15 +848,15 @@ 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 = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -805,7 +869,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -814,10 +878,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", "rustls", @@ -827,9 +892,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -859,9 +924,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", @@ -897,7 +962,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "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]] @@ -913,30 +988,18 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[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 = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi", "rustix", "windows-sys 0.48.0", ] @@ -952,9 +1015,31 @@ 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 = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" @@ -967,9 +1052,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -982,15 +1067,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libgit2-sys" -version = "0.14.2+1.5.1" +version = "0.15.2+1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" dependencies = [ "cc", "libc", @@ -1000,9 +1085,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1012,15 +1097,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[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", "scopeguard", @@ -1028,13 +1113,22 @@ dependencies = [ [[package]] name = "log" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] [[package]] name = "maple" -version = "0.1.45" +version = "0.1.46" dependencies = [ "built", "chrono", @@ -1054,8 +1148,9 @@ dependencies = [ "base64 0.13.1", "bytecount", "chrono", + "chrono-humanize", "clap", - "directories", + "dirs", "dumb_analyzer", "filter", "futures", @@ -1067,6 +1162,7 @@ dependencies = [ "matcher", "once_cell", "parking_lot", + "paths", "pattern", "percent-encoding", "printer", @@ -1077,10 +1173,11 @@ dependencies = [ "serde_json", "subprocess", "tokio", - "toml", + "toml 0.5.11", "tracing", "types", "utils", + "webbrowser", ] [[package]] @@ -1113,9 +1210,9 @@ dependencies = [ [[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", ] @@ -1128,9 +1225,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[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", ] @@ -1147,6 +1244,12 @@ dependencies = [ ] [[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] name = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1158,20 +1261,20 @@ dependencies = [ [[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", ] [[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", "libc", ] @@ -1182,19 +1285,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] name = "object" -version = "0.30.3" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.17.2" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "overload" @@ -1220,15 +1332,24 @@ dependencies = [ [[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", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", +] + +[[package]] +name = "paths" +version = "0.1.0" +dependencies = [ + "dirs", + "itertools", + "serde", ] [[package]] @@ -1241,15 +1362,15 @@ 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-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -1278,23 +1399,29 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] +name = "raw-window-handle" +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" @@ -1322,7 +1449,16 @@ 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_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", ] [[package]] @@ -1332,26 +1468,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.8.3" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ - "aho-corasick 1.0.1", + "aho-corasick 1.0.4", "memchr", - "regex-syntax 0.7.2", + "regex-automata", + "regex-syntax 0.7.4", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +dependencies = [ + "aho-corasick 1.0.4", + "memchr", + "regex-syntax 0.7.4", +] [[package]] name = "regex-syntax" @@ -1361,15 +1503,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" dependencies = [ "base64 0.21.2", "bytes", @@ -1437,13 +1579,12 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys 0.48.0", @@ -1451,9 +1592,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.1" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", @@ -1463,18 +1604,18 @@ dependencies = [ [[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.2", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -1482,9 +1623,9 @@ 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 = "same-file" @@ -1497,9 +1638,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -1513,27 +1654,27 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.163" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" dependencies = [ "proc-macro2", "quote", @@ -1542,9 +1683,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -1552,6 +1693,15 @@ dependencies = [ ] [[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" @@ -1589,18 +1739,18 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[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", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -1613,6 +1763,16 @@ 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.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1635,9 +1795,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1646,18 +1806,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", @@ -1687,10 +1847,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.21" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -1705,9 +1866,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" dependencies = [ "time-core", ] @@ -1729,18 +1890,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -1758,9 +1919,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", @@ -1790,6 +1951,40 @@ dependencies = [ ] [[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 = "tower-service" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1814,15 +2009,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.21", + "time 0.3.27", "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", @@ -1896,9 +2091,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -1934,9 +2129,9 @@ dependencies = [ [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -1983,11 +2178,10 @@ 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", ] @@ -2005,9 +2199,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2015,9 +2209,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", @@ -2030,9 +2224,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -2042,9 +2236,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2052,9 +2246,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", @@ -2065,38 +2259,42 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webbrowser" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" dependencies = [ - "ring", - "untrusted", + "core-foundation", + "home", + "jni", + "log", + "ndk-context", + "objc", + "raw-window-handle", + "url", + "web-sys", ] [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "winapi" @@ -2135,7 +2333,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -2153,7 +2351,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -2173,17 +2371,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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", + "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]] @@ -2194,9 +2392,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -2206,9 +2404,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -2218,9 +2416,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -2230,9 +2428,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -2242,9 +2440,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -2254,9 +2452,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -2266,15 +2464,25 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" +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", ] diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index 271f50919fc..e5ff07f4d8d 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -11,13 +11,13 @@ }: let - version = "0.45"; + version = "0.46"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; rev = "v${version}"; - hash = "sha256-espFos1Mrxdq2p+qi0ooTWAV8EgV/lTx9KuP3GkMWos="; + hash = "sha256-KWBuoZ2GxjwIu7L1PPq/7u3iuYFp5QrlsleL2RQTdUE="; }; meta = with lib; { @@ -47,8 +47,7 @@ let libgit2 zlib ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.CoreServices ]; }; in diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d4557313c9d..6d5142fe6d6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1229,8 +1229,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.17.1"; - sha256 = "sha256-WBtIdz+8zsyTl43ovU3Dz+8p154ZGvHp6BA3AQtXN/U="; + version = "0.17.5"; + sha256 = "sha256-2iOyLNLMQ6Snm0gvv7Yl6von/A9UTfLYrH5l1PoJwUc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -3537,15 +3537,15 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.21"; - sha256 = "sha256-u57U/MmxvionFZp/tLK/KpddaxA/SUffeggKBSzmsXo="; + version = "0.0.22"; + sha256 = "sha256-fJcSJwwRVofduWEEMa5f2VrSfyONKPkFl9OW+++lSRw="; }; meta = { description = "VSCode language extension for Uiua"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=uiua-lang.uiua-vscode"; homepage = "https://github.com/uiua-lang/uiua-vscode"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.wackbyte ]; + maintainers = with lib.maintainers; [ tomasajt wackbyte ]; }; }; diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json index 29f8c62b9af..0b2a6760a08 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json @@ -1,23 +1,24 @@ { "name": "rust-analyzer", - "version": "0.3.1607", + "version": "0.3.1697", "dependencies": { + "@hpcc-js/wasm": "^2.13.0", "anser": "^2.1.1", - "d3": "^7.6.1", + "d3": "^7.8.5", "d3-graphviz": "^5.0.2", - "vscode-languageclient": "^8.0.2", + "vscode-languageclient": "^8.1.0", + "@tsconfig/strictest": "^2.0.1", "@types/node": "~16.11.7", - "@types/vscode": "~1.66.0", - "@typescript-eslint/eslint-plugin": "^5.30.5", - "@typescript-eslint/parser": "^5.30.5", - "@vscode/test-electron": "^2.1.5", - "cross-env": "^7.0.3", - "eslint": "^8.19.0", - "eslint-config-prettier": "^8.5.0", - "ovsx": "^0.5.2", - "prettier": "^2.7.1", - "tslib": "^2.4.0", - "typescript": "^4.7.4", - "vsce": "^2.9.2" + "@types/vscode": "~1.75", + "@typescript-eslint/eslint-plugin": "^6.0.0", + "@typescript-eslint/parser": "^6.0.0", + "@vscode/test-electron": "^2.3.3", + "@vscode/vsce": "^2.19.0", + "eslint": "^8.44.0", + "eslint-config-prettier": "^8.8.0", + "ovsx": "^0.8.2", + "prettier": "^3.0.0", + "tslib": "^2.6.0", + "typescript": "^5.1.6" } } diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index 77c589dbba2..044c8274d48 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -20,7 +20,7 @@ let # Use the plugin version as in vscode marketplace, updated by update script. inherit (vsix) version; - releaseTag = "2023-07-31"; + releaseTag = "2023-10-16"; src = fetchFromGitHub { owner = "rust-lang"; diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix index 35ed421469a..a02eb526fee 100644 --- a/pkgs/applications/emulators/box64/default.nix +++ b/pkgs/applications/emulators/box64/default.nix @@ -1,29 +1,39 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , gitUpdater , cmake , python3 -, withDynarec ? stdenv.hostPlatform.isAarch64 +, withDynarec ? (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64) , runCommand , hello-x86_64 -, box64 }: -# Currently only supported on ARM -assert withDynarec -> stdenv.hostPlatform.isAarch64; +# Currently only supported on ARM & RISC-V +assert withDynarec -> (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "box64"; version = "0.2.4"; src = fetchFromGitHub { owner = "ptitSeb"; - repo = pname; - rev = "v${version}"; + repo = "box64"; + rev = "v${finalAttrs.version}"; hash = "sha256-iCZv/WvqZkH6i23fSLA/p0nG5/CgzjyU5glVgje4c3w="; }; + patches = [ + # Fix crash due to regression in SDL1 AudioCallback signature in 0.2.4 + # Remove when version > 0.2.4 + (fetchpatch { + name = "0001-box64-Fixed_signature_of_SDL1_AudioCallback.patch"; + url = "https://github.com/ptitSeb/box64/commit/5fabd602aea1937e3c5ce58843504c2492b8c0ec.patch"; + hash = "sha256-dBdKijTljCFtSJ2smHrbjH/ok0puGw4YEy/kluLl4AQ="; + }) + ]; + nativeBuildInputs = [ cmake python3 @@ -31,12 +41,20 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNOGIT=ON" - "-DARM_DYNAREC=${if withDynarec then "ON" else "OFF"}" - "-DRV64=${if stdenv.hostPlatform.isRiscV64 then "ON" else "OFF"}" - "-DPPC64LE=${if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then "ON" else "OFF"}" + + # Arch mega-option + "-DARM64=${lib.boolToString stdenv.hostPlatform.isAarch64}" + "-DRV64=${lib.boolToString stdenv.hostPlatform.isRiscV64}" + "-DPPC64LE=${lib.boolToString (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)}" + "-DLARCH64=${lib.boolToString stdenv.hostPlatform.isLoongArch64}" ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + # x86_64 has no arch-specific mega-option, manually enable the options that apply to it "-DLD80BITS=ON" "-DNOALIGN=ON" + ] ++ [ + # Arch dynarec + "-DARM_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isAarch64)}" + "-DRV64_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isRiscV64)}" ]; installPhase = '' @@ -47,9 +65,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - doInstallCheck = true; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; installCheckPhase = '' runHook preInstallCheck @@ -68,7 +86,7 @@ stdenv.mkDerivation rec { rev-prefix = "v"; }; tests.hello = runCommand "box64-test-hello" { - nativeBuildInputs = [ box64 hello-x86_64 ]; + nativeBuildInputs = [ finalAttrs.finalPackage ]; } '' # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to # tell what problems the emulator has run into. @@ -81,6 +99,7 @@ stdenv.mkDerivation rec { description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems"; license = licenses.mit; maintainers = with maintainers; [ gador OPNA2608 ]; - platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" ]; + mainProgram = "box64"; + platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" "loongarch64-linux" "mips64el-linux" ]; }; -} +}) diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 6e3f93701c0..664399f7573 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -26,7 +26,6 @@ , libXrandr , lzo , mbedtls_2 -, mgba , miniupnpc , minizip-ng , openal @@ -38,7 +37,6 @@ , vulkan-loader , xxHash , xz -, zlib-ng # Used in passthru , common-updater-scripts @@ -78,6 +76,8 @@ stdenv.mkDerivation rec { ./find-minizip-ng.patch ]; + strictDeps = true; + nativeBuildInputs = [ stdenv.cc cmake @@ -118,7 +118,6 @@ stdenv.mkDerivation rec { sfml xxHash xz # LibLZMA - zlib-ng ] ++ lib.optionals stdenv.isLinux [ alsa-lib bluez @@ -175,6 +174,7 @@ stdenv.mkDerivation rec { tests.version = testers.testVersion { package = dolphin-emu; command = "dolphin-emu-nogui --version"; + version = if stdenv.hostPlatform.isDarwin then "Dolphin 5.0" else version; }; updateScript = writeShellScript "dolphin-update-script" '' diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 730ed7b7ac0..0688947f6ba 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.259"; + version = "0.260"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-F8psPvwuaILXZF7dCStJApVTD9zzzBwjf1CKGelHlqE="; + hash = "sha256-spWnaf7xXK2xzgdUagsgN5doVrpJk7EA6fzYd9FlFm0="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index 1583777a058..8e12d7cd7bb 100644 --- a/pkgs/applications/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix @@ -23,6 +23,11 @@ in stdenv.mkDerivation { sha256 = "1gy79d5wdaacph0cc1amw7mqm7i0716n6mvav16p1svi26iz193v"; }; + patches = [ + ./zlib-1.3.patch + ./fortify3.patch + ]; + buildInputs = [ nasm SDL zlib libpng ncurses libGLU libGL ]; prePatch = '' diff --git a/pkgs/applications/emulators/zsnes/fortify3.patch b/pkgs/applications/emulators/zsnes/fortify3.patch new file mode 100644 index 00000000000..83a67b8b7e8 --- /dev/null +++ b/pkgs/applications/emulators/zsnes/fortify3.patch @@ -0,0 +1,29 @@ +pal16bxcl is an array of 256 dwords, not bytes: + src/endmem.asm:NEWSYM pal16bxcl, resd 256 + +While at it fixes off-by-4 out of bounds exit. + +Detected by _FORTIFY_SOURCE=3: + *** buffer overflow detected ***: terminated + #7 0x08057c14 in memset (__len=2, __ch=255, __dest=<optimized out>) at ...-glibc-2.38-23-dev/include/bits/string_fortified.h:59 +#8 clearmem () at initc.c:1461 +--- a/src/initc.c ++++ b/src/initc.c +@@ -1389,7 +1389,7 @@ extern unsigned char vidmemch8[4096]; + extern unsigned char pal16b[1024]; + extern unsigned char pal16bcl[1024]; + extern unsigned char pal16bclha[1024]; +-extern unsigned char pal16bxcl[256]; ++extern unsigned char pal16bxcl[1024]; + extern unsigned char SPCRAM[65472]; + unsigned char *SPCState = SPCRAM; + +@@ -1456,7 +1456,7 @@ void clearmem() + memset(pal16b, 0, 1024); + memset(pal16bcl, 0, 1024); + memset(pal16bclha, 0, 1024); +- for (i=0 ; i<1024 ; i+=4) ++ for (i=0 ; i<1024-4 ; i+=4) + { + memset(pal16bxcl+i, 255, 2); + memset(pal16bxcl+i+2, 0, 2); diff --git a/pkgs/applications/emulators/zsnes/zlib-1.3.patch b/pkgs/applications/emulators/zsnes/zlib-1.3.patch new file mode 100644 index 00000000000..0c4771f0892 --- /dev/null +++ b/pkgs/applications/emulators/zsnes/zlib-1.3.patch @@ -0,0 +1,41 @@ +Add support for 2-digit zlib version like "1.3". +--- a/src/acinclude.m4 ++++ b/src/acinclude.m4 +@@ -67,7 +67,7 @@ char* my_strdup (char *str) + + int main (int argc, char *argv[]) + { +- int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version; ++ int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version = 0; + + char *zlibver, *tmp_version; + +@@ -85,7 +85,7 @@ int main (int argc, char *argv[]) + printf("%s, bad version string for\n\tmin_zlib_version... ", "$min_zlib_version"); + exit(1); + } +- if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3) { ++ if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3 && sscanf(zlibver, "%d.%d", &zlib_major_version, &zlib_minor_version) != 2) { + printf("%s, bad version string given\n", zlibver); + puts("\tby zlib, sometimes due to very old zlibs that didnt correctly"); + printf("\tdefine their version. Please upgrade if you are running an\n\told zlib... "); +--- a/src/configure ++++ b/src/configure +@@ -3817,7 +3817,7 @@ char* my_strdup (char *str) + + int main (int argc, char *argv[]) + { +- int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version; ++ int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version = 0; + + char *zlibver, *tmp_version; + +@@ -3835,7 +3835,7 @@ int main (int argc, char *argv[]) + printf("%s, bad version string for\n\tmin_zlib_version... ", "$min_zlib_version"); + exit(1); + } +- if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3) { ++ if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3 && sscanf(zlibver, "%d.%d", &zlib_major_version, &zlib_minor_version) != 2) { + printf("%s, bad version string given\n", zlibver); + puts("\tby zlib, sometimes due to very old zlibs that didnt correctly"); + printf("\tdefine their version. Please upgrade if you are running an\n\told zlib... "); diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index 5d56dbe86d7..96a9a3373b5 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "imgcat"; - version = "2.5.1"; + version = "2.5.2"; buildInputs = [ ncurses cimg ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "eddieantonio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EkVE6BgoA1lo4oqlNETTxLILIVvGXspFyXykxpmYk8M="; + sha256 = "sha256-61xIB/Fa+Utu694aITzBoMQeYa0Trh5L0oIKp8Be+D0="; }; env.NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix index 020373da38f..ffcd26afc9e 100644 --- a/pkgs/applications/misc/ddcui/default.nix +++ b/pkgs/applications/misc/ddcui/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "ddcui"; - version = "0.3.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcui"; rev = "v${version}"; - sha256 = "sha256-P8dh6k8lht1/JNILzNZEyYD8loNoJjG5869K2Hl11z8="; + sha256 = "sha256-T4/c8K1P/o91DWJik/9HtHav948vbVa40qPdy7nKmos="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index 363e6fadee4..5c8eb94712a 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -28,7 +28,7 @@ , isocodes , gtksourceview , gtksourceviewmm -, postgresql_11 +, postgresql_15 , gobject-introspection , yelp-tools , wrapGAppsHook @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { python3.pkgs.pygobject3 gtksourceview gtksourceviewmm - postgresql_11 # for pg_config + postgresql_15 # for postgresql utils ]; enableParallelBuilding = true; @@ -102,6 +102,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-boost-python=boost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" + "--with-postgres-utils=${lib.getBin postgresql_15}/bin" ]; makeFlags = [ diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index a88cf10f154..8ee00acc753 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.119.0"; + version = "0.120.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QumHL3S57Xm6N3u4VakNzRGmUi0RT8lVXG1K5/Dsq4A="; + hash = "sha256-hCcutRfx0GtnYJYoQ/2S8Y+OmxLCtHWzTCdozWUatXY="; }; - vendorHash = "sha256-KbGZ7MSioP82UNgmeKFdgCBkTIqL0fV5QhzrcxYyl4k="; + vendorHash = "sha256-59Q7IN7VK7tQv5w7qyxSz16G+Kmsrslu8we9S3aJeAg="; doCheck = false; diff --git a/pkgs/applications/misc/hyprnome/default.nix b/pkgs/applications/misc/hyprnome/default.nix index 906bc00dce5..d8d6ba70c8f 100644 --- a/pkgs/applications/misc/hyprnome/default.nix +++ b/pkgs/applications/misc/hyprnome/default.nix @@ -2,38 +2,41 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "hyprnome"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "donovanglover"; repo = "hyprnome"; rev = version; - hash = "sha256-jb21hnPSzrCTuW7Yhs6jFzS2WUVQjkn6nCCi6LvoTGA="; + hash = "sha256-zlXiT2EOIdgIDI4NQuU3C903SSq5bylBAFJXyv7mdJ4="; }; - cargoHash = "sha256-QM5v2hKP3E9W3Aek6kFyFFNAp9s0oTFb4CEtxEHyny0="; + cargoHash = "sha256-DpbRs97sr5wpJSrYF99ZiQ0SZOZdoQjfaLhKIAU95HA="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installManPage man/hyprnome.1 + installManPage target/man/hyprnome.1 installShellCompletion --cmd hyprnome \ - --bash <(cat completions/hyprnome.bash) \ - --fish <(cat completions/hyprnome.fish) \ - --zsh <(cat completions/_hyprnome) + --bash <(cat target/completions/hyprnome.bash) \ + --fish <(cat target/completions/hyprnome.fish) \ + --zsh <(cat target/completions/_hyprnome) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "GNOME-like workspace switching in Hyprland"; homepage = "https://github.com/donovanglover/hyprnome"; - license = licenses.mit; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ donovanglover ]; mainProgram = "hyprnome"; diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index 9e18b8df3a7..4228d5eec0a 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "limesctl"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - hash = "sha256-zR0+tTPRdmv04t3V0KDA/hG5ZJMT2RYI3+2dkmZHdhk="; + hash = "sha256-osXwVZuMB9cMj0tEMBOQ8hrKWAmfXui4ELoi0dm9yB4="; }; vendorHash = null; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 4b07723fea9..a40064bb5ff 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -4,7 +4,7 @@ , appimageTools , makeWrapper # graphs will not sync without matching upstream's major electron version -, electron_24 +, electron_25 , git , nix-update-script }: @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "logseq"; - version = "0.9.19"; + version = "0.9.20"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-Y3AeeJc+PYJdckpOma5ZDbVtBbjBTfNNDqTip4l02/E="; + hash = "sha256-iT0Gc/ePx1tUNTPoE2Ol+dHUmbS4CkneZbyraRBx5Ak="; name = "${pname}-${version}.AppImage"; }; @@ -57,7 +57,7 @@ in { postFixup = '' # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_25}/bin/electron $out/bin/${pname} \ --set "LOCAL_GIT_DIRECTORY" ${git} \ --add-flags $out/share/${pname}/resources/app \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 99a089d2f0c..298aa2ef40f 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4914"; + version = "4916"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-aA5jGW6GTo2OvFZ/uPA4KpS+SjNB/tRGwgj1oM7zywU="; + sha256 = "sha256-Ok6s1DaTZBcYtkHA7WAxjGz0HycvFqBpkwZIirc+dFU="; }; patches = [ diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix deleted file mode 100644 index 9cdf4da33ef..00000000000 --- a/pkgs/applications/misc/privacyidea/default.nix +++ /dev/null @@ -1,263 +0,0 @@ -{ lib, fetchFromGitHub, cacert, openssl, nixosTests -, python310, fetchPypi, fetchpatch -}: - -let - dropDocOutput = { outputs, ... }: { - outputs = lib.filter (x: x != "doc") outputs; - }; - - # Follow issue below for Python 3.11 support - # https://github.com/privacyidea/privacyidea/issues/3593 - python3' = python310.override { - packageOverrides = self: super: { - django = super.django_3; - - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "1.3.24"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; - }; - doCheck = false; - }); - # version 3.3.0+ does not support SQLAlchemy 1.3 - factory-boy = super.factory-boy.overridePythonAttrs (oldAttrs: rec { - version = "3.2.1"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-qY0newwEfHXrbkq4UIp/gfsD0sshmG9ieRNUbveipV4="; - }; - postPatch = ""; - }); - # fails with `no tests ran in 1.75s` - alembic = super.alembic.overridePythonAttrs (lib.const { - doCheck = false; - }); - flask-migrate = super.flask-migrate.overridePythonAttrs (oldAttrs: rec { - version = "2.7.0"; - src = fetchPypi { - pname = "Flask-Migrate"; - inherit version; - hash = "sha256-ri8FZxWIdi3YOiHYsYxR/jVehng+JFlJlf+Nc4Df/jg="; - }; - }); - flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec { - version = "2.5.1"; - format = "setuptools"; - src = fetchPypi { - pname = "Flask-SQLAlchemy"; - inherit version; - hash = "sha256:2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; - }; - }); - # Taken from by https://github.com/NixOS/nixpkgs/pull/173090/commits/d2c0c7eb4cc91beb0a1adbaf13abc0a526a21708 - werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "1.0.1"; - src = old.src.override { - inherit version; - hash = "sha256-bICx5a02ZSkOo5MguR4b4eDV9gZSuWSjBwIW3oPS5Hw="; - }; - nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ - requests - ]); - doCheck = false; - }); - # Required by flask-1.1 - jinja2 = super.jinja2.overridePythonAttrs (old: rec { - version = "2.11.3"; - src = old.src.override { - inherit version; - hash = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; - }; - patches = [ - # python 3.10 compat fixes. In later upstream releases, but these - # are not compatible with flask 1 which we need here :( - (fetchpatch { - url = "https://github.com/thmo/jinja/commit/1efb4cc918b4f3d097c376596da101de9f76585a.patch"; - hash = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU="; - }) - (fetchpatch { - url = "https://github.com/mkrizek/jinja/commit/bd8bad37d1c0e2d8995a44fd88e234f5340afec5.patch"; - hash = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA="; - excludes = [ "CHANGES.rst" ]; - }) - ]; - }); - # Required by jinja2-2.11.3 - markupsafe = super.markupsafe.overridePythonAttrs (old: rec { - version = "2.0.1"; - src = old.src.override { - inherit version; - hash = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; - }; - }); - itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { - version = "1.1.0"; - src = old.src.override { - inherit version; - hash = "sha256-MhsDPQfypBNtPsdi6snxahDM1g9TwMka+QIXrOe6Hxk="; - }; - }); - flask = super.flask.overridePythonAttrs (old: rec { - version = "1.1.4"; - src = old.src.override { - inherit version; - hash = "sha256-D762GA04OpGG0NbtlU4AQq2fGODo3giLK0GdUmkn0ZY="; - }; - }); - sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { - meta = meta // { broken = false; }; - }); - click = super.click.overridePythonAttrs (old: rec { - version = "7.1.2"; - src = old.src.override { - inherit version; - hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - }; - disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 - }); - # Now requires `lingua` as check input that requires a newer `click`, - # however `click-7` is needed by the older flask we need here. Since it's just - # for the test-suite apparently, let's skip it for now. - mako = super.mako.overridePythonAttrs (lib.const { - nativeCheckInputs = []; - doCheck = false; - }); - # Requires pytest-httpserver as checkInput now which requires Werkzeug>=2 which is not - # supported by current privacyIDEA. - responses = super.responses.overridePythonAttrs (lib.const { - doCheck = false; - }); - flask-babel = (super.flask-babel.override { - sphinxHook = null; - furo = null; - }).overridePythonAttrs (old: (dropDocOutput old) // rec { - pname = "Flask-Babel"; - version = "2.0.0"; - format = "setuptools"; - src = fetchPypi { - inherit pname; - inherit version; - hash = "sha256:f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d"; - }; - disabledTests = [ - # AssertionError: assert 'Apr 12, 2010...46:00\u202fPM' == 'Apr 12, 2010, 1:46:00 PM' - # Note the `\u202f` (narrow, no-break space) vs space. - "test_basics" - "test_init_app" - "test_custom_locale_selector" - "test_refreshing" - ]; - }); - psycopg2 = (super.psycopg2.override { - sphinxHook = null; - sphinx-better-theme = null; - }).overridePythonAttrs dropDocOutput; - pyjwt = (super.pyjwt.override { - sphinxHook = null; - sphinx-rtd-theme = null; - }).overridePythonAttrs (old: (dropDocOutput old) // { format = "setuptools"; }); - beautifulsoup4 = (super.beautifulsoup4.override { - sphinxHook = null; - }).overridePythonAttrs dropDocOutput; - pydash = (super.pydash.override { - sphinx-rtd-theme = null; - }).overridePythonAttrs (old: rec { - version = "5.1.0"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-GysFCsG64EnNB/WSCxT6u+UmOPSF2a2h6xFanuv/aDU="; - }; - format = "setuptools"; - doCheck = false; - }); - pyopenssl = (super.pyopenssl.override { - sphinxHook = null; - sphinx-rtd-theme = null; - }).overridePythonAttrs dropDocOutput; - deprecated = (super.deprecated.override { - sphinxHook = null; - }).overridePythonAttrs dropDocOutput; - wrapt = (super.wrapt.override { - sphinxHook = null; - sphinx-rtd-theme = null; - }).overridePythonAttrs dropDocOutput; - }; - }; -in -python3'.pkgs.buildPythonPackage rec { - pname = "privacyIDEA"; - version = "3.8.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - hash = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; - fetchSubmodules = true; - }; - - patches = [ - # https://github.com/privacyidea/privacyidea/pull/3611 - (fetchpatch { - url = "https://github.com/privacyidea/privacyidea/commit/7db6509721726a34e8528437ddbd4210019b11ef.patch"; - sha256 = "sha256-ZvtauCs1vWyxzGbA0B2+gG8q5JyUO8DF8nm/3/vcYmE="; - }) - ]; - - propagatedBuildInputs = with python3'.pkgs; [ - cryptography pyrad pymysql python-dateutil flask-versioned flask-script - defusedxml croniter flask-migrate pyjwt configobj sqlsoup pillow - python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel - ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 - pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt segno - ]; - - passthru.tests = { inherit (nixosTests) privacyidea; }; - - nativeCheckInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; - preCheck = "export HOME=$(mktemp -d)"; - postCheck = "unset HOME"; - disabledTests = [ - # expects `/home/` to exist, fails with `FileNotFoundError: [Errno 2] No such file or directory: '/home/'`. - "test_01_loading_scripts" - - # Tries to connect to `fcm.googleapis.com`. - "test_02_api_push_poll" - "test_04_decline_auth_request" - - # Timezone info not available in build sandbox - "test_14_convert_timestamp_to_utc" - - # Fails because of different logger configurations - "test_01_create_default_app" - "test_03_logging_config_file" - "test_04_logging_config_yaml" - "test_05_logging_config_broken_yaml" - ]; - - pythonImportsCheck = [ "privacyidea" ]; - - postPatch = '' - patchShebangs tests/testdata/scripts - substituteInPlace privacyidea/lib/resolvers/LDAPIdResolver.py --replace \ - "/etc/privacyidea/ldap-ca.crt" \ - "${cacert}/etc/ssl/certs/ca-bundle.crt" - ''; - - postInstall = '' - rm -r $out/${python3'.sitePackages}/tests - ''; - - meta = with lib; { - description = "Multi factor authentication system (2FA, MFA, OTP Server)"; - license = licenses.agpl3Plus; - homepage = "http://www.privacyidea.org"; - maintainers = with maintainers; [ ma27 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 4f022d81f62..83407f94fcb 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -7,29 +7,32 @@ , libXau , libXdmcp , conf ? null -, patches ? [] +, patches ? [ ] }: stdenv.mkDerivation rec { pname = "slstatus"; - version = "unstable-2022-12-19"; + version = "1.0"; src = fetchgit { url = "https://git.suckless.org/slstatus"; - rev = "c919def84fd4f52f501548e5f7705b9d56dd1459"; - hash = "sha256-nEIHIO8CAYdtX8GniO6GDEaHj7kEu81b05nCMVdr2SE="; + rev = version; + hash = "sha256-cFah6EgApslLSlJaOy/5W9ZV9Z1lzfKye/rRh9Om3T4="; }; - configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = '' - ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} - makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) - ''; + preBuild = + let + configFile = if lib.isDerivation conf || builtins.isPath conf then conf else writeText "config.def.h" conf; + in + '' + ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} + makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) + ''; inherit patches; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXau libXdmcp]; + buildInputs = [ libX11 libXau libXdmcp ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 7eaef8b202e..93062a7c9a5 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -45,13 +45,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.11"; + version = "2.11.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - hash = "sha256-G/9paJFJsRfIxMJ2hbuVS7pxCfSUCK69DNV2DHi60qA="; + hash = "sha256-A8iYFdW30Em5pjGn3DRpaV0A7ixwfSzmIp8AgtPkBCI="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index d2e49ee8fb9..d02bd6f0942 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -68,24 +68,24 @@ let libcava.src = fetchFromGitHub { owner = "LukashonakV"; repo = "cava"; - rev = "0.8.5"; - hash = "sha256-b/XfqLh8PnW018sGVKRRlFvBpo2Ru1R2lUeTR7pugBo="; + rev = "0.9.1"; + hash = "sha256-FnRJJV0poRmw+y4nt1X7Z0ipX86LRK1TJhNKHFk0rTw="; }; in stdenv.mkDerivation (finalAttrs: { pname = "waybar"; - version = "0.9.22"; + version = "0.9.23"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = finalAttrs.version; - hash = "sha256-9LJDA+zrHF9Mn8+W9iUw50LvO+xdT7/l80KdltPrnDo="; + hash = "sha256-MYOnEqoIN74rw/+DdTLdZXG8JmF70j5hPXhahfp32m0="; }; postUnpack = lib.optional cavaSupport '' pushd "$sourceRoot" - cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.8.5 + cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.9.1 patchShebangs . popd ''; diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index 9445ed8f1f9..26c0f4bca05 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -7,26 +7,26 @@ , scdoc , wayland , wayland-protocols -, zig_0_10 +, zig_0_11 }: stdenv.mkDerivation (finalAttrs: { pname = "waylock"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "ifreund"; repo = "waylock"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-jl4jSDWvJB6OfBbVXfVQ7gv/aDkN6bBy+/yK+AQDQL0="; + hash = "sha256-Q1FlahawsnJ77gP6QVs9AR058rhMU92iueRPudPf+sE="; }; nativeBuildInputs = [ pkg-config scdoc wayland - zig_0_10.hook + zig_0_11.hook ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ed1ec5692a0..68f547d1f95 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -46,7 +46,7 @@ let , extraPrefs ? "" , extraPrefsFiles ? [] # For more information about policies visit - # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled + # https://mozilla.github.io/policy-templates/ , extraPolicies ? {} , extraPoliciesFiles ? [] , libName ? browser.libName or "firefox" # Important for tor package or the like diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index e4516cb4242..7810db67afb 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "118.0.1-1", + "packageVersion": "119.0-5", "source": { - "rev": "118.0.1-1", - "sha256": "1wdqiif1la97w9b3xsz20xrcg2d1c0j13pdfcj7z23jz8846iqk4" + "rev": "119.0-5", + "sha256": "0ql4i6b4fvydiyscj8ki2pnzr67bmb3azpdm6kk5y8yyw2697230" }, "settings": { "rev": "9c862f06f970d69e00c1035e0d4774fb44fd84a6", "sha256": "0ay58wrhfn0b56748phpn0ahz11ls9y8d2fd1z4zrj6dv398vlmb" }, "firefox": { - "version": "118.0.1", - "sha512": "b1efa1afea70434dc2a18d335bb8b526883cde200f1503b8c5fd2e7db8285e6a999cfa3aac354ea1c15a91d13a46d68db37023235314240b59eb8f55e01554ad" + "version": "119.0", + "sha512": "4b555c444add36567fd538752b122f227cf78bb70b72c79e6d8ae8d9c2e61c3cdacfae79c37970753b8b5c7716b28c686071eb7b551773c30a76852f3550676c" } } diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 8bb0c21ed29..7c1beb43dca 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,20 +2,21 @@ buildNpmPackage rec { pname = "vieb"; - version = "10.3.0"; + version = "10.4.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - hash = "sha256-eopsDwgyWshZOppkODGKT8UGnj4vvc7ssEzVAhZeDTA="; + hash = "sha256-SQQDlOSP1MZeN6BHdahpxpZ0e60lgA4ph0r2jkmTdP8="; }; postPatch = '' sed -i '/"electron"/d' package.json ''; - npmDepsHash = "sha256-9tnLlKzOy8ze4m2beS/pI34IiEa5TdNNr+Rmm2TFgfk="; + npmDepsHash = "sha256-yCWSEuhiP6DfcFns6uyUrLBJeQbOK7yJ9QfGhHkTlHI="; + makeCacheWritable = true; dontNpmBuild = true; nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3; diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index e7a9f8cf680..24148153cf8 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -47,19 +47,42 @@ , at-spi2-atk , at-spi2-core , libqt5pas +, qt6 +, vivaldi-ffmpeg-codecs +, edition ? "stable" }: -stdenv.mkDerivation rec { - pname = "yandex-browser"; - version = "23.7.1.1148-1"; +let + version = { + corporate = "23.9.1.1016-1"; + beta = "23.9.1.1028-1"; + stable = "23.9.1.962-1"; + }.${edition}; + + hash = { + corporate = "sha256-A/MjphA6vefDzPmShpPbgjDTl4WnCiZWuHofy1Djrzc="; + beta = "sha256-vnz1weMwR3V/mBNzrJ0iqnA/aifYTCucW+9kyy/0SnA="; + stable = "sha256-VrDqFLvK7RdnV6Yt1DILu7mV1WFcilOH5+VKlCdpXjc="; + }.${edition}; + + app = { + corporate = ""; + beta = "-beta"; + stable = ""; + }.${edition}; + +in stdenv.mkDerivation rec { + pname = "yandex-browser-${edition}"; + inherit version; src = fetchurl { - url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-SJbuT2MnsXcqOSk4xCUokseDotjbWgAnvwnfNPF9zi4="; + url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}/${pname}_${version}_amd64.deb"; + inherit hash; }; nativeBuildInputs = [ autoPatchelfHook + qt6.wrapQtAppsHook wrapGAppsHook ]; @@ -108,6 +131,7 @@ stdenv.mkDerivation rec { pango stdenv.cc.cc.lib libqt5pas + qt6.qtbase ]; unpackPhase = '' @@ -118,15 +142,20 @@ stdenv.mkDerivation rec { installPhase = '' cp $TMP/ya/{usr/share,opt} $out/ -R - substituteInPlace $out/share/applications/yandex-browser-beta.desktop --replace /usr/ $out/ - ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser - ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser-beta + cp $out/share/applications/yandex-browser${app}.desktop $out/share/applications/${pname}.desktop || true + rm -f $out/share/applications/yandex-browser.desktop + substituteInPlace $out/share/applications/${pname}.desktop --replace /usr/ $out/ + substituteInPlace $out/share/menu/yandex-browser${app}.menu --replace /opt/ $out/opt/ + substituteInPlace $out/share/gnome-control-center/default-apps/yandex-browser${app}.xml --replace /opt/ $out/opt/ + ln -sf ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so $out/opt/yandex/browser${app}/libffmpeg.so + ln -sf $out/opt/yandex/browser${app}/yandex-browser${app} $out/bin/${pname} ''; runtimeDependencies = map lib.getLib [ libpulseaudio curl systemd + vivaldi-ffmpeg-codecs ] ++ buildInputs; meta = with lib; { diff --git a/pkgs/applications/networking/clash-verge/default.nix b/pkgs/applications/networking/clash-verge/default.nix index 35a6d4438ea..82a31f3e5e2 100644 --- a/pkgs/applications/networking/clash-verge/default.nix +++ b/pkgs/applications/networking/clash-verge/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "clash-verge"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-+RYfGLa4d5JkLWnlYfhjCOSREVJ4ad/R36eSiNj3GIA="; + hash = "sha256-kOju4yaa+EKzFWDrk0iSJVoWkQMBjQG3hKLfAsqlsy8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix index 70c464bb7c9..00816c0203e 100644 --- a/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.13.2"; + version = "3.13.3"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - hash = "sha256-4d0AZknOPQR84HbZiYgXAR/HA82cYes+gzoLWw4SVgA="; + hash = "sha256-kLDriWkzOX4mC4VTpkyEtMTpOSoR0BsCwVeWLCfaY5w="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index cf0ec824b03..f9d95627f76 100644 --- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - hash = "sha256-H9Pw4HPffFmRJXGh+e2hcddYfhgmvnUOxezQ6Zc8NwY="; + hash = "sha256-2h1Pc313JZ/2NkFOOQnIrhe1Pm8FJ/BvxjAQhs/eSK0="; }; - vendorHash = "sha256-9XdLSTr9FKuatJzpWM8AwrPtYDS+LC14bpz6evvJRuQ="; + vendorHash = "sha256-E+7ndvXWzsU896/eWyupbvqkLed2ly91osptZKT79fk="; postPatch = '' substituteInPlace pkg/config/config.go \ diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index 9b88d99e44a..59397e9f312 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-unittest"; - version = "0.3.3"; + version = "0.3.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-11rgARUfTbr8FkmR2lI4uoIqzi9cRuVPalUOsxsnO3E="; + hash = "sha256-RgEYFTI1uaW1aTr+/lpKQ39o5CLsj/p0JeSTUXti/IM="; }; - vendorHash = "sha256-E9HSP8c/rGG+PLbnT8V5GflpnFItCeXyeLGiqDj4tRI="; + vendorHash = "sha256-P0PVzgaUN9X9x77v1psV13vNl06HrHbdlA1YHCq/eCo="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index b5e726dfcb6..b380d07023a 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { description = "A Kubernetes credential plugin implementing Azure authentication"; inherit (src.meta) homepage; license = licenses.mit; - maintainers = with maintainers; [ yurrriq ]; + maintainers = []; }; } diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index acead1775d2..507430e231c 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - sha256 = "sha256-fXRzo68d65FISW+m/BTmwOXlJiCmMm9Az1qsGGsbPIA="; + sha256 = "sha256-vlUR/fr/PFUBzvxebssrcUgfgnDpFuLuJOl5SBEMKR8="; }; vendorHash = "sha256-EcHHSOAr93M2kPhEaZSpvpZCq4pi1NCedo9hw1Mn0a4="; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index c973a20ad53..f5f3961ade4 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -75,9 +75,9 @@ rec { nomad_1_6 = generic { buildGoModule = buildGo121Module; - version = "1.6.2"; - sha256 = "sha256-Q0RyO9FZWGxWgVmTU07/pw5P4Ebcwcednq8TDmshuAk="; - vendorHash = "sha256-XCuWhKuBtSPTK8fXwgjMKMjwLnl1KWZKSJ4Ih9XDIDc="; + version = "1.6.3"; + sha256 = "sha256-5UWGriDy15PX3+9UppcUsEwih/e9COLVBis3fn+24L0="; + vendorHash = "sha256-gXoheW6Ww9Iu4utKNHweP2blzhWid+Q9Tp0ZgCmBAVg="; passthru.tests.nomad = nixosTests.nomad; preCheck = '' export PATH="$PATH:$NIX_BUILD_TOP/go/bin" diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 5974560092c..ed252614490 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -167,9 +167,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.6.2"; - hash = "sha256-24B8YlorL00OqmYYVM1xg5dM9hZ4enDWJ1XIGmeEAiM="; - vendorHash = "sha256-fIirGWt4Os2uZHo4ui7wmZEp+DRUHu/0p+cQCbUbzjc="; + version = "1.6.3"; + hash = "sha256-2ai0WAknz4rt33BuBoqnTCsfPNHmet9+PdgYeeJKQkQ="; + vendorHash = "sha256-ZtaXUX0PgL1nwXgohcfCyj/fLPAodx8amHEsQnlOQrc="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 7d4f941a27e..8ea2defea91 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -6,16 +6,16 @@ buildGo121Module rec { pname = "timoni"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-45OIj57gb8njYoks7SgIlcMjz07ShEz2G/EECaTRTQg="; + hash = "sha256-kMqQiFicuKa0j/li9UmitEeSof0vLlgGR4AMtJksROs="; }; - vendorHash = "sha256-lRZFRnft8vEntVxiLOBcR00FP8AXexLyo3h2LCNWN00="; + vendorHash = "sha256-tAqmTl+5tScXOaYWEvMs2RPTdyLTAemQN1VqOQGe6lU="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 0420ae8ca94..1862cf6e04a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,14 +1,14 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.32"; - ptb = "0.0.51"; - canary = "0.0.171"; + stable = "0.0.33"; + ptb = "0.0.53"; + canary = "0.0.173"; development = "0.0.1"; } else { - stable = "0.0.281"; - ptb = "0.0.82"; - canary = "0.0.320"; + stable = "0.0.282"; + ptb = "0.0.84"; + canary = "0.0.329"; development = "0.0.2"; }; version = versions.${branch}; @@ -16,15 +16,15 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-XeGDKRKnvDyl0AWm9Vs/PDeIfAq/FL9AsjLt+dNg1HQ="; + hash = "sha256-UVgufPNIS7fa3VDzjCWwgK3xxmqNivq461qWLgirClc="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-VlvGZ5qy61zse0mhvrROYwr0C94Zy1Kh4D4dp+sJTN0="; + hash = "sha256-g2NhwkfNi5Yf+n9vHq/MJ0kylPF3MPocgF/zYfCvoZM="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-NcmV+DPI5hfNdBUgoaOLsjG32QfjF+x7f01B6PR10Vc="; + hash = "sha256-YFjGUAaZMy1JhtKhAqLbfYTKQSgS9TKWqR078cERNUI="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; @@ -34,15 +34,15 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-Qxh9K0u99xfsVPJyAD3bFeZPxBXg2EeDyM+rbF80EC8="; + hash = "sha256-3WeC+4W9+tpXNXqETorQfnE1HZWCqRkBqW0JM7whRCw="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-U99FiR3IUL8saGtVrWblWqsCIJc0rK5ZMII9/BL5H7w="; + hash = "sha256-e2gvjXUw0Yx8UY6utg1SdX8/buewuVYPl5I8fS3QtrI="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-7fPlb4x116HIXEJr1G7wVHriOQu6/2u69SpbU9qxHNw="; + hash = "sha256-B4LPFts+sx8GpZp9iRbwapUYrK4c9unH+mAoODGqDgU="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index da07eb13491..a49a2f27158 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.46"; + "version" = "1.11.47"; "hashes" = { - "desktopSrcHash" = "sha256-sgdvdTi3fi/vZohh/JPW3I24cQS0i84eM1dUgmEafWs="; + "desktopSrcHash" = "sha256-Ea3LJt+3HAOX2PTREMojtuPVTeA6u7VJtysd8bbTbwU="; "desktopYarnHash" = "1nssv92yk1a53v7mvijkrb3gzif5xrz2j6lxvg7p340z42rm7f9v"; - "webSrcHash" = "sha256-3ucitVtYnOc5UUn4y3u+L0sKWJLt+NNrd5T6mn0wNBg="; - "webYarnHash" = "19396p654zzzh6d18rpyckjd67lncch3r9a0zmjb7znsi7d78k63"; + "webSrcHash" = "sha256-DPBMZMjDnwjdNsePcUBBU0KRGOpOmNHgQZn9/ad/Qss="; + "webYarnHash" = "0rzipmaq0jarzdawl7lmxnapwzl52kklxadm859hgx9b1hd5vwj7"; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 3b191570bfe..fd837eaea8a 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20231015"; + version = "20231030-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-P3IbCWzc7V2yX8qZIPUncJXFFq9iFl7csDj2tiTZ7AY="; + hash = "sha256-xY5UpM1vYAL2hZUkh5O4Z6zJ5HVxXTtvDlXedlsU820="; }; postPatch = '' 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 cbfcad3ed4d..cf4e367dd8f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -104,14 +104,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.11.1"; + version = "4.11.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-tWUdSFr93plCuQkA8SE+GZeAyZcYPUoFd0sIOyEuobs="; + hash = "sha256-Hjg349h9dlBfKVLIPDqPP8U+Yt0Iaeyjq6hsUB5+zYM="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 4853dc8b2cf..c26bebc8a89 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-10-17"; + version = "unstable-2023-11-01"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "be153adaa363b2b13242466ad5b7b87f61301639"; - sha256 = "sha256-/hZNMV+IG00YzxH66Gh/BW9JdGFfsfnM93eD6oB3tlI="; + rev = "71cce98c5fb1d9328892d55f70db711afd5b1aef"; + sha256 = "sha256-cEow6Hrp00nchfNtuABsLfD07KtlErWxh0NFv2uPQdQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix index 8c292d44420..df995010198 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "webcord"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; rev = "v${version}"; - hash = "sha256-SIGV/Hl5O+xs1DbA25TGasXJVYgCzAP/GCtsDmxKDvI="; + hash = "sha256-isrExJeONhIxJUXOsMMq8l9xF9amInBGnb5D+DKuzHw="; }; - npmDepsHash = "sha256-ClPcLHO4+CzOswQaItbFYHVlb0W6Y5NZF140jGpoSJ8="; + npmDepsHash = "sha256-RTYPxS6uLLCIu4JfQqMQP8y8+S5uwe3KXWNlbe7/A7Q="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 24637572160..81f7903adc1 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.15.3"; + version = "1.15.4"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-FKjsosSSW0U8fQwV6QYhsbuuaTeCt6SfHEcY0v5xUO4="; + hash = "sha256-twczHU41xXJvBg4nTQyJrmNCCSoJWAnRLs4DV0uKpjE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/p2p/libutp/3.4.nix b/pkgs/applications/networking/p2p/libutp/3.4.nix index ff9415e9434..aa2853d3bd0 100644 --- a/pkgs/applications/networking/p2p/libutp/3.4.nix +++ b/pkgs/applications/networking/p2p/libutp/3.4.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libutp"; - version = "unstable-2023-08-04"; + version = "unstable-2023-10-16"; src = fetchFromGitHub { # Use transmission fork from post-3.4-transmission branch owner = "transmission"; repo = pname; - rev = "09ef1be66397873516c799b4ec070690ff7365b2"; - hash = "sha256-DlEbU7uAcQOiBf7QS/1kiw3E0nk3xKhlzhAi8buQNCI="; + rev = "2589200eac82fc91b65979680e4b3c026dff0278"; + hash = "sha256-wsDqdbMWVm3ubTbg5XClEWutJz1irSIazVLFeCyAAL4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index e3234af43da..7386c32c279 100644 --- a/pkgs/applications/networking/sync/celeste/default.nix +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -7,13 +7,12 @@ , pkg-config , wrapGAppsHook4 , cairo +, dbus , gdk-pixbuf , glib , graphene -, gtk3 , gtk4 , libadwaita -, libappindicator-gtk3 , librclone , pango , rclone @@ -21,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "celeste"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "hwittenborn"; repo = "celeste"; rev = "v${version}"; - hash = "sha256-fqPAQCbuPnFyn3wioWDETmcXu53808nvnlEzcdUevI4="; + hash = "sha256-U+2imF4hUDJAwwf/RFZXfOgTxA+O8c6C+CzQoEQreJw="; }; - cargoHash = "sha256-mVl7CsCX7HMlGC2EIKEfHnPNjmrexjsrpDK/Uq/GwpY="; + cargoHash = "sha256-9DrJoXT/uD8y7y2r58DMuURSaic+TtlnPPbw/gq9jPA="; postPatch = '' pushd $cargoDepsCopy/librclone-sys @@ -64,10 +63,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ cairo + dbus gdk-pixbuf glib graphene - gtk3 gtk4 libadwaita librclone @@ -76,7 +75,6 @@ rustPlatform.buildRustPackage rec { preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libappindicator-gtk3 ]}" --prefix PATH : "${lib.makeBinPath [ rclone ]}" ) ''; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 56c2219af67..f2940b1e3fb 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -5,29 +5,20 @@ , installShellFiles , jq , python3 -, fetchpatch }: python3.pkgs.buildPythonApplication rec { pname = "todoman"; - version = "4.3.2"; + version = "4.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pimutils"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dxyI9ypZZBouTUF72wzvi7j+CeoQ9JNSiXrVeV7ForY="; + hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w="; }; - patches = [ - (fetchpatch { - name = "disable-broken-urwid-test.patch"; - url = "https://github.com/pimutils/todoman/commit/7ff0d2e2e69e24df5d66fecc58f8cd0b4e5ced6d.patch"; - hash = "sha256-MMNnnIthNqobexd8GaA6lYxzv5gr1l0e9YK+Ygeje2w="; - }) - ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ @@ -64,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { postInstall = '' installShellCompletion --bash contrib/completion/bash/_todo - substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${jq}/bin/jq " + substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${lib.getExe jq} " installShellCompletion --zsh contrib/completion/zsh/_todo ''; @@ -85,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { "todoman" ]; - meta = with lib; { + meta = { homepage = "https://github.com/pimutils/todoman"; description = "Standards-based task manager based on iCalendar"; longDescription = '' @@ -99,9 +90,9 @@ python3.pkgs.buildPythonApplication rec { now. Unsupported fields may not be shown but are never deleted or altered. ''; - changelog = "https://github.com/pimutils/todoman/raw/v${version}/CHANGELOG.rst"; - license = licenses.isc; - maintainers = with maintainers; [ leenaars antonmosich ]; + changelog = "https://todoman.readthedocs.io/en/stable/changelog.html#v${builtins.replaceStrings ["."] ["-"] version}"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ leenaars antonmosich ]; mainProgram = "todo"; }; } diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index f55371fd689..1a986b6b0d1 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -24,7 +24,7 @@ , libbladeRF , mbelib , ninja -, opencv3 +, opencv4 , pkg-config , qtcharts , qtdeclarative @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.16.0"; + version = "7.17.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-k35TZ2H8GX3gSYyb27hTY6gHHnxPkFwp1v4OJXhvV7A="; + hash = "sha256-v2ESMFAbsYbZVVIHlGCU01QPDorUZyLiUEhexr6zF5o="; }; nativeBuildInputs = [ @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { libusb1 limesuite mbelib - opencv3 + opencv4 qtcharts qtdeclarative qtgamepad diff --git a/pkgs/applications/science/biology/mmseqs2/default.nix b/pkgs/applications/science/biology/mmseqs2/default.nix index 253f4a43a81..3e39fcb2918 100644 --- a/pkgs/applications/science/biology/mmseqs2/default.nix +++ b/pkgs/applications/science/biology/mmseqs2/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mmseqs2"; - version = "14-7e284"; + version = "15-6f452"; src = fetchFromGitHub { owner = "soedinglab"; repo = pname; rev = version; - sha256 = "sha256-pVryZGblgMEqJl5M20CHxav269yGY6Y4ci+Gxt6SHOU="; + sha256 = "sha256-L+zOWrGkCLz/wqpBuji8H4/93sDFpcfnDOE8FHq1j84="; }; nativeBuildInputs = [ cmake xxd perl installShellFiles ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index fe8180899c0..9717e69e9c2 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -217,7 +217,7 @@ self = stdenv.mkDerivation { together with an environment for semi-interactive development of machine-checked proofs. ''; - homepage = "http://coq.inria.fr"; + homepage = "https://coq.inria.fr"; license = licenses.lgpl21; branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ]; diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 12465ad9087..ecc929cb5f0 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "lean4"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${version}"; - hash = "sha256-6qbCafG0bL5KxQt2gL6hV4PFDsEMM0UXfldeOOqxsaE="; + hash = "sha256-56YtHCiNMP5fJoddSokEl0ws06IwetYLer4aLCnujZA="; }; postPatch = '' diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 5af927294d6..42c16039359 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -1,12 +1,13 @@ { config, stdenv, lib , fetchFromGitHub , fetchurl +, fetchpatch , cmake , boost , gflags , glog , hdf5-cpp -, opencv3 +, opencv4 , protobuf , doxygen , blas @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 blas ] + buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv4 blas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn ++ lib.optional lmdbSupport lmdb @@ -96,6 +97,11 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + (fetchpatch { + name = "support-opencv4"; + url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch"; + hash = "sha256-ZegTvp0tTHlopQv+UzHDigs6XLkP2VfqLCWXl6aKJSI="; + }) ] ++ lib.optional pythonSupport (substituteAll { src = ./python.patch; inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy @@ -148,7 +154,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://caffe.berkeleyvision.org/"; maintainers = with maintainers; [ ]; - broken = pythonSupport && (python.isPy310); + broken = (pythonSupport && (python.isPy310)) || cudaSupport; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index d65de87d8eb..993da2b8989 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, fetchpatch, bash, cmake -, opencv3, gtest, blas, gomp, llvmPackages, perl +, opencv4, gtest, blas, gomp, llvmPackages, perl , cudaSupport ? config.cudaSupport, cudaPackages ? { }, nvidia_x11 , cudnnSupport ? cudaSupport }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; - buildInputs = [ opencv3 gtest blas.provider ] + buildInputs = [ opencv4 gtest blas.provider ] ++ lib.optional stdenv.cc.isGNU gomp ++ lib.optional stdenv.cc.isClang llvmPackages.openmp # FIXME: when cuda build is fixed, remove nvidia_x11, and use /run/opengl-driver/lib diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 4721e946464..45209881f7a 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "7.24.1"; + version = "7.24.2"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-CAzAKxNHG8ew9v2B1jK7MxfWGwTfdmDncDe7QT+twd8="; + hash = "sha256-Aaoqf53wagCkzkZUs7mVbE2Z2P6GvxiQYxPrL6ahGqA="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index 031dfc27f20..e39b61499e1 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.14.1"; + version = "3.14.2"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "sha256-IHJ30qXNVv9tUdePskHl1hd5kPivBb2kH1oOstBr/9s="; + sha256 = "sha256-LBxVZ5Az0vGalbQd437of5a3aoZH51v6OKTfndHkkiM="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index aee1b2dab07..702040695a5 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.37.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-EAvBPUm2U31gzpfyjEPClT1lbBYiITXpdc+T3nUMOeg="; + hash = "sha256-t+JpCxJM2PO9nT9nYn/Rsz/s2lQQviggbjuEy0OQV88="; }; - vendorHash = "sha256-G3cpR5S+upk3js5anZHXxcRayTEGMqnBpmtp4HO0pjQ="; + vendorHash = "sha256-XZhZDYdbjA/1g7/mPxm5u1b+z/TmwoH60/sJZ63LQMg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index ad9ae30cda5..a7ab4f7e990 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.167"; + version = "5.12.169"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-tselj673Zkur0IAuOt0l/RffJiA6x2PYkdV+dCrNx+M="; + hash = "sha256-+PBZZhWTm+as6eZjPq+dsUVBOIPN2qvj3zoqN2+xEmA="; }; - cargoHash = "sha256-t2u8umPy8fJLjbUEpkufE96n+FXcV0ZCVYrK0lNBhHA="; + cargoHash = "sha256-TQR9yAV4aYuMH36hvx7y47403V7h54yCed44heSkMd8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gita/default.nix b/pkgs/applications/version-management/gita/default.nix index f2d9d2a9f66..257ace5013e 100644 --- a/pkgs/applications/version-management/gita/default.nix +++ b/pkgs/applications/version-management/gita/default.nix @@ -9,12 +9,12 @@ }: buildPythonApplication rec { - version = "0.11.9"; + version = "0.16.6.1"; pname = "gita"; src = fetchFromGitHub { - sha256 = "9+zuLAx9lMfltsBqjvsivJ5wPnStPfq11XgGMv/JDpY="; - rev = version; + sha256 = "sha256-kPyk13yd4rc63Nh73opuHsCTj4DgYAVfro8To96tteA="; + rev = "v${version}"; repo = "gita"; owner = "nosarthur"; }; @@ -26,22 +26,8 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - postUnpack = '' - for case in "\n" ""; do - substituteInPlace source/tests/test_main.py \ - --replace "'gita$case'" "'source$case'" - done - ''; - - nativeCheckInputs = [ - git - pytest - ]; - - checkPhase = '' - git init - pytest tests - ''; + # 3 of the tests are failing + doCheck = false; postInstall = '' installShellCompletion --bash --name gita ${src}/.gita-completion.bash diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 75f3cc91095..a3fd87e6142 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron_22 }: +{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron, nixosTests }: stdenv.mkDerivation rec { pname = "freetube"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "add96ad3509d4d5c6d8658b005dfd046963cd6bb0a4e1f3e88f726a86c05810f"; }; + passthru.tests = nixosTests.freetube; + appimageContents = appimageTools.extractType2 { name = "${pname}-${version}"; inherit src; @@ -35,9 +37,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; - # Electron version is set to 22 in order to match upstream postFixup = '' - makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar ''; @@ -46,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://freetubeapp.io/"; license = licenses.agpl3Only; maintainers = with maintainers; [ ryneeverett alyaeanyx ]; - inherit (electron_22.meta) platforms; + inherit (electron.meta) platforms; }; } diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 70ed0976f7e..96c4113f4bf 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "79.0"; + version = "80.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-M+CST7A/obfuGH4lyV68vrhmzEIFCa7DRgApKbPh/uQ="; + hash = "sha256-/RqTfnxivghViFryCvj5RXSBziztb1Drb7tT89cGZ3o="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 63bad0fe645..d3d1ceb2de6 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -42,6 +42,8 @@ obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { }; + obs-replay-source = qt6Packages.callPackage ./obs-replay-source.nix { }; + obs-rgb-levels-filter = callPackage ./obs-rgb-levels-filter.nix { }; obs-scale-to-sound = callPackage ./obs-scale-to-sound.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index 8e227195484..ec9885fc7e7 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-pipewire-audio-capture"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "dimtpap"; repo = pname; rev = version; - sha256 = "sha256-D4ONz/4S5Kt23Tmfa6jvw0X7680R9YDqG8/N6HhIQLE="; + sha256 = "sha256-9HPQ17swMlsCnKkYQXIUzEbx2vKuBUfGf58Up2hHVGI="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix new file mode 100644 index 00000000000..994a56d4c86 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libcaption +, obs-studio +, qtbase +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "obs-replay-source"; + version = "1.6.12"; + + src = fetchFromGitHub { + owner = "exeldro"; + repo = "obs-replay-source"; + rev = finalAttrs.version; + sha256 = "sha256-MzugH6r/jY5Kg7GIR8/o1BN36FenBzMnqrPUceJmbPs="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libcaption obs-studio qtbase ]; + + postInstall = '' + mkdir -p "$out/lib" "$out/share" + mv "$out/obs-plugins/64bit" "$out/lib/obs-plugins" + rm -rf "$out/obs-plugins" + mv "$out/data" "$out/share/obs" + ''; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Replay source for OBS studio"; + homepage = "https://github.com/exeldro/obs-replay-source"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ pschmitt ]; + }; +}) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 07c9b4bb69d..ba1f724cbf4 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.2.1"; + version = "6.3.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-64Jmkva7L0oaik1UcCTQlUricL2us+O5CEc6pVsgnRI="; + hash = "sha256-k8Dfrl0Xie5zF/GhVdP/RKGajDyGblAwu49UekX1WEQ="; }; nativeCheckInputs = with python3Packages; [ @@ -23,10 +23,6 @@ python3Packages.buildPythonApplication rec { pytest-trio ]; - nativeBuildInputs = with python3Packages; [ - versioningit - ]; - propagatedBuildInputs = (with python3Packages; [ certifi isodate diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 74fa6e22563..77c36d3f81c 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.10"; + version = "1.11.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-deva/IPyjcGGAnUIofev3RV2ia7uI+OgSiUz/GtHhxE="; + hash = "sha256-D4Y+n/6R2v3U/BhYQitsHd6ckda1vfAzciFbTM/1J80="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index db6d5a3dadb..1864d167978 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.21.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-JekWw5YI6O+CLXc7oNIxPJsRzYimGFDGL6ACyM4D04k="; + hash = "sha256-17TlUQNv/L+LZYF8vub2nI5TVF66OqTA8PrjEYjkz5o="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-vVnaZLvPbhJNFn/ACuYDbXCKPKNlYoGCm+liTlPMcjs="; + vendorHash = "sha256-zBogjMaVkLum1rQVEd+Rw8lRCNC/Dhi7cuz4YH3eCcg="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/applications/virtualization/imgcrypt/default.nix index 86c1da42a22..25adabdba0a 100644 --- a/pkgs/applications/virtualization/imgcrypt/default.nix +++ b/pkgs/applications/virtualization/imgcrypt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "imgcrypt"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-FLqFzEEfgsKcjAevhF6+8mR3zOUjfXyfWwWsxVOcdJU="; + hash = "sha256-EStyi6RDK1G6kuaDGumZaHB4OrSrhhx/F5GsLe0amyA="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index d71ec6b5725..67edd6887c9 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - hash = "sha256-9vNzKoG+0Ze4+dhluNM6QtsUjV8/bpkuvEF8ASBfBRo="; + hash = "sha256-YoRwr5imolblix1st/YeVTrAUdQXTqrx1BdNMdYlt/0="; }; vendorHash = null; diff --git a/pkgs/applications/window-managers/cosmic/settings/Cargo.lock b/pkgs/applications/window-managers/cosmic/settings/Cargo.lock new file mode 100644 index 00000000000..2156ab5c8c0 --- /dev/null +++ b/pkgs/applications/window-managers/cosmic/settings/Cargo.lock @@ -0,0 +1,6214 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.11.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" + +[[package]] +name = "accesskit_consumer" +version = "0.15.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_unix" +version = "0.4.0" +source = "git+https://github.com/wash2/accesskit.git?tag=v0.11.0#2dee3df0a525d727df9f54ae71cfe8b47d7c2751" +dependencies = [ + "accesskit", + "accesskit_consumer", + "async-channel", + "atspi", + "futures-lite", + "log", + "serde", + "zbus", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "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 = "almost" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" + +[[package]] +name = "android-activity" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +dependencies = [ + "android-properties", + "bitflags 1.3.2", + "cc", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum 0.6.1", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "apply" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-protocols 0.30.1", + "zbus", +] + +[[package]] +name = "ashpd" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf" +dependencies = [ + "async-std", + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "url", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.26", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io", + "async-lock", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.20", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.20", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel", + "async-global-executor", + "async-io", + "async-lock", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomicwrites" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4d45f362125ed144544e57b0ec6de8fd6a296d41a6252fc4a20c0cf12e9ed3a" +dependencies = [ + "rustix 0.38.20", + "tempfile", + "windows-sys 0.48.0", +] + +[[package]] +name = "atspi" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e7a3376837b2e7d12d34d58ac47073c491dc3bf6f71a7adaf687d4d817faa" +dependencies = [ + "async-recursion", + "async-trait", + "atspi-macros", + "enumflags2", + "futures-lite", + "serde", + "tracing", + "zbus", + "zbus_names", +] + +[[package]] +name = "atspi-macros" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb4870a32c0eaa17e35bca0e6b16020635157121fb7d45593d242c295bc768" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys", + "objc2-encode", +] + +[[package]] +name = "blocking" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "byte-unit" +version = "4.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" +dependencies = [ + "utf8-width", +] + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calendrical_calculations" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dfe3bc6a50b4667fafdb6d9cf26731c5418c457e317d8166c972014facf9a5d" +dependencies = [ + "core_maths", + "displaydoc", +] + +[[package]] +name = "calloop" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" +dependencies = [ + "bitflags 1.3.2", + "log", + "nix 0.25.1", + "slotmap", + "thiserror", + "vec_map", +] + +[[package]] +name = "calloop" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" +dependencies = [ + "bitflags 2.4.1", + "log", + "polling 3.2.0", + "rustix 0.38.20", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop 0.12.3", + "rustix 0.38.20", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "clipboard-win" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +dependencies = [ + "error-code", + "str-buf", + "winapi", +] + +[[package]] +name = "clipboard_macos" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" +dependencies = [ + "objc", + "objc-foundation", + "objc_id", +] + +[[package]] +name = "clipboard_wayland" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747" +dependencies = [ + "smithay-clipboard", +] + +[[package]] +name = "clipboard_x11" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921" +dependencies = [ + "thiserror", + "x11rb 0.9.0", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color-eyre" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorgrad" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5f405d474b9d05e0a093d3120e77e9bf26461b57a84b40aa2a221ac5617fb6" +dependencies = [ + "csscolorparser", +] + +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] +name = "concat-in-place" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5b80dba65d26e0c4b692ad0312b837f1177e8175031af57fd1de4f3bc36b430" + +[[package]] +name = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const_format" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "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 = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] +name = "cosmic-bg-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-bg#6a6fe4e387e46c2e159df56a9768220a6269ccf4" +dependencies = [ + "colorgrad", + "cosmic-config", + "derive_setters", + "image", + "ron", + "serde", + "tracing", +] + +[[package]] +name = "cosmic-comp-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-comp#7300e23ce8708313e90689146914b452545e5446" +dependencies = [ + "input", + "serde", +] + +[[package]] +name = "cosmic-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "atomicwrites", + "calloop 0.12.3", + "cosmic-config-derive", + "dirs 5.0.1", + "iced_futures", + "notify", + "ron", + "serde", +] + +[[package]] +name = "cosmic-config-derive" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cosmic-panel-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-panel#021faaf459cbb47e7f5b94316cfd93ccaed7ecf6" +dependencies = [ + "anyhow", + "cosmic-config", + "ron", + "serde", + "tracing", + "wayland-protocols-wlr", + "xdg-shell-wrapper-config", +] + +[[package]] +name = "cosmic-settings" +version = "0.1.0" +dependencies = [ + "anyhow", + "apply", + "ashpd 0.6.7", + "async-channel", + "color-eyre", + "cosmic-comp-config", + "cosmic-panel-config", + "cosmic-settings-desktop", + "cosmic-settings-page", + "cosmic-settings-system", + "cosmic-settings-time", + "derivative", + "derive_setters", + "dirs 5.0.1", + "downcast-rs", + "env_logger", + "freedesktop-desktop-entry", + "generator", + "i18n-embed", + "i18n-embed-fl", + "image", + "itertools 0.11.0", + "libcosmic", + "log", + "notify", + "once_cell", + "regex", + "ron", + "rust-embed", + "serde", + "slotmap", + "tokio", + "tracing", + "tracing-subscriber", + "url", +] + +[[package]] +name = "cosmic-settings-desktop" +version = "0.1.0" +dependencies = [ + "cosmic-bg-config", + "cosmic-config", + "dirs 5.0.1", + "freedesktop-icons", + "futures-lite", + "image", + "rayon", + "smithay-client-toolkit 0.17.0", + "tokio", + "tracing", + "wayland-client 0.31.1", +] + +[[package]] +name = "cosmic-settings-page" +version = "0.1.0" +dependencies = [ + "derive_setters", + "downcast-rs", + "generator", + "libcosmic", + "once_cell", + "regex", + "slotmap", +] + +[[package]] +name = "cosmic-settings-system" +version = "0.1.0" +dependencies = [ + "bumpalo", + "byte-unit", + "concat-in-place", + "const_format", + "memchr", + "sysinfo", +] + +[[package]] +name = "cosmic-settings-time" +version = "0.1.0" +dependencies = [ + "icu_calendar", + "icu_timezone", + "timedate-zbus", + "zbus", +] + +[[package]] +name = "cosmic-text" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" +dependencies = [ + "aliasable", + "fontdb", + "libm", + "log", + "rangemap", + "rustybuzz 0.8.0", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cosmic-theme" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "almost", + "cosmic-config", + "csscolorparser", + "lazy_static", + "palette", + "ron", + "serde", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[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 = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "css-color" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d101c65424c856131a3cb818da2ddde03500dc3656972269cdf79f018ef77eb4" + +[[package]] +name = "csscolorparser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +dependencies = [ + "phf", + "serde", +] + +[[package]] +name = "cursor-icon" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf" + +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags 1.3.2", + "libloading 0.7.4", + "winapi", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.38", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.2", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "enum-repr" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "error-code" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +dependencies = [ + "libc", + "str-buf", +] + +[[package]] +name = "etagere" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[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 = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "find-crate" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" +dependencies = [ + "toml 0.5.11", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float_next_after" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632" +dependencies = [ + "num-traits", +] + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.6.2", + "slotmap", + "tinyvec", + "ttf-parser 0.19.2", +] + +[[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.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "freedesktop-desktop-entry" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45157175a725e81f3f594382430b6b78af5f8f72db9bd51b94f0785f80fc6d29" +dependencies = [ + "dirs 3.0.2", + "gettext-rs", + "memchr", + "thiserror", + "xdg", +] + +[[package]] +name = "freedesktop-icons" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9d46a9ae065c46efb83854bb10315de6d333bb6f4526ebe320c004dab7857e" +dependencies = [ + "dirs 4.0.0", + "once_cell", + "rust-ini", + "thiserror", + "xdg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[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.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gettext-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glyphon" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags 1.3.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows 0.44.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown 0.14.2", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "grid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df00eed8d1f0db937f6be10e46e8072b0671accb504cf0f959c5c52c679f5b9" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.7", +] + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash 0.8.6", + "allocator-api2", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "i18n-config" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640" +dependencies = [ + "log", + "serde", + "serde_derive", + "thiserror", + "toml 0.8.5", + "unic-langid", +] + +[[package]] +name = "i18n-embed" +version = "0.13.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" +dependencies = [ + "arc-swap", + "fluent", + "fluent-langneg", + "fluent-syntax", + "i18n-embed-impl", + "intl-memoizer", + "lazy_static", + "locale_config", + "log", + "parking_lot 0.12.1", + "rust-embed", + "thiserror", + "unic-langid", + "walkdir", +] + +[[package]] +name = "i18n-embed-fl" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" +dependencies = [ + "dashmap", + "find-crate", + "fluent", + "fluent-syntax", + "i18n-config", + "i18n-embed", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.38", + "unic-langid", +] + +[[package]] +name = "i18n-embed-impl" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b" +dependencies = [ + "find-crate", + "i18n-config", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "iced" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_sctk", + "iced_widget", + "iced_winit", + "image", + "thiserror", +] + +[[package]] +name = "iced_accessibility" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "accesskit", + "accesskit_unix", +] + +[[package]] +name = "iced_core" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "bitflags 1.3.2", + "iced_accessibility", + "instant", + "log", + "palette", + "smithay-client-toolkit 0.17.0", + "thiserror", + "twox-hash", +] + +[[package]] +name = "iced_futures" +version = "0.7.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "futures", + "iced_core", + "log", + "tokio", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "glam", + "half", + "iced_core", + "image", + "kamadak-exif", + "log", + "lyon_path", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_renderer" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.1.1" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_accessibility", + "iced_core", + "iced_futures", + "smithay-client-toolkit 0.17.0", + "thiserror", +] + +[[package]] +name = "iced_sctk" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "enum-repr", + "float-cmp", + "futures", + "iced_futures", + "iced_graphics", + "iced_runtime", + "iced_style", + "itertools 0.10.5", + "lazy_static", + "raw-window-handle", + "smithay-client-toolkit 0.17.0", + "smithay-clipboard", + "thiserror", + "tracing", + "wayland-backend 0.3.2", + "wayland-protocols 0.31.0", + "xkeysym", +] + +[[package]] +name = "iced_style" +version = "0.9.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "raw-window-handle", + "resvg", + "rustc-hash", + "softbuffer", + "tiny-skia 0.10.0", + "twox-hash", +] + +[[package]] +name = "iced_wgpu" +version = "0.11.1" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "lyon", + "once_cell", + "raw-window-handle", + "resvg", + "rustc-hash", + "twox-hash", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.1.3" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "ouroboros", + "smithay-client-toolkit 0.17.0", + "thiserror", + "unicode-segmentation", +] + +[[package]] +name = "iced_winit" +version = "0.10.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "iced_graphics", + "iced_runtime", + "iced_style", + "log", + "raw-window-handle", + "thiserror", + "web-sys", + "winapi", + "window_clipboard", + "winit", +] + +[[package]] +name = "icu_calendar" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b520c5675775e3838447c33fc55bf558148c6824ef0d20ff7a9e0df7345a281c" +dependencies = [ + "calendrical_calculations", + "displaydoc", + "icu_calendar_data", + "icu_locid", + "icu_locid_transform", + "icu_provider", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_calendar_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75d8d1a514ca7e6dc547be930f2fd661d578909c07cf1c1adade81c3f7a78840" + +[[package]] +name = "icu_locid" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" + +[[package]] +name = "icu_provider" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "icu_timezone" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e6401cd210ccda98b2e7fc707831b29c6efe319efbbec460f957b6f331f626" +dependencies = [ + "displaydoc", + "icu_calendar", + "icu_locid", + "icu_provider", + "icu_timezone_data", + "tinystr", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_timezone_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7e214a653bac59b768c42f82d252f13af95e8a9cb07b6108b8bc723c561b43" + +[[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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "imagesize" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" + +[[package]] +name = "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", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "input" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e74cd82cedcd66db78742a8337bdc48f188c4d2c12742cbc5cd85113f0b059" +dependencies = [ + "bitflags 1.3.2", + "input-sys", + "io-lifetimes 1.0.11", + "libc", + "log", + "udev", +] + +[[package]] +name = "input-sys" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f6c2a17e8aba7217660e32863af87b0febad811d4b8620ef76b386603fddc2" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "io-lifetimes" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" + +[[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.20", + "windows-sys 0.48.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[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.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kamadak-exif" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", + "libloading 0.7.4", + "pkg-config", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libcosmic" +version = "0.1.0" +source = "git+https://github.com/pop-os/libcosmic#6b517ddb0e7fe2ed8b04d6f71d1c45a374c92e14" +dependencies = [ + "apply", + "ashpd 0.5.0", + "cosmic-config", + "cosmic-theme", + "css-color", + "derive_setters", + "fraction", + "freedesktop-icons", + "iced", + "iced_core", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_sctk", + "iced_style", + "iced_tiny_skia", + "iced_widget", + "lazy_static", + "palette", + "slotmap", + "smithay-client-toolkit 0.17.0", + "taffy", + "thiserror", + "tokio", + "tracing", + "unicode-segmentation", + "url", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "litemap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +dependencies = [ + "value-bag", +] + +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown 0.14.2", +] + +[[package]] +name = "lyon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d2124218d5428149f9e09520b9acc024334a607e671f032d06567b61008977c" +dependencies = [ + "float_next_after", + "lyon_path", + "thiserror", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", +] + +[[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", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "naga" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum 0.5.11", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.4.1+23.1.7779620" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nix" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.1", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +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 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", +] + +[[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 = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +dependencies = [ + "block2", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orbclient" +version = "0.3.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" +dependencies = [ + "redox_syscall 0.3.5", +] + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "ouroboros" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" +dependencies = [ + "ttf-parser 0.19.2", +] + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", + "serde", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.20", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[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.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "resvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +dependencies = [ + "gif", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgtypes", + "tiny-skia 0.10.0", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.1", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rust-embed" +version = "6.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "6.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.38", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "7.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-ini" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes 1.0.11", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rustybuzz" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser 0.18.1", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82eea22c8f56965eeaf3a209b3d24508256c7b920fb3b6211b8ba0f7c0583250" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.19.2", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sctk-adwaita" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09" +dependencies = [ + "ab_glyph", + "log", + "memmap2 0.5.10", + "smithay-client-toolkit 0.16.1", + "tiny-skia 0.8.4", +] + +[[package]] +name = "self_cell" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" + +[[package]] +name = "serde" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_repr" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_spanned" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "smithay-client-toolkit" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" +dependencies = [ + "bitflags 1.3.2", + "calloop 0.10.6", + "dlib", + "lazy_static", + "log", + "memmap2 0.5.10", + "nix 0.24.3", + "pkg-config", + "wayland-client 0.29.5", + "wayland-cursor 0.29.5", + "wayland-protocols 0.29.5", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.17.0" +source = "git+https://github.com/smithay/client-toolkit//?rev=dc8c4a0#dc8c4a035128208af65141fe12142a1dbc4a32bb" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "calloop 0.12.3", + "calloop-wayland-source", + "cursor-icon", + "dlib", + "log", + "memmap2 0.7.1", + "nix 0.26.4", + "pkg-config", + "thiserror", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-csd-frame", + "wayland-cursor 0.31.0", + "wayland-protocols 0.31.0", + "wayland-protocols-wlr", + "wayland-scanner 0.31.0", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +dependencies = [ + "smithay-client-toolkit 0.16.1", + "wayland-client 0.29.5", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "softbuffer" +version = "0.2.0" +source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-2.0-old#ece901a9f60dc89ca740dc3bd11f3c909e801723" +dependencies = [ + "bytemuck", + "cfg_aliases", + "cocoa", + "core-graphics", + "fastrand 1.9.0", + "foreign-types", + "log", + "nix 0.26.4", + "objc", + "raw-window-handle", + "redox_syscall 0.3.5", + "thiserror", + "wasm-bindgen", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-sys 0.30.1", + "web-sys", + "windows-sys 0.42.0", + "x11-dl", + "x11rb 0.11.1", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "str-buf" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + +[[package]] +name = "svgtypes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +dependencies = [ + "yazi", + "zeno", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "unicode-xid", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "sysinfo" +version = "0.29.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] +name = "taffy" +version = "0.3.11" +source = "git+https://github.com/DioxusLabs/taffy#d4374b93f0ec2c0ace42d3feafec22d3af1940d8" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "temp-dir" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" + +[[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall 0.3.5", + "rustix 0.38.20", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[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 = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "timedate-zbus" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "609052c48ae1d9e27999ac4a159843a290bffab5fdc13856889b940aefc185b7" +dependencies = [ + "zbus", +] + +[[package]] +name = "tiny-skia" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "png", + "tiny-skia-path 0.8.4", +] + +[[package]] +name = "tiny-skia" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path 0.10.0", +] + +[[package]] +name = "tiny-skia-path" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tiny-skia-path" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinystr" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[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.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3efaf127c78d5339cc547cce4e4d973bd5e4f56e949a06d091c082ebeef2f800" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.5", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.2", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "782bf6c2ddf761c1e7855405e8975472acf76f7f36d0d4328bd3b7a2fae12a85" +dependencies = [ + "indexmap 2.0.2", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "rand", + "static_assertions", +] + +[[package]] +name = "type-map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "udev" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a" +dependencies = [ + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] + +[[package]] +name = "unic-langid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +dependencies = [ + "unic-langid-impl", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +dependencies = [ + "serde", + "tinystr", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-general-category" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +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 = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "usvg" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +dependencies = [ + "base64", + "log", + "pico-args", + "usvg-parser", + "usvg-text-layout", + "usvg-tree", + "xmlwriter", +] + +[[package]] +name = "usvg-parser" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +dependencies = [ + "data-url", + "flate2", + "imagesize", + "kurbo", + "log", + "roxmltree", + "simplecss", + "siphasher", + "svgtypes", + "usvg-tree", +] + +[[package]] +name = "usvg-text-layout" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +dependencies = [ + "fontdb", + "kurbo", + "log", + "rustybuzz 0.7.0", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg-tree", +] + +[[package]] +name = "usvg-tree" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +dependencies = [ + "rctree", + "strict-num", + "svgtypes", + "tiny-skia-path 0.10.0", +] + +[[package]] +name = "utf8-width" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-bag" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" + +[[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 = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.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.38", + "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.38", + "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 = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes 1.0.11", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.30.1", +] + +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys 0.31.1", +] + +[[package]] +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "libc", + "nix 0.24.3", + "scoped-tls", + "wayland-commons", + "wayland-scanner 0.29.5", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "nix 0.26.4", + "wayland-backend 0.1.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.1", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix 0.24.3", + "once_cell", + "smallvec", + "wayland-sys 0.29.5", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.1", + "cursor-icon", + "wayland-backend 0.3.2", +] + +[[package]] +name = "wayland-cursor" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +dependencies = [ + "nix 0.24.3", + "wayland-client 0.29.5", + "xcursor", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +dependencies = [ + "nix 0.26.4", + "wayland-client 0.31.1", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.3.2", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-scanner 0.29.5", +] + +[[package]] +name = "wayland-protocols" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b28101e5ca94f70461a6c2d610f76d85ad223d042dd76585ab23d3422dd9b4d" +dependencies = [ + "bitflags 1.3.2", + "wayland-backend 0.1.2", + "wayland-client 0.30.2", + "wayland-scanner 0.30.1", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend 0.3.2", + "wayland-client 0.31.1", + "wayland-protocols 0.31.0", + "wayland-scanner 0.31.0", + "wayland-server", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml 0.28.2", + "quote", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml 0.30.0", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce" +dependencies = [ + "bitflags 2.4.1", + "downcast-rs", + "io-lifetimes 2.0.2", + "nix 0.26.4", + "wayland-backend 0.3.2", + "wayland-scanner 0.31.0", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "dlib", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + +[[package]] +name = "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 = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "wgpu" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "foreign-types", + "glow", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + +[[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-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +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 = "window_clipboard" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d" +dependencies = [ + "clipboard-win", + "clipboard_macos", + "clipboard_wayland", + "clipboard_x11", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows_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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_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.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winit" +version = "0.28.6" +source = "git+https://github.com/pop-os/winit.git?branch=master#4060baa6ad2237092fed166d96f18d5394f92ef1" +dependencies = [ + "android-activity", + "bitflags 1.3.2", + "cfg_aliases", + "core-foundation", + "core-graphics", + "dispatch", + "instant", + "libc", + "log", + "mio", + "ndk", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "sctk-adwaita", + "smithay-client-toolkit 0.16.1", + "wasm-bindgen", + "wayland-client 0.29.5", + "wayland-commons", + "wayland-protocols 0.29.5", + "wayland-scanner 0.29.5", + "web-sys", + "windows-sys 0.45.0", + "x11-dl", +] + +[[package]] +name = "winnow" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +dependencies = [ + "memchr", +] + +[[package]] +name = "writeable" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a" +dependencies = [ + "gethostname", + "nix 0.22.3", + "winapi", + "winapi-wsapoll", +] + +[[package]] +name = "x11rb" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617" +dependencies = [ + "gethostname", + "libc", + "libloading 0.7.4", + "nix 0.25.1", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56" +dependencies = [ + "nix 0.25.1", +] + +[[package]] +name = "xcursor" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" +dependencies = [ + "nom", +] + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.4", + "winapi", +] + +[[package]] +name = "xdg-shell-wrapper-config" +version = "0.1.0" +source = "git+https://github.com/pop-os/xdg-shell-wrapper#fa62a8c865cc5ba391a48fe4753a8687d8ab8ded" +dependencies = [ + "serde", + "wayland-protocols-wlr", +] + +[[package]] +name = "xkbcommon" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88" +dependencies = [ + "libc", + "memmap2 0.7.1", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "yoke" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "synstructure", +] + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81ba595b9f2772fbee2312de30eeb80ec773b4cb2f1e8098db024afadda6c06f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "772666c41fb6dceaf520b564b962d738a8e1a83b41bd48945f50837aed78bb1d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "zerofrom" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", + "synstructure", +] + +[[package]] +name = "zerotrie" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9685bb4deb98dab812e87c296a9631fc00d7ca4bc5c2c5f304f375bbed711a8a" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/applications/window-managers/cosmic/settings/default.nix b/pkgs/applications/window-managers/cosmic/settings/default.nix new file mode 100644 index 00000000000..6767f963846 --- /dev/null +++ b/pkgs/applications/window-managers/cosmic/settings/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitHub +, rust +, rustPlatform +, cargo +, cmake +, just +, pkg-config +, libxkbcommon +, libinput +, fontconfig +, freetype +, wayland +, expat +, udev +, which +, lld +, util-linuxMinimal +}: + +rustPlatform.buildRustPackage { + pname = "cosmic-settings"; + version = "unstable-2023-10-26"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-settings"; + rev = "d15ebbd340dee7adf184831311b5da73faaa80f5"; + hash = "sha256-OlQ2jjT/ygO+hpl5Cc3h8Yp/SVo+pmI/EH7pqvY9GXI="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "accesskit-0.11.0" = "sha256-/6KUCH1CwMHd5YEMOpAdVeAxpjl9JvrzDA4Xnbd1D9k="; + "cosmic-bg-config-0.1.0" = "sha256-fdRFndhwISmbTqmXfekFqh+Wrtdjg3vSZut4IAQUBbA="; + "cosmic-comp-config-0.1.0" = "sha256-q0LP8TODETobYg0S6XDsP0Lw/RJIB8YB4jiUkRHpsio="; + "cosmic-config-0.1.0" = "sha256-+mnvf/IM9cqoZv5zHW8uBAqeY2pG3IOiOWIESVExnqg="; + "cosmic-panel-config-0.1.0" = "sha256-U5FYZ5hjJ5s6lYfWrgyuy8zLjiXGQV+OKwf6nzHZT6w="; + "smithay-client-toolkit-0.17.0" = "sha256-vDY4cqz5CZD12twElUWVCsf4N6VO9O+Udl8Dc4arWK4="; + "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY="; + "taffy-0.3.11" = "sha256-gPHJhYmDb3Pj7eM8eFv1kPoODk0BGiw+yMj9ROXIjAU="; + "winit-0.28.6" = "sha256-8IQ6HyvD09v8+KWO5jbAkouRTTX/Des4Pn/sjGrtdok="; + "xdg-shell-wrapper-config-0.1.0" = "sha256-pvaI/joul7jWTdIrPq3PbBcQGMLZLd2rTu1aIwXiZN8="; + }; + }; + + postPatch = '' + substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)" + ''; + + nativeBuildInputs = [ cmake just pkg-config which lld util-linuxMinimal ]; + buildInputs = [ libxkbcommon libinput fontconfig freetype wayland expat udev ]; + + dontUseJustBuild = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "bin-src" + "target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-settings" + ]; + + meta = with lib; { + homepage = "https://github.com/pop-os/cosmic-settings"; + description = "Settings for the COSMIC Desktop Environment"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nyanbinary ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix index 8761d615c03..1dab92609d0 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -11,6 +11,7 @@ , libselinux , libsepol , libthai +, libxkbcommon , pango , pcre , util-linux @@ -23,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprpicker" + lib.optionalString debug "-debug"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-k+rG5AZjz47Q6bpVcTK7r4s7Avg3O+1iw+skK+cn0rk="; + hash = "sha256-bys8S7wuY9FJRLD5WriktWED5Hi7nCKSiNbs1Rvfk4s="; }; cmakeBuildType = if debug then "Debug" else "Release"; @@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { libselinux libsepol libthai + libxkbcommon pango pcre wayland diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index ca77fa76394..9d21716bc70 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.22"; + version = "4.23"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-KGOZEeWdlWOfCSZCqYL14d6lkiUMK1zpjtoQCDNRPks="; + sha256 = "sha256-YQJqcZbJE50POq3ScZfosyDFduOkUOAddMGspIQETEY="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 37bf3ec26f7..944434472b0 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -41,6 +41,7 @@ ); binRustcOpts = lib.concatStringsSep " " ( + [ "-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ] ++ baseRustcOpts ); diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix new file mode 100644 index 00000000000..19dcf84116d --- /dev/null +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -0,0 +1,39 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +}: +let + pname = "asm-lsp"; + version = "0.4.2"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "bergercookie"; + repo = "asm-lsp"; + rev = "v${version}"; + hash = "sha256-EGgYOU6y23ULjnMGNjYhgF0JMPgvRuQ4UOWqwJxhBpU="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + cargoHash = "sha256-x8Cj39Wki+pdoNIO8QPGK29KFJrHtDMoZJIXFEldno0="; + + meta = { + description = "Language server for NASM/GAS/GO Assembly"; + homepage = "https://github.com/bergercookie/asm-lsp"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ NotAShelf ]; + mainProgram = pname; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ax/axmldec/package.nix b/pkgs/by-name/ax/axmldec/package.nix new file mode 100644 index 00000000000..c11a33904c1 --- /dev/null +++ b/pkgs/by-name/ax/axmldec/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, doxygen +, boost +, zlib +}: + +stdenv.mkDerivation rec { + pname = "axmldec"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "ytsutano"; + repo = "axmldec"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-LFDZZbRDa8mQmglgS4DA/OqXp0HJZ2uqg1hbStdgvUw="; + }; + + nativeBuildInputs = [ cmake doxygen ]; + buildInputs = [ boost zlib ]; + + meta = with lib; { + description = "Stand-alone binary AndroidManifest.xml decoder"; + longDescription = '' + This tool accepts either a binary or a text XML file and prints the + decoded XML to the standard output or a file. It also allows you to + extract the decoded AndroidManifest.xml directly from an APK file. + ''; + homepage = "https://github.com/ytsutano/axmldec"; + license = licenses.isc; + mainProgram = "axmldec"; + maintainers = with maintainers; [ franciscod ]; + platforms = platforms.unix ++ platforms.windows; + }; +} diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 36d60fb509d..0b759f52097 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.14.8"; + version = "0.14.9"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-VhpqmGhGBqB20ZteIwbd0GCIUltBGfBw7XF9lH7witA="; + hash = "sha256-y2hlzewDWYxkKhr77JB3lkYo5hexcdmPiCRbXLtnolM="; }; - cargoHash = "sha256-e5QyaiQKlIzBwJE781BrhdVINacw0iniPywIsoMlCGg="; + cargoHash = "sha256-uIFjWgoNCU5kUX4i1Law/YE0TmFLOi6V3Y4b9BpQlI4="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ce/celeste-classic/package.nix b/pkgs/by-name/ce/celeste-classic/package.nix new file mode 100644 index 00000000000..bbea59a5b45 --- /dev/null +++ b/pkgs/by-name/ce/celeste-classic/package.nix @@ -0,0 +1,49 @@ +{ lib +, stdenvNoCC +, fetchzip +, autoPatchelfHook +, SDL2 +, practiceMod ? false +}: + +let + directory = if practiceMod then "CELESTE*Practice*" else "CELESTE"; + srcbin = if practiceMod then "celeste_practice_mod" else "celeste"; + outbin = if practiceMod then "celeste-classic-pm" else "celeste-classic"; +in +stdenvNoCC.mkDerivation { + pname = outbin; + version = "unstable-2020-12-08"; + + # From https://www.speedrun.com/celestep8/resources + src = fetchzip { + url = "https://www.speedrun.com/static/resource/174ye.zip?v=f3dc98f"; + hash = "sha256-GANHqKB0N905QJOLaePKWkUuPl9UlL1iqvkMMvw/CC8="; + extension = "zip"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ SDL2 ]; + + installPhase = '' + runHook preInstall + install -Dsm755 ${directory}/${srcbin} $out/lib/${outbin}/${outbin} + install -Dm444 ${directory}/data.pod $out/lib/${outbin}/data.pod + mkdir -p $out/bin + ln -s $out/lib/${outbin}/${outbin} $out/bin/ + runHook postInstall + ''; + + meta = with lib; { + description = "A PICO-8 platformer about climbing a mountain, made in four days${lib.optionalString practiceMod " (Practice Mod)"}"; + homepage = "https://celesteclassic.github.io/"; + license = licenses.unfree; + platforms = platforms.linux; + mainProgram = outbin; + maintainers = with maintainers; [ mrtnvgr ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/ci/circom/package.nix b/pkgs/by-name/ci/circom/package.nix new file mode 100644 index 00000000000..6d74c5e268e --- /dev/null +++ b/pkgs/by-name/ci/circom/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "circom"; + version = "2.1.6"; + + src = fetchFromGitHub { + owner = "iden3"; + repo = "circom"; + rev = "v${version}"; + hash = "sha256-2YusBWAYDrTvFHYIjKpALphhmtsec7jjKHb1sc9lt3Q="; + }; + + cargoHash = "sha256-G6z+DxIhmm1Kzv8EQCqvfGAhQn5Vrx9LXrl+bWBVKaM="; + doCheck = false; + + meta = with lib; { + description = "zkSnark circuit compiler"; + homepage = "https://github.com/iden3/circom"; + changelog = "https://github.com/iden3/circom/blob/${src.rev}/RELEASES.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ raitobezarius ]; + }; +} diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix new file mode 100644 index 00000000000..c188082f8f9 --- /dev/null +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, just +, pop-icon-theme +, hicolor-icon-theme +}: +stdenvNoCC.mkDerivation rec { + pname = "cosmic-icons"; + version = "unstable-2023-08-30"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = "14d8e2048087be1ad444f9b3ebb75885509f72c6"; + sha256 = "sha256-WbdgHmTn403x95x9wEYL0T9ksbN+YLzEB2yE0UrF9T0="; + }; + + nativeBuildInputs = [ just ]; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + ]; + + propagatedBuildInputs = [ + pop-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + meta = with lib; { + description = "System76 Cosmic icon theme for Linux"; + homepage = "https://github.com/pop-os/cosmic-icons"; + license = with licenses; [ + cc-by-sa-40 + ]; + maintainers = with maintainers; [ a-kenji ]; + }; +} diff --git a/pkgs/by-name/co/cosmopolitan/cosmocc.nix b/pkgs/by-name/co/cosmopolitan/cosmocc.nix new file mode 100644 index 00000000000..fb3ca66025a --- /dev/null +++ b/pkgs/by-name/co/cosmopolitan/cosmocc.nix @@ -0,0 +1,25 @@ +{ runCommand, cosmopolitan }: + +let + cosmocc = runCommand "cosmocc-${cosmopolitan.version}" + { + pname = "cosmocc"; + inherit (cosmopolitan) version; + + passthru.tests = { + cc = runCommand "c-test" { } '' + ${cosmocc}/bin/cosmocc ${./hello.c} + ./a.out > $out + ''; + }; + + meta = cosmopolitan.meta // { + description = "compilers for Cosmopolitan C/C++ programs"; + }; + } '' + mkdir -p $out/bin + install ${cosmopolitan.dist}/tool/scripts/{cosmocc,cosmoc++} $out/bin + sed 's|/opt/cosmo\([ /]\)|${cosmopolitan.dist}\1|g' -i $out/bin/* + ''; +in +cosmocc diff --git a/pkgs/development/libraries/cosmopolitan/fix-paths.patch b/pkgs/by-name/co/cosmopolitan/fix-paths.patch index 85c59f3f12a..85c59f3f12a 100644 --- a/pkgs/development/libraries/cosmopolitan/fix-paths.patch +++ b/pkgs/by-name/co/cosmopolitan/fix-paths.patch diff --git a/pkgs/by-name/co/cosmopolitan/hello.c b/pkgs/by-name/co/cosmopolitan/hello.c new file mode 100644 index 00000000000..f8edd23561e --- /dev/null +++ b/pkgs/by-name/co/cosmopolitan/hello.c @@ -0,0 +1,6 @@ +#include <stdio.h> + +int main() { + printf("Hello world!\n"); + return 0; +} diff --git a/pkgs/by-name/co/cosmopolitan/package.nix b/pkgs/by-name/co/cosmopolitan/package.nix new file mode 100644 index 00000000000..defc3efb8d1 --- /dev/null +++ b/pkgs/by-name/co/cosmopolitan/package.nix @@ -0,0 +1,92 @@ +{ lib +, stdenv +, fetchFromGitHub +, bintools-unwrapped +, callPackage +, coreutils +, substituteAll +, unzip +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cosmopolitan"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "jart"; + repo = "cosmopolitan"; + rev = finalAttrs.version; + hash = "sha256-DTL1dXH+LhaxWpiCrsNjV74Bw5+kPbhEAA2Z1NKiPDk="; + }; + + patches = [ + # make sure tests set PATH correctly + (substituteAll { + src = ./fix-paths.patch; + inherit coreutils; + }) + ]; + + nativeBuildInputs = [ + bintools-unwrapped + unzip + ]; + + strictDeps = true; + + outputs = [ "out" "dist" ]; + + # slashes are significant because upstream uses o/$(MODE)/foo.o + buildFlags = [ + "o/cosmopolitan.h" + "o//cosmopolitan.a" + "o//libc/crt/crt.o" + "o//ape/ape.o" + "o//ape/ape.lds" + ]; + + checkTarget = "o//test"; + + enableParallelBuilding = true; + + doCheck = true; + dontConfigure = true; + dontFixup = true; + + preCheck = let + failingTests = [ + # some syscall tests fail because we're in a sandbox + "test/libc/calls/sched_setscheduler_test.c" + "test/libc/thread/pthread_create_test.c" + "test/libc/calls/getgroups_test.c" + # fails + "test/libc/stdio/posix_spawn_test.c" + ]; + in lib.concatStringsSep ";\n" (map (t: "rm -v ${t}") failingTests); + + installPhase = '' + runHook preInstall + + mkdir -p $out/{include,lib} + install o/cosmopolitan.h $out/include + install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} o/ape/ape-no-modify-self.o $out/lib + cp -RT . "$dist" + + runHook postInstall + ''; + + passthru = { + cosmocc = callPackage ./cosmocc.nix { + cosmopolitan = finalAttrs.finalPackage; + }; + }; + + meta = { + homepage = "https://justine.lol/cosmopolitan/"; + description = "Your build-once run-anywhere c library"; + license = lib.licenses.isc; + maintainers = lib.teams.cosmopolitan.members; + platforms = lib.platforms.x86_64; + badPlatforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 5b7817330cb..7db89e274e1 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.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-GovkmMjxHWP9nl0z1LwQrIgT6TkMaYY1wEwAABAYNK0="; + hash = "sha256-bEuzA67bBueHgKTpj+CsX7fZMc9RMV4cc7KOVqJfT7M="; }; - cargoHash = "sha256-7mhGAXfrHfOKdcnCPtYNbNGRVCfVHni80zEAUATPRLk="; + cargoHash = "sha256-JL31KVZrKPNlJzB3tyLheXZ3qVcm0HtAVuccehGkM0c="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index a5aee58a286..fe58b468b1f 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.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "cafkafk"; repo = "fortune-kind"; rev = "v${version}"; - hash = "sha256-GWsDauFPyiZA6gY7yuEkAeIZrmrvZyJQnP6+ZkdaQSw="; + hash = "sha256-txFboO7TdmwFm8BPP2onDJs1LSp4fXTwciIyAnC4Q04="; }; - cargoHash = "sha256-1swDHofUuVQx5J7jwmEyRC9REgv4Jg0r0BHBKmkt5Wc="; + cargoHash = "sha256-3HxkKE2cQK91dBTtrsNG9VDk0efo1Ci5VfaG3UjvLNU="; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/gu/guile-sjson/package.nix b/pkgs/by-name/gu/guile-sjson/package.nix new file mode 100644 index 00000000000..8f9b49f95e0 --- /dev/null +++ b/pkgs/by-name/gu/guile-sjson/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitLab +, autoreconfHook +, guile +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "guile-sjson"; + version = "0.2.2"; + + src = fetchFromGitLab { + owner = "dustyweb"; + repo = "guile-sjson"; + rev = "v${finalAttrs.version}"; + hash = "sha256-MmnEZhJTbZDIO8vWVCoTt4rGbOjfPZQ3bqAGv4ei69o="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + guile + pkg-config + ]; + + buildInputs = [ + guile + ]; + + meta = with lib; { + description = "S-expression based json reader/writer for Guile"; + homepage = "https://gitlab.com/dustyweb/guile-sjson"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ galaxy ]; + platforms = guile.meta.platforms; + }; +}) diff --git a/pkgs/by-name/ho/hottext/lock.json b/pkgs/by-name/ho/hottext/lock.json new file mode 100644 index 00000000000..5675adc7ff5 --- /dev/null +++ b/pkgs/by-name/ho/hottext/lock.json @@ -0,0 +1 @@ +{"depends":[{"method":"fetchzip","path":"/nix/store/vx0a8hw7hs5an0dnbrn6l16bd6is7hdr-source","rev":"07f6ba8ab96238e5bd1264cf0cea1d1746abb00c","sha256":"005nrldaasfl09zdsni1vi8s7dk0y85ijv6rm2wpj94435x66s36","url":"https://github.com/treeform/flatty/archive/07f6ba8ab96238e5bd1264cf0cea1d1746abb00c.tar.gz","ref":"0.3.4","packages":["flatty"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/lk4hcmvwvliliyyidx7k3fk9yfijddc5-source","rev":"b2e71179174e040884ebf6a16cbac711c84620b9","sha256":"0pi6cq43ysm1wy5vva3i2dqvyh4dqppjjjl04yj9wfq7mngpqaa1","url":"https://github.com/treeform/chroma/archive/b2e71179174e040884ebf6a16cbac711c84620b9.tar.gz","ref":"0.2.7","packages":["chroma"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/bah1zq369ikykm6dz3r0hzhcq4s88sxq-source","rev":"a2a5165c36e0098dea526712890fb7e988ba27f2","sha256":"0n42hlvh0d9wkjr01p04jnkyn7y4y62pwjdcqw52absapbpsr1lb","url":"https://github.com/treeform/typography/archive/a2a5165c36e0098dea526712890fb7e988ba27f2.tar.gz","ref":"0.7.14","packages":["typography"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/9hfg3703m28w76ics7rn0hw1qymz0jrh-source","rev":"156e424306756a106442aca985eed61a8d12097b","sha256":"0hg9iq509rjsgd33cp3452v7whgbc30b5lnajifkls0z66rc2ndh","url":"https://github.com/guzba/nimsimd/archive/156e424306756a106442aca985eed61a8d12097b.tar.gz","ref":"1.2.6","packages":["nimsimd"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/xjk8cg4dmja48rcswy0nphy3xhmf7nsz-source","rev":"f3e73f722fbb0e5d496fbc59ee860a9fd49983de","sha256":"12mqlczckhxcrg6il213fn7mcnqz3khwkh7i4bn57l55nzrhfvrh","url":"https://github.com/treeform/pixie/archive/f3e73f722fbb0e5d496fbc59ee860a9fd49983de.tar.gz","ref":"5.0.6","packages":["pixie"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/f9dp6njaay5rf32f6l9gkw0dm25gim47-source","rev":"7282ae1247f2f384ebeaec3826d7fa38fd0e1df1","sha256":"1plw9lfrm42qar01rnjhm0d9mkzsc7c3b8kz43w5pb8j8drx1lyn","url":"https://github.com/treeform/vmath/archive/7282ae1247f2f384ebeaec3826d7fa38fd0e1df1.tar.gz","ref":"2.0.0","packages":["vmath"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/16h19n8ndv42v8gn2vfdisdszv2wrln1-source","rev":"fb09637d6ebd6416b322a2b9bb95dd513040dea7","sha256":"1lyfnirwpy12lq9gr0sbnkf7ih7ayfvb1acjxk2z5gzlgxm1azp1","url":"https://github.com/treeform/print/archive/fb09637d6ebd6416b322a2b9bb95dd513040dea7.tar.gz","ref":"1.0.2","packages":["print"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/zrm3y895iwn057y5c4374bviih962w0v-source","rev":"d0c9ad33ae72aece49093d7688fc78a7101aa4b0","sha256":"14qgxcnyznjc180kdbilqzzya589rqaznfpp75yp37n47zdknfw0","url":"https://github.com/guzba/crunchy/archive/d0c9ad33ae72aece49093d7688fc78a7101aa4b0.tar.gz","ref":"0.1.9","packages":["crunchy"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/da49jl6rhz6jlix6mds0alhlbq1qlkfy-source","rev":"84d4702e838d684b7304882ffe796f57ef422fb6","sha256":"1vilid9xx5mp2yvssa3wf6g9svqdan87090klis891k9w1dd8i51","url":"https://github.com/nim-lang/sdl2/archive/84d4702e838d684b7304882ffe796f57ef422fb6.tar.gz","ref":"v2.0.5","packages":["sdl2"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/rpa0bv740i3yagp0ldkb68jp6scw4i5l-source","rev":"d7eaf00c24820ad0317c9926737402e62431e931","sha256":"0wrvdpvbwv4ysjsqc6hhvd97vql4k0m5l0zdrsrjlljd1n5g2haq","url":"https://github.com/treeform/bumpy/archive/d7eaf00c24820ad0317c9926737402e62431e931.tar.gz","ref":"1.1.2","packages":["bumpy"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/b98qlpki45417ws4pmjq052q1s7333wc-source","rev":"a3fd6f0458ffdd7cbbd416be99f2ca80a7852d82","sha256":"0zmavr2jnyyqkvvi6hlg2kh6qv6lzakwvsqjy0sjm3qdsna0aldg","url":"https://github.com/guzba/zippy/archive/a3fd6f0458ffdd7cbbd416be99f2ca80a7852d82.tar.gz","ref":"0.10.10","packages":["zippy"],"srcDir":"src"}]} diff --git a/pkgs/by-name/ho/hottext/package.nix b/pkgs/by-name/ho/hottext/package.nix new file mode 100644 index 00000000000..e164ff1122f --- /dev/null +++ b/pkgs/by-name/ho/hottext/package.nix @@ -0,0 +1,41 @@ +{ lib, nim2Packages, fetchFromSourcehut, gentium, makeDesktopItem, nim_lk, SDL2 }: + +nim2Packages.buildNimPackage (finalAttrs: { + pname = "hottext"; + version = "20231003"; + + nimBinOnly = true; + + src = fetchFromSourcehut { + owner = "~ehmry"; + repo = "hottext"; + rev = finalAttrs.version; + hash = "sha256-ncH/1PV4vZY7JCUJ87FPz5bdrQsNlYxzGdc5BQNfQeA="; + }; + + buildInputs = [ SDL2 ]; + + nimFlags = nim_lk.passthru.nimFlagsFromLockFile ./lock.json; + + HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf"; + + desktopItem = makeDesktopItem { + categories = [ "Utility" ]; + comment = finalAttrs.meta.description; + desktopName = finalAttrs.pname; + exec = finalAttrs.pname; + name = finalAttrs.pname; + }; + + postInstall = '' + cp -r $desktopItem/* $out + ''; + + meta = finalAttrs.src.meta // { + description = "Simple RSVP speed-reading utility"; + license = lib.licenses.unlicense; + homepage = "https://git.sr.ht/~ehmry/hottext"; + maintainers = with lib.maintainers; [ ehmry ]; + mainProgram = "hottext"; + }; +}) diff --git a/pkgs/by-name/li/libaribcaption/package.nix b/pkgs/by-name/li/libaribcaption/package.nix new file mode 100644 index 00000000000..7d39841ec6f --- /dev/null +++ b/pkgs/by-name/li/libaribcaption/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake + +, fontconfig +, freetype + +, ApplicationServices +, CoreFoundation +, CoreGraphics +, CoreText +}: + +stdenv.mkDerivation rec { + pname = "libaribcaption"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "xqq"; + repo = "libaribcaption"; + rev = "v${version}"; + hash = "sha256-x6l0ZrTktSsqfDLVRXpQtUOruhfc8RF3yT991UVZiKA="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + + buildInputs = lib.optionals (!stdenv.isDarwin) [ + fontconfig + freetype + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + CoreFoundation + CoreGraphics + CoreText + ]; + + meta = with lib; { + description = "Portable ARIB STD-B24 Caption Decoder/Renderer"; + homepage = "https://github.com/xqq/libaribcaption"; + changelog = "https://github.com/xqq/libaribcaption/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ chayleaf ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/by-name/li/libcpuid/package.nix index cb3de447572..56df13aabd2 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/by-name/li/libcpuid/package.nix @@ -2,25 +2,15 @@ stdenv.mkDerivation rec { pname = "libcpuid"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "anrieff"; repo = "libcpuid"; rev = "v${version}"; - sha256 = "sha256-lhoHqdS5tke462guORg+PURjVmjAgviT5KJHp6PyvUA="; + sha256 = "sha256-Zs5GKvSasdfLqo8oErDQNAuXRG27Bm9vNwyooqbol0Q="; }; - patches = [ - # Fixes cross-compilation to NetBSD - # https://github.com/anrieff/libcpuid/pull/190 - (fetchpatch { - name = "pass-pthread-to-linker.patch"; - url = "https://github.com/anrieff/libcpuid/commit/c28436e7239f28dab0e2a3bcdbce95f41e1363b1.patch"; - sha256 = "sha256-J2mB010JcE4si0rERjcrL9kJgbWHKaQCIZPDkmRvcq4="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix new file mode 100644 index 00000000000..eecbbca3b3f --- /dev/null +++ b/pkgs/by-name/mo/monophony/package.nix @@ -0,0 +1,71 @@ +{ lib +, fetchFromGitLab +, python3Packages +, wrapGAppsHook4 +, gst_all_1 +, gobject-introspection +, yt-dlp +, libadwaita +, libsoup_3 +, glib-networking +}: +python3Packages.buildPythonApplication rec { + pname = "monophony"; + version = "2.3.1"; + format = "other"; + + sourceRoot = "source/source"; + src = fetchFromGitLab { + owner = "zehkira"; + repo = "monophony"; + rev = "v${version}"; + hash = "sha256-dpRTHsujaIwzgr+qY5LC9xtXz40g3akdpEiHuxiilZM="; + }; + + pythonPath = with python3Packages; [ + mpris-server + pygobject3 + ytmusicapi + ]; + + nativeBuildInputs = [ + python3Packages.nuitka + gobject-introspection + wrapGAppsHook4 + ]; + + buildInputs = + [ + libadwaita + # needed for gstreamer https + libsoup_3 + glib-networking + ] + ++ (with gst_all_1; [ + gst-plugins-base + gst-plugins-good + gstreamer + ]); + + installFlags = [ "prefix=$(out)" ]; + + preFixup = '' + buildPythonPath "$pythonPath" + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$program_PYTHONPATH" + --prefix PATH : "${lib.makeBinPath [yt-dlp]}" + # needed for gstreamer https + --prefix LD_LIBRARY_PATH : "${libsoup_3.out}/lib" + ) + ''; + + meta = with lib; { + homepage = "https://gitlab.com/zehkira/monophony"; + description = "Linux app for streaming music from YouTube"; + longDescription = "Monophony is a free and open source Linux app for streaming music from YouTube. It has no ads and does not require an account."; + license = licenses.agpl3Plus; + mainProgram = "monophony"; + platforms = platforms.linux; + maintainers = with maintainers; [ quadradical ]; + }; +} diff --git a/pkgs/by-name/ni/nim_lk/lock.json b/pkgs/by-name/ni/nim_lk/lock.json new file mode 100644 index 00000000000..38a4f8c8e3e --- /dev/null +++ b/pkgs/by-name/ni/nim_lk/lock.json @@ -0,0 +1 @@ +{"depends":[{"method":"fetchzip","packages":["npeg"],"path":"/nix/store/ffkxmjmigfs7zhhiiqm0iw2c34smyciy-source","ref":"1.2.1","rev":"26d62fdc40feb84c6533956dc11d5ee9ea9b6c09","sha256":"0xpzifjkfp49w76qmaylan8q181bs45anmp46l4bwr3lkrr7bpwh","srcDir":"src","url":"https://github.com/zevv/npeg/archive/26d62fdc40feb84c6533956dc11d5ee9ea9b6c09.tar.gz"},{"method":"fetchzip","packages":["preserves"],"path":"/nix/store/nrcpzf9hx70kry3gwhrdzcs3qicjncjh-source","ref":"20231021","rev":"edece399be70818208bf2263c30cb2bcf435bbff","sha256":"0xmw35wmw3a4lja9q4qvlvpxv3xk0hnkjg4fwfw6f3inh6zfiqki","srcDir":"src","url":"https://git.syndicate-lang.org/ehmry/preserves-nim/archive/edece399be70818208bf2263c30cb2bcf435bbff.tar.gz"}]} diff --git a/pkgs/by-name/ni/nim_lk/package.nix b/pkgs/by-name/ni/nim_lk/package.nix new file mode 100644 index 00000000000..833860b357f --- /dev/null +++ b/pkgs/by-name/ni/nim_lk/package.nix @@ -0,0 +1,52 @@ +{ lib, buildPackages, nim2Packages, fetchFromSourcehut, openssl }: + +nim2Packages.buildNimPackage (finalAttrs: { + pname = "nim_lk"; + version = "20231031"; + nimBinOnly = true; + + src = fetchFromSourcehut { + owner = "~ehmry"; + repo = "nim_lk"; + rev = finalAttrs.version; + hash = "sha256-dXm3dfXAxgucek19f1KdRShOsJyELPTB32qgGSKId6A="; + }; + + buildInputs = [ openssl ]; + + nimFlags = finalAttrs.passthru.nimFlagsFromLockFile ./lock.json; + + meta = finalAttrs.src.meta // { + description = "Generate Nix specific lock files for Nim packages"; + homepage = "https://git.sr.ht/~ehmry/nim_lk"; + mainProgram = "nim_lk"; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ehmry ]; + }; + + passthru.nimFlagsFromLockFile = let + fetchDependency = let + methods = { + fetchzip = { url, sha256, ... }: + buildPackages.fetchzip { + name = "source"; + inherit url sha256; + }; + git = { fetchSubmodules, leaveDotGit, rev, sha256, url, ... }: + buildPackages.fetchgit { + inherit fetchSubmodules leaveDotGit rev sha256 url; + }; + }; + in attrs@{ method, ... }: methods.${method} attrs // attrs; + in lockFile: + with builtins; + lib.pipe lockFile [ + readFile + fromJSON + (getAttr "depends") + (map fetchDependency) + (map ({ outPath, srcDir, ... }: ''--path:"${outPath}/${srcDir}"'')) + ]; + +}) diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix new file mode 100644 index 00000000000..f3b47f0c581 --- /dev/null +++ b/pkgs/by-name/nu/numbat/package.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "numbat"; + version = "1.6.3"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = "numbat"; + rev = "v${version}"; + hash = "sha256-r6uPe2NL+6r/fKjf0C/5DLdB5YP3SIo8g8EsDxKP/3g="; + }; + + cargoHash = "sha256-MPqJjCfIwgK8QigWQYfWAYlg9RNMzF4x+0SprS0raKY="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "High precision scientific calculator with full support for physical units"; + longDescription = '' + A statically typed programming language for scientific computations + with first class support for physical dimensions and units + ''; + homepage = "https://numbat.dev"; + changelog = "https://github.com/sharkdp/numbat/releases/tag/v${version}"; + license = with licenses; [ asl20 mit ]; + mainProgram = "numbat"; + maintainers = with maintainers; [ giomf ]; + }; +} diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix new file mode 100644 index 00000000000..0240966e2d8 --- /dev/null +++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix @@ -0,0 +1,102 @@ +{ lib +, stdenv +, perlPackages +, fetchFromGitHub +, makeWrapper +, shortenPerlShebang +, coreutils +, dmidecode +, findutils +, inetutils +, ipmitool +, iproute2 +, lvm2 +, nmap +, pciutils +, usbutils +, util-linux +, testers +, ocsinventory-agent +, nix-update-script +}: + +perlPackages.buildPerlPackage rec { + version = "2.10.1"; + pname = "ocsinventory-agent"; + + src = fetchFromGitHub { + owner = "OCSInventory-NG"; + repo = "UnixAgent"; + rev = "refs/tags/v${version}-MAC"; + hash = "sha256-aFzBrUsVttUhpYGEYd/yYuXmE90PGCiBmBsVjtHcHLg="; + }; + + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + + buildInputs = with perlPackages; [ + perl + DataUUID + IOCompress + IOSocketSSL + LWP + LWPProtocolHttps + NetIP + NetNetmask + NetSNMP + ParseEDID + ProcDaemon + ProcPIDFile + XMLSimple + ] ++ lib.optionals stdenv.isLinux (with perlPackages; [ + NetCUPS # cups-filters is broken on darwin + ]) ++ lib.optionals stdenv.isDarwin (with perlPackages; [ + MacSysProfile + ]); + + postInstall = let + runtimeDependencies = [ + coreutils # uname, cut, df, stat, uptime + findutils # find + inetutils # ifconfig + ipmitool # ipmitool + nmap # nmap + pciutils # lspci + ] ++ lib.optionals stdenv.isLinux [ + dmidecode # dmidecode + iproute2 # ip + lvm2 # pvs + usbutils # lsusb + util-linux # last, lsblk, mount + ]; + in lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/ocsinventory-agent + '' + '' + wrapProgram $out/bin/ocsinventory-agent --prefix PATH : ${lib.makeBinPath runtimeDependencies} + ''; + + passthru = { + tests.version = testers.testVersion { + package = ocsinventory-agent; + command = "ocsinventory-agent --version"; + # upstream has not updated version in lib/Ocsinventory/Agent/Config.pm + version = "2.10.0"; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "OCS Inventory unified agent for Unix operating systems"; + longDescription = '' + Open Computers and Software Inventory (OCS) is an application designed + to help a network or system administrator to keep track of the hardware and + software configurations of computers that are installed on the network. + ''; + homepage = "https://ocsinventory-ng.org"; + changelog = "https://github.com/OCSInventory-NG/UnixAgent/releases/tag/v${version}"; + downloadPage = "https://github.com/OCSInventory-NG/UnixAgent/releases"; + license = licenses.gpl2Only; + mainProgram = "ocsinventory-agent"; + maintainers = with maintainers; [ totoroot anthonyroussel ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index 84fe0583f26..2c6431da288 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -5,17 +5,22 @@ php.buildComposerProject (finalAttrs: { pname = "phel"; - version = "0.11.0-dev"; + version = "0.12.0"; src = fetchFromGitHub { owner = "phel-lang"; repo = "phel-lang"; - rev = "83d9d81b6c7daae361c0f1f68462083027b81581"; - hash = "sha256-B2IozL/nJE4C1Gq54/64TJEySC1STroG1poCBzd3j3I="; + rev = "v${finalAttrs.version}"; + hash = "sha256-5PMd87Xp7i3Q1ryKQWJBmNbU5TGo2LQ6uvIFP3T36vk="; }; vendorHash = "sha256-83GX/dxHa6w1E34wnJshg7yxlVyRkDT5jmAPCCqPdtA="; + doInstallCheck = true; + postCheckInstall = '' + $out/bin/phel --version + ''; + 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."; diff --git a/pkgs/tools/misc/spigot/default.nix b/pkgs/by-name/sp/spigot/package.nix index 5f50307537b..421af163cd4 100644 --- a/pkgs/tools/misc/spigot/default.nix +++ b/pkgs/by-name/sp/spigot/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, callPackage , cmake , gmp , halibut @@ -32,6 +33,12 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + passthru.tests = { + approximation = callPackage ./tests/approximation.nix { + spigot = finalAttrs.finalPackage; + }; + }; + meta = { homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/"; description = "A command-line exact real calculator"; diff --git a/pkgs/by-name/sp/spigot/tests/approximation.nix b/pkgs/by-name/sp/spigot/tests/approximation.nix new file mode 100644 index 00000000000..ffb329e6a31 --- /dev/null +++ b/pkgs/by-name/sp/spigot/tests/approximation.nix @@ -0,0 +1,21 @@ +{ lib +, stdenv +, spigot +}: + +stdenv.mkDerivation { + pname = "spigot-approximation"; + inherit (spigot) version; + + nativeBuildInputs = [ spigot ]; + + dontInstall = true; + + buildCommand = '' + [ "$(spigot -b2 -d32 '(pi/1-355/113)')" = "-0.00000000000000000000010001111001" ] + [ "$(spigot -b2 -d32 '(e/1-1457/536)')" = "-0.00000000000000000001110101101011" ] + touch $out + ''; + + meta.timeout = 10; +} diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix new file mode 100644 index 00000000000..5274a1c11f3 --- /dev/null +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, buildNpmPackage +, fetchFromGitHub +, python3 +, darwin +, libsecret +, pkg-config +}: + +let + version = "0.0.14"; +in +buildNpmPackage { + pname = "tailwindcss-language-server"; + inherit version; + + src = fetchFromGitHub { + owner = "tailwindlabs"; + repo = "tailwindcss-intellisense"; + rev = "@tailwindcss/language-server@v${version}"; + hash = "sha256-EE1Gd0cmcJmyleoXVNtMJ8IKYpQIzRf2F42HOORHbwo="; + }; + + makeCacheWritable = true; + npmDepsHash = "sha256-gQgGIo/cS0P1B5lSmNpd8WOgucf3RbRk1YOvMXNbxb0="; + npmWorkspace = "packages/tailwindcss-language-server"; + + buildInputs = [ libsecret ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security AppKit ]); + + nativeBuildInputs = [ python3 pkg-config ]; + + meta = with lib; { + description = "Intelligent Tailwind CSS tooling for Visual Studio Code"; + homepage = "https://github.com/tailwindlabs/tailwindcss-intellisense"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada]; + mainProgram = "tailwindcss-language-server"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix new file mode 100644 index 00000000000..de64c81093c --- /dev/null +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -0,0 +1,61 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, go +, testers +, terraform-plugin-docs +, nix-update-script +}: + +buildGoModule rec { + pname = "terraform-plugin-docs"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "terraform-plugin-docs"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-5vbi69GMgkzvN3aEQbNTbk99rg+kfvAvUrdDsuyIm9s="; + }; + + vendorHash = "sha256-AjW6BokLVDkIWXToJ7wNq/g19xKTAfpQ/gVlKCV5qw0="; + + nativeBuildInputs = [ makeWrapper ]; + + subPackages = [ + "cmd/tfplugindocs" + ]; + + allowGoReference = true; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${src.rev}" + ]; + + postInstall = '' + wrapProgram $out/bin/tfplugindocs --prefix PATH : ${lib.makeBinPath [ go ]} + ''; + + passthru = { + tests.version = testers.testVersion { + command = "tfplugindocs --version"; + package = terraform-plugin-docs; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Generate and validate Terraform plugin/provider documentation"; + homepage = "https://github.com/hashicorp/terraform-plugin-docs"; + changelog = "https://github.com/hashicorp/terraform-plugin-docs/releases/tag/v${version}"; + license = licenses.mpl20; + mainProgram = "tfplugindocs"; + maintainers = with maintainers; [ lewo ]; + }; +} diff --git a/pkgs/by-name/th/thud/package.nix b/pkgs/by-name/th/thud/package.nix index f007174df86..5a4d3f68b2a 100644 --- a/pkgs/by-name/th/thud/package.nix +++ b/pkgs/by-name/th/thud/package.nix @@ -2,20 +2,21 @@ , rustPlatform , fetchFromGitHub , installShellFiles +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "thud"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "donovanglover"; repo = "thud"; rev = version; - hash = "sha256-3MxmVKs0huXPnL9mqDniaIarkAvJmwSOMii2ntXtOos="; + hash = "sha256-BmrJaZ1IKXjx4/QkBDZyXvTTaalfEOKsBp9ZCW8px7I="; }; - cargoHash = "sha256-Hk3HlcA253FAA9hw5p9W+Mvec84zLo7bEmM2/BbmjiM="; + cargoHash = "sha256-rmVVdes7GuGV+ClqJGxNIrs7oSwe8/ZHFD6OfP/UW7A="; nativeBuildInputs = [ installShellFiles @@ -25,14 +26,16 @@ rustPlatform.buildRustPackage rec { install -Dm644 assets/thud.thumbnailer $out/share/thumbnailers/thud.thumbnailer substituteInPlace $out/share/thumbnailers/thud.thumbnailer --replace "thud" "$out/bin/thud" - installManPage man/thud.1 + installManPage target/man/thud.1 installShellCompletion --cmd thud \ - --bash <(cat completions/thud.bash) \ - --fish <(cat completions/thud.fish) \ - --zsh <(cat completions/_thud) + --bash <(cat target/completions/thud.bash) \ + --fish <(cat target/completions/thud.fish) \ + --zsh <(cat target/completions/_thud) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Generate directory thumbnails for GTK-based file browsers from images inside them"; homepage = "https://github.com/donovanglover/thud"; diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index 9ddfd1d8cf1..da21371ff9c 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.23"; + version = "0.0.25"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; rev = version; - hash = "sha256-+Q/dn0pGZ3R+UlAt9stQZU1n+WITujJzTxY5dpXc+Bc="; + hash = "sha256-3ALtWcHLkwu+ddZfYMTtAPM9fQI4ceF0KG1jxozi3EQ="; }; - cargoHash = "sha256-R4jQ9Or9vh3dtqJH7nPvYM4o1h277sFUf+nC1VQl1Uk="; + cargoHash = "sha256-2qlvAZCKBZlkM7EYceITx1Py1/9F0dS2xorpCtKGi9I="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/ui/uiua386/package.nix b/pkgs/by-name/ui/uiua386/package.nix index fefec669b7b..aa659df3b4d 100644 --- a/pkgs/by-name/ui/uiua386/package.nix +++ b/pkgs/by-name/ui/uiua386/package.nix @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation { ''; meta = { - description = "An Uiua font"; + description = "A Uiua font"; homepage = "https://uiua.org/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ skykanin ]; diff --git a/pkgs/by-name/uu/uuu/completion.bash b/pkgs/by-name/uu/uuu/completion.bash new file mode 100644 index 00000000000..702fe98333c --- /dev/null +++ b/pkgs/by-name/uu/uuu/completion.bash @@ -0,0 +1,4 @@ +_uuu_autocomplete() { + COMPREPLY=($(uuu $1 $2 $3)) +} +complete -o nospace -F _uuu_autocomplete uuu diff --git a/pkgs/by-name/uu/uuu/package.nix b/pkgs/by-name/uu/uuu/package.nix new file mode 100755 index 00000000000..831119e1d47 --- /dev/null +++ b/pkgs/by-name/uu/uuu/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script + +, cmake +, installShellFiles +, pkg-config + +, bzip2 +, libusb1 +, openssl +, zlib +, zstd +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "uuu"; + version = "1.5.125"; + + src = fetchFromGitHub { + owner = "nxp-imx"; + repo = "mfgtools"; + rev = "uuu_${finalAttrs.version}"; + hash = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go="; + }; + + passthru.updateScript = nix-update-script { }; + + nativeBuildInputs = [ + cmake + installShellFiles + pkg-config + ]; + + buildInputs = [ + bzip2 + libusb1 + openssl + zlib + zstd + ]; + + postPatch = '' + # Avoid the need of calling Git during the build. + echo "uuu_${finalAttrs.version}" > .tarball-version + ''; + + postInstall = '' + installShellCompletion --bash --name uuu.bash ${./completion.bash} + + mkdir -p $out/lib/udev/rules.d + cat <($out/bin/uuu -udev) > $out/lib/udev/rules.d/70-uuu.rules + ''; + + meta = with lib; { + description = "Freescale/NXP I.MX Chip image deploy tools"; + homepage = "https://github.com/nxp-imx/mfgtools"; + license = licenses.bsd3; + maintainers = with maintainers; [ otavio ]; + mainProgram = "uuu"; + platforms = platforms.all; + }; +}) diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/by-name/yg/yggdrasil/package.nix index 5154ef60bd0..858e8400d00 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -2,28 +2,25 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.4.7"; + version = "0.5.1"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "sha256-01ciAutRIn4DmqlvDTXhRiuZHTtF8b6js7SUrLOjtAY="; + sha256 = "sha256-JeeOT3fb+4+eUyWl7rAXa5+Yf1XCT20xJeCdhBC0oeo="; }; - vendorHash = "sha256-hwDi59Yp92eMDqA8OD56nxsKSX2ngxs0lYdmEMLX+Oc="; - - # Change the default location of the management socket on Linux - # systems so that the yggdrasil system service unit does not have to - # be granted write permission to /run. - patches = [ ./change-runtime-dir.patch ]; + vendorHash = "sha256-yu725RgKDRmpNFNuffBFKZjZOFyzt00kKGuz696JHk0="; subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ]; ldflags = [ "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}" - "-s" "-w" + "-X github.com/yggdrasil-network/yggdrasil-go/src/config.defaultAdminListen=unix:///var/run/yggdrasil/yggdrasil.sock" + "-s" + "-w" ]; passthru.tests.basic = nixosTests.yggdrasil; diff --git a/pkgs/by-name/zp/zpix-pixel-font/package.nix b/pkgs/by-name/zp/zpix-pixel-font/package.nix new file mode 100644 index 00000000000..6a785c9d8fa --- /dev/null +++ b/pkgs/by-name/zp/zpix-pixel-font/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenvNoCC +, fetchurl +}: +stdenvNoCC.mkDerivation rec { + pname = "zpix-pixel-font"; + version = "3.1.8"; + + srcs = [ + (fetchurl { + name = "zpix-pixel-font.bdf"; + url = "https://github.com/SolidZORO/zpix-pixel-font/releases/download/v${version}/zpix.bdf"; + hash = "sha256-qE6YPKuk1FRRrTvmy4YIDuxRfslma264piUDj1FWtk4="; + }) + (fetchurl { + name = "zpix-pixel-font.ttf"; + url = "https://github.com/SolidZORO/zpix-pixel-font/releases/download/v${version}/zpix.ttf"; + hash = "sha256-UIgLGsVTbyhYMKfTYiA+MZmV4dFT9HX3sxTdrcc4vE0="; + }) + ]; + + dontUnpack = true; + __structuredAttrs = true; + + installPhase = '' + runHook preInstall + install -Dm444 ''${srcs[0]} $out/share/fonts/misc/zpix.bdf + install -Dm444 ''${srcs[1]} $out/share/fonts/truetype/zpix.ttf + runHook postInstall + ''; + + meta = with lib; { + description = "A pixel font supporting multiple languages like English, Chinese and Japanese"; + homepage = "https://github.com/SolidZORO/zpix-pixel-font/"; + changelog = "https://github.com/SolidZORO/zpix-pixel-font/blob/master/CHANGELOG.md"; + license = licenses.unfree; + maintainers = [ maintainers.adriangl ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/data/fonts/commit-mono/default.nix index d735e64296e..29569d1137a 100644 --- a/pkgs/data/fonts/commit-mono/default.nix +++ b/pkgs/data/fonts/commit-mono/default.nix @@ -4,11 +4,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "commit-mono"; - version = "1.138"; + version = "1.139"; src = fetchzip { - url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/${version}/CommitMono-${version}.zip"; - sha256 = "sha256-ae2eeHh57i6d0kDMZ68aXvLGFj+rXhwg1CC8cV3ndAQ="; + url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip"; + hash = "sha256-TrXuWQzNlJsFwwOsnLuCCEj/9B9XrTNHSDVES68gIYs="; stripRoot = false; }; @@ -20,8 +20,8 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 -t $out/share/fonts/opentype/ CommitMono-${version}/*.otf - install -Dm644 -t $out/share/fonts/truetype/ CommitMono-${version}/ttfautohint/*.ttf + install -Dm644 CommitMono-${version}/*.otf -t $out/share/fonts/opentype + install -Dm644 CommitMono-${version}/ttfautohint/*.ttf -t $out/share/fonts/truetype runHook postInstall ''; diff --git a/pkgs/data/fonts/intel-one-mono/default.nix b/pkgs/data/fonts/intel-one-mono/default.nix index 1708534c637..f9876e8f0a2 100644 --- a/pkgs/data/fonts/intel-one-mono/default.nix +++ b/pkgs/data/fonts/intel-one-mono/default.nix @@ -2,16 +2,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "intel-one-mono"; - version = "1.2.1"; + version = "1.3.0"; srcs = [ (fetchurl { url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/otf.zip"; - hash = "sha256-RBJwIUkmAZIRaIEWUxFZlRMfFTUFdLbHCMRkagU0gU0="; + hash = "sha256-iZIfkXH+GplVwES4LaQBIaCWs7OKmEto9J2SpzvagSs="; }) (fetchurl { url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/ttf.zip"; - hash = "sha256-DV/PT+P+GGq/ejS5cx5ENuCy+iiE32AMOirwuTCP3vY="; + hash = "sha256-EeUTEMuoTHKmuO5Uj0jjiDRF9t7jxbIy45nTWozlgfc="; }) ]; diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix index 0d3944b2da1..df5569f5379 100644 --- a/pkgs/data/fonts/iwona/default.nix +++ b/pkgs/data/fonts/iwona/default.nix @@ -1,10 +1,9 @@ { lib, stdenvNoCC, texlive }: -stdenvNoCC.mkDerivation { - pname = "iwona"; - version = "0.995b"; +stdenvNoCC.mkDerivation rec { + inherit (src) pname version; - src = lib.head (builtins.filter (p: p.tlType == "run") texlive.iwona.pkgs); + src = texlive.pkgs.iwona; installPhase = '' runHook preInstall @@ -20,7 +19,7 @@ stdenvNoCC.mkDerivation { # "[...] GUST Font License (GFL), which is a free license, legally # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or # later." - GUST website - license = licenses.lppl13c; + license = src.meta.license; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 7784f4ac8c2..a8aba0c1fb2 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "15.1.02"; + version = "15.1.03"; otf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf"; - hash = "sha256-fmhm74zc6wJK2f5XkDq/BRc5Lv+rCvcDRodgHCSiUQA="; + hash = "sha256-DGRIxE0HDX/cx7mQMBmGgRrbbj7fzWDAOMlhZM1/EEw="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - hash = "sha256-cCDXjSbpCe1U+Fx/xH/9NXWg6bkdRBV5AawFR0NyOHM="; + hash = "sha256-/fogZ8mkOz/4YFZVxU3tTZfYwZw7zGizoQ3yQkF+aME="; }; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 67bb06ba280..4d81e0386a3 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,14 +3,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20231015073627"; + version = "20231030084219"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-DffJ9d5ppTVLMTfITKd0zwCqBEKKMCwupLAFMr/o+dw="; + hash = "sha256-5FVHjK68weGWjla8MBS1D/Ks5PjzBKLv/TeyjBSgYFw="; }; - vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; + vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index eccff020ce5..d19ed938bf5 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "aliz" "azul" "sea" "pueril" "a stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-04-03"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "mr9X7p/H8H2QKZxAQC9j/8OLK4D3EnWLxriFlh16diE="; + sha256 = "+sWYUCFp5J+fhPHxicwtsHCQkFTpKwjj9H3GAXqNaYo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index 16e6fb32092..459044eb2a5 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -1,6 +1,5 @@ { lib , mkXfceDerivation -, fetchpatch , libxfce4util , gobject-introspection , vala @@ -9,19 +8,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfconf"; - version = "4.18.2"; + version = "4.18.3"; - 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="; - }) - ]; + sha256 = "sha256-Iu/LHyk/lOvu8uJuJRDxIkabiX0vZB4H99vVKRiugVo="; nativeBuildInputs = [ gobject-introspection vala ]; diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix index 53a74684cb8..99285b53cb6 100644 --- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -11,10 +11,10 @@ mkXfceDerivation { category = "thunar-plugins"; pname = "thunar-archive-plugin"; - version = "0.5.1"; + version = "0.5.2"; odd-unstable = false; - sha256 = "sha256-TV70IaZClIyQnMGsJEPN0VxHzZAS5F5jSTLm8VwYuwI="; + sha256 = "sha256-vbuFosj2qxDus7vu9WfRiFpLwnTRnmLVGCDa0tNQecU="; nativeBuildInputs = [ intltool diff --git a/pkgs/development/compilers/c0/default.nix b/pkgs/development/compilers/c0/default.nix index 9722d466ae2..179326cfeb8 100644 --- a/pkgs/development/compilers/c0/default.nix +++ b/pkgs/development/compilers/c0/default.nix @@ -10,17 +10,18 @@ , libpng , ncurses , readline +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "c0"; - version = "unstable-2022-10-25"; + version = "unstable-2023-09-05"; src = fetchFromBitbucket { owner = "c0-lang"; repo = "c0"; - rev = "7ef3bc9ca232ec41936e93ec8957051e48cacfba"; - sha256 = "sha256-uahF8fOp2ZJE8EhZke46sbPmN0MNHzsLkU4EXkV710U="; + rev = "608f97eef5d81bb85963d66f955730dd93996f67"; + hash = "sha256-lRIEtclx+NKxAO72nsvnxVeEGCEe6glC6w8MXh1HEwY="; }; patches = [ @@ -67,6 +68,10 @@ stdenv.mkDerivation rec { mv $out/c0-mode/ $out/share/emacs/site-lisp/ ''; + passthru.updateScript = unstableGitUpdater { + url = "https://bitbucket.org/c0-lang/c0.git"; + }; + meta = with lib; { description = "A small safe subset of the C programming language, augmented with contracts"; homepage = "https://c0.cs.cmu.edu/"; diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index 4518659d9f7..27e32df0631 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.23"; + version = "0.6.24"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-7UzITXvEpzMdKj9YIsuz6uYBLtk//OmTlnUegTLu+HA="; + hash = "sha256-J8Zw79TXYpDfnsx6UgB4sqY1vdwVHildqtCcXlBvUxQ="; }; - cargoHash = "sha256-A2HjobYgM22CIWYJusJUfPObNHlhN7y1lsv2mVzvluk="; + cargoHash = "sha256-4FhD9MvAhP88WGqVIUG2JHxd/gbDYf++bdlS6lVW0xs="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index ee45e1e9ab1..8bb3366655c 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fstar"; - version = "2023.04.25"; + version = "2023.09.03"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - hash = "sha256-LF8eXi/es337QJ2fs5u9pLqegJkh1kDLjK8p4CcSGGc="; + hash = "sha256-ymoP5DvaLdrdwJcnhZnLEvwNxUFzhkICajPyK4lvacc="; }; strictDeps = true; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { stdint yojson fileutils + memtrace menhirLib pprint sedlex diff --git a/pkgs/development/compilers/llvm/12/openmp/default.nix b/pkgs/development/compilers/llvm/12/openmp/default.nix index e0bcf03e00e..6040f3d1621 100644 --- a/pkgs/development/compilers/llvm/12/openmp/default.nix +++ b/pkgs/development/compilers/llvm/12/openmp/default.nix @@ -2,6 +2,7 @@ , stdenv , llvm_meta , fetch +, fetchpatch , cmake , llvm , targetLlvm @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { src = fetch pname "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0"; + patches = [ + # Fix cross. + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch"; + hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; + }) + ]; + + patchFlags = [ "-p2" ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) diff --git a/pkgs/development/compilers/llvm/13/openmp/default.nix b/pkgs/development/compilers/llvm/13/openmp/default.nix index 8eca980d601..7b461df438f 100644 --- a/pkgs/development/compilers/llvm/13/openmp/default.nix +++ b/pkgs/development/compilers/llvm/13/openmp/default.nix @@ -2,6 +2,7 @@ , stdenv , llvm_meta , src +, fetchpatch , cmake , llvm , targetLlvm @@ -16,6 +17,16 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${pname}"; + patches = [ + # Fix cross. + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch"; + hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; + }) + ]; + + patchFlags = [ "-p2" ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index c33c35e6142..7631ca8b083 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "owl-lisp"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitLab { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "sha256-TQOj3DYmzFT4ClZ/sBAOs5XJWRgGTaVQjH+8JotSb1A="; + sha256 = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 72d88dec6f1..150148cfe00 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -23,11 +23,12 @@ mkCoqDerivation { repo = "VST"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.15" "8.16"; out = "2.11.1"; } + { case = range "8.15" "8.17"; out = "2.12"; } { case = range "8.14" "8.16"; out = "2.10"; } { case = range "8.13" "8.15"; out = "2.9"; } { case = range "8.12" "8.13"; out = "2.8"; } ] null; + release."2.12".sha256 = "sha256-4HL0U4HA5/usKNXC0Dis1UZY/Hb/LRd2IGOrqrvdWkw="; release."2.11.1".sha256 = "sha256-unpNstZBnRT4dIqAYOv9n1J0tWJMeRuaaa2RG1U0Xs0="; release."2.10".sha256 = "sha256-RIxfPWoHnV1CFkpxCusoGY/LIk07TgC7wWGRP4BSq8w="; release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf"; @@ -39,7 +40,7 @@ mkCoqDerivation { preConfigure = '' patchShebangs util substituteInPlace Makefile \ - --replace 'COQVERSION= ' 'COQVERSION= 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ + --replace 'COQVERSION= ' 'COQVERSION= 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}' ''; diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 0f1f84dceab..a6ef9e0b8a3 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -8,6 +8,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "2.0.0"; } { cases = [ (range "8.15" "8.18") (isGe "1.15.0") ]; out = "1.1.3"; } { cases = [ (range "8.13" "8.17") (isGe "1.13.0") ]; out = "1.1.1"; } { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; } @@ -16,6 +17,7 @@ { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } ] null; + release."2.0.0".sha256 = "sha256-SG/KVnRJz2P+ZxkWVp1dDOnc/JVgigoexKfRUh1Y0GM"; release."1.1.3".sha256 = "sha256-xhqWpg86xbU1GbDtXXInNCTArjjPnWZctWiiasq1ScU="; release."1.1.1".sha256 = "sha256-ExAdC3WuArNxS+Sa1r4x5aT7ylbCvP/BZXfkdQNAvZ8="; release."1.1.0".sha256 = "1vyhfna5frkkq2fl1fkg2mwzpg09k3sbzxxpyp14fjay81xajrxr"; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 195b73dea6f..7d22abad7c7 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -10,10 +10,12 @@ mkCoqDerivation { release."1.2.4".sha256 = "sha256-iSW2O1kuunvOqTolmGGXmsYTxo2MJYCdW3BnEhp6Ksg="; release."1.2.5".sha256 = "sha256-3qOPNCRjGK2UdHGMSqElpIXhAPVCklpeQgZwf9AFals="; release."1.3.0".sha256 = "sha256-h9pa6vaKT6jCEaIdEdcu0498Ou5kEXtZdb9P7WXK1DQ="; + release."1.3.1".sha256 = "sha256-wBizm1hJXPYBu0tHFNScQHd22FebsJYoggT5OlhY/zM="; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.3.0"; } + { cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.3.1"; } + { cases = [ (isGe "8.16") "2.0.0" ]; out = "1.3.0"; } { cases = [ (isGe "8.11") (range "1.12" "1.17") ]; out = "1.2.5"; } { cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; } { cases = [ (isLe "8.13") (lib.pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index bfdd3e9b601..a665ea0db30 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -9,12 +9,14 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ + { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "1.2.2"; } { cases = [ (range "8.16" "8.18") (isGe "1.15") ]; out = "1.1.1"; } { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } ] null; release."1.0.0".sha256 = "sha256-kszARPBizWbxSQ/Iqpf2vLbxYc6AjpUCLnSNlPcNfls="; release."1.1.1".sha256 = "sha256-5wItMeeTRoJlRBH3zBNc2VUZn6pkDde60YAvXTx+J3U="; + release."1.2.2".sha256 = "sha256-EU9RJGV3BvnmsX+mGH+6+MDXiGHgDI7aP5sIYiMUXTs="; propagatedBuildInputs = [ mathcomp-algebra coq-elpi mathcomp-zify ]; diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index cbc6b8cc711..5746c9c6387 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -8,6 +8,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; release = { + "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8="; "1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4="; "1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7"; "1.1.2".sha256 = "0907x4nf7nnvn764q3x9lx41g74rilvq5cki5ziwgpsdgb98pppn"; @@ -19,6 +20,7 @@ mkCoqDerivation { }; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } { cases = [ (isGe "8.13") (isGe "1.13.0") ]; out = "1.1.4"; } { cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.1.2"; } diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index b11283e8c58..bffc169a1e9 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -8,8 +8,9 @@ owner = "math-comp"; inherit version; - defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.16") (isGe "2.1.0") ]; out = "2.1.0"; } + { cases = [ (isGe "8.16") "2.0.0" ]; out = "2.0.0"; } { cases = [ (isGe "8.15") (range "1.15.0" "1.17.0") ]; out = "1.6.0"; } { cases = [ (isGe "8.10") (range "1.13.0" "1.17.0") ]; out = "1.5.6"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.5.5"; } @@ -20,6 +21,7 @@ { cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; } ] null; release = { + "2.1.0".sha256 = "sha256-QT91SBJ6DXhyg4j/okTvPP6yj2DnnPbnSlJ/p8pvZbY="; "2.0.0".sha256 = "sha256-2zWHzMBsO2j8EjN7CgCmKQcku9Be8aVlme0LD5p4ab8="; "1.6.0".sha256 = "sha256-lEM+sjqajIOm1c3lspHqcSIARgMR9RHbTQH4veHLJfU="; "1.5.6".sha256 = "sha256-cMixgc34T9Ic6v+tYmL49QUNpZpPV5ofaNuHqblX6oY="; diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index 2fc26cbfef8..fd5a37c677e 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -1,20 +1,22 @@ -{ lib, mkCoqDerivation, coq, ssreflect, version ? null }: +{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: mkCoqDerivation { pname = "reglang"; releaseRev = v: "v${v}"; + release."1.2.0".sha256 = "sha256-gSqQ7D2HLwM4oYopTWkMFYfYXxsH/7VxI3AyrLwNf3o="; release."1.1.3".sha256 = "sha256-kaselYm8K0JBsTlcI6K24m8qpv8CZ9+VNDJrOtFaExg="; release."1.1.2".sha256 = "sha256-SEnMilLNxh6a3oiDNGLaBr8quQ/nO2T9Fwdf/1il2Yk="; inherit version; - defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.18"; out = "1.1.3"; } + defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ + { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.2.0"; } + { cases = [ (range "8.10" "8.18") (isLt "2.0.0") ]; out = "1.1.3"; } ] null; - propagatedBuildInputs = [ ssreflect ]; + propagatedBuildInputs = [ mathcomp.ssreflect ]; meta = with lib; { description = "Regular Language Representations in Coq"; diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index 16a5f4a855b..56f5eb10b92 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.600"; + version = "0.601"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-fu4ALQ6mpxSQAWdz6zzcHRC4Z5ykVB0G7e2QzpHt8K8="; + hash = "sha256-RkclNY5ZDP0Urht/JBx00SbeQ958CJCTIru2YUIYFa4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/zuo/default.nix b/pkgs/development/interpreters/zuo/default.nix index f0d71673c2f..95c05c3cf63 100644 --- a/pkgs/development/interpreters/zuo/default.nix +++ b/pkgs/development/interpreters/zuo/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "zuo"; - version = "unstable-2023-01-02"; + version = "unstable-2023-10-17"; src = fetchFromGitHub { owner = "racket"; repo = "zuo"; - rev = "464aae9ae90dcb43ab003b922e4ae4d08611c55b"; - hash = "sha256-O8p3dEXqAP2UNPNBla9AtkndxgL8UoVp/QygXOmcgWg="; + rev = "493e9cd08147add01bba9247f36759f095b87678"; + hash = "sha256-gsCjB3V+A0kMZJZ9onZ57R6b1Ha0K+Q383DQoVGfY7I="; }; doCheck = true; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "A Tiny Racket for Scripting"; homepage = "https://github.com/racket/zuo"; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 3359206b22b..76bf38cce16 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.6.4"; + version = "12.6.5"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-638kP/wy8YMkvH+peNA1hjfnNXyng2vsVbTrVul0k4A="; + hash = "sha256-9vHJh/m8K1LpcYg1zEFqUlz1im1XWoUdIZwMarW4xWM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix deleted file mode 100644 index 6f4cdb1cf68..00000000000 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, unzip, bintools-unwrapped, coreutils, substituteAll }: - -stdenv.mkDerivation rec { - pname = "cosmopolitan"; - version = "2.2"; - - src = fetchFromGitHub { - owner = "jart"; - repo = pname; - rev = version; - sha256 = "sha256-DTL1dXH+LhaxWpiCrsNjV74Bw5+kPbhEAA2Z1NKiPDk="; - }; - - patches = [ - # make sure tests set PATH correctly - (substituteAll { src = ./fix-paths.patch; inherit coreutils; }) - ]; - - nativeBuildInputs = [ bintools-unwrapped unzip ]; - - outputs = [ "out" "dist" ]; - - # slashes are significant because upstream uses o/$(MODE)/foo.o - buildFlags = [ "o/cosmopolitan.h" "o//cosmopolitan.a" "o//libc/crt/crt.o" "o//ape/ape.o" "o//ape/ape.lds" ]; - checkTarget = "o//test"; - enableParallelBuilding = true; - - doCheck = true; - dontConfigure = true; - dontFixup = true; - - preCheck = '' - # some syscall tests fail because we're in a sandbox - rm test/libc/calls/sched_setscheduler_test.c - rm test/libc/thread/pthread_create_test.c - rm test/libc/calls/getgroups_test.c - - # fails - rm test/libc/stdio/posix_spawn_test.c - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/{include,lib} - install o/cosmopolitan.h $out/include - install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} o/ape/ape-no-modify-self.o $out/lib - - cp -RT . "$dist" - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://justine.lol/cosmopolitan/"; - description = "Your build-once run-anywhere c library"; - platforms = platforms.x86_64; - badPlatforms = platforms.darwin; - license = licenses.isc; - maintainers = teams.cosmopolitan.members; - }; -} diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index a82759ba3e5..5d2e3b3245c 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.8.7"; + version = "1.9.0"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-lKV4dRIIkCn/qW8DyqDRHADh0tW0/ocf/29ox9aC0Yo="; + sha256 = "sha256-KZRW/ra84RegCCT6J0k+N7XqZF+xW+Ecq2TVdPZnM7M="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 1ad814e2b95..2972d5712cb 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -77,6 +77,10 @@ stdenv.mkDerivation rec { "-Dintrospection=enabled" "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" + ] ++ lib.optionals stdenv.isAarch32 [ + # the box test is failing with SIGBUS on armv7l-linux + # https://github.com/ebassi/graphene/issues/215 + "-Darm_neon=false" ]; doCheck = true; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index fa7eb93fe0c..c4d15352020 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 icu + vala # for share/vala/Makefile.vapigen (PKG_CONFIG_VAPIGEN_VAPIGEN) ]; propagatedBuildInputs = [ @@ -56,6 +57,9 @@ stdenv.mkDerivation rec { configureFlags = [ "GLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" "GLIB_MKENUMS=${lib.getDev buildPackages.glib}/bin/glib-mkenums" + "PKG_CONFIG_VAPIGEN_VAPIGEN=${lib.getBin buildPackages.vala}/bin/vapigen" + "--enable-introspection=yes" + "--enable-vala=yes" ]; passthru = { diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 7fd4572e0b7..b88daae22db 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -5,6 +5,7 @@ , meson , ninja , pkg-config +, substituteAll , gettext , dbus , glib @@ -53,12 +54,9 @@ stdenv.mkDerivation rec { }; patches = [ - # Hardcode the ssh path again. - # https://gitlab.gnome.org/GNOME/gvfs/-/issues/465 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gvfs/-/commit/8327383e262e1e7f32750a8a2d3dd708195b0f53.patch"; - hash = "sha256-ReD7qkezGeiJHyo9jTqEQNBjECqGhV9nSD+dYYGZWJ8="; - revert = true; + (substituteAll { + src = ./hardcode-ssh-path.patch; + ssh_program = "${lib.getBin openssh}/bin/ssh"; }) ]; @@ -76,7 +74,6 @@ stdenv.mkDerivation rec { pkg-config gettext wrapGAppsHook - libxml2 libxslt docbook_xsl docbook_xml_dtd_42 @@ -92,7 +89,7 @@ stdenv.mkDerivation rec { libimobiledevice libbluray libnfs - openssh + libxml2 gsettings-desktop-schemas libsoup_3 ] ++ lib.optionals udevSupport [ diff --git a/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch b/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch new file mode 100644 index 00000000000..aaf8e291aa8 --- /dev/null +++ b/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch @@ -0,0 +1,13 @@ +diff --git a/daemon/meson.build b/daemon/meson.build +index 72a16890..718944e1 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -256,7 +256,7 @@ if enable_sftp + '-DDEFAULT_BACKEND_TYPE=sftp', + '-DBACKEND_TYPES="sftp", G_VFS_TYPE_BACKEND_SFTP,', + '-DMAX_JOB_THREADS=1', +- '-DSSH_PROGRAM="ssh"', ++ '-DSSH_PROGRAM="@ssh_program@"', + ] + + programs += {'gvfsd-sftp': {'sources': sources, 'dependencies': deps, 'c_args': cflags}} diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 0b378c583ad..ebbf02603cb 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -3,20 +3,15 @@ stdenv.mkDerivation { pname = "libbap"; - version = "master-2020-11-25"; + version = "master-2022-07-13"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-bindings"; - rev = "3193cb31e1b1f2455406ea0c819dad9dfa2ba10d"; - sha256 = "0m4spva3z6fgbwlg4zq53l5p227dic893q2qq65pvzxyf7k7nmil"; + rev = "4d324dd794f8e022e8eddecbb2ae2e7b28173947"; + hash = "sha256-la47HR+i99ueDEWR91YIXGdKflpE1E0qmmJjeowmGSI="; }; - postPatch = '' - substituteInPlace Makefile.in \ - --replace "-linkpkg" "-thread -linkpkg" - ''; - nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; buildInputs = [ bap ctypes ]; diff --git a/pkgs/development/libraries/libcaption/default.nix b/pkgs/development/libraries/libcaption/default.nix new file mode 100644 index 00000000000..78cf5214051 --- /dev/null +++ b/pkgs/development/libraries/libcaption/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, re2c +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libcaption"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "szatmary"; + repo = "libcaption"; + rev = finalAttrs.version; + sha256 = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ re2c ]; + + meta = with lib; { + description = "Free open-source CEA608 / CEA708 closed-caption encoder/decoder"; + homepage = "https://github.com/szatmary/libcaption"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ pschmitt ]; + }; +}) diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix index 8e036cc663c..ff83b1835b5 100644 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/pkgs/development/libraries/libhugetlbfs/default.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { badPlatforms = flatten [ systems.inspect.platformPatterns.isStatic systems.inspect.patterns.isMusl - systems.inspect.patterns.isAarch64 ]; }; } diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index df27688e105..2623e65f68b 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, pkg-config -, systemd ? null +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +, systemd }: stdenv.mkDerivation rec { @@ -12,12 +13,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ systemd ]; + buildInputs = lib.optionals withSystemd [ systemd ]; configureFlags = [ "--enable-rfc3195" "--enable-stdlog" - (if systemd != null then "--enable-journal" else "--disable-journal") + (if withSystemd then "--enable-journal" else "--disable-journal") "--enable-man-pages" ]; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 44f82f15852..4b691ba3d88 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -33,14 +33,16 @@ stdenv.mkDerivation rec { python ]; + env.CXXFLAGS = toString (lib.optional stdenv.isDarwin [ "-faligned-allocation" "-fno-aligned-new" "-fvisibility=hidden" ]); + postBuild = '' - pushd /build/source/api/python + pushd ../api/python ${pyEnv.interpreter} setup.py build --parallel=$NIX_BUILD_CORES popd ''; postInstall = '' - pushd /build/source/api/python + pushd ../api/python ${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py popd ''; diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/development/libraries/mvapich/default.nix index 9c5046415e6..2182c408337 100644 --- a/pkgs/development/libraries/mvapich/default.nix +++ b/pkgs/development/libraries/mvapich/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10 ] ++ optional useSlurm "--with-pm=slurm" ++ optional (network == "ethernet") "--with-device=ch3:sock" - ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" ] + ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" "--disable-ibv-dlopen" ] ++ optionals (network == "omnipath") ["--with-device=ch3:psm" "--with-psm2=${libpsm2}"]; doCheck = true; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # /tmp/nix-build... ends up in the RPATH, fix it manually for entry in $out/bin/mpichversion $out/bin/mpivars; do echo "fix rpath: $entry" - patchelf --set-rpath "$out/lib" $entry + patchelf --allowed-rpath-prefixes ${builtins.storeDir} --shrink-rpath $entry done # Ensure the default compilers are the ones mvapich was built with diff --git a/pkgs/development/libraries/parson/default.nix b/pkgs/development/libraries/parson/default.nix index a61df952f89..a1f5c9a7285 100644 --- a/pkgs/development/libraries/parson/default.nix +++ b/pkgs/development/libraries/parson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "parson"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "kgabis"; repo = "parson"; - rev = "60c37844d7a1c97547812cac3423d458c73e60f9"; # upstream doesn't use tags - hash = "sha256-SbM0kqRtdcz1s+pUTW7VPMY1O6zdql3bao19Rk4t470="; + rev = "ba29f4eda9ea7703a9f6a9cf2b0532a2605723c3"; # upstream doesn't use tags + hash = "sha256-IEmCa0nauUzG+zcLpr++ySD7i21zVJh/35r9RaQkok0="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 652833a3936..242294462ed 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "64"; + version = "65"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-EdIe0hWsx0W9+03O0Avk4DV2jKv8s4wGAKk0NxIAuTU="; + sha256 = "sha256-HrTXhRoKSFeLXYQM7W2FvYf7yCD1diSZGtPop9urrSk="; }; patches = [ diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 4ebda617638..16fc10fe28f 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.262"; + version = "0.6.264"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JzAhoeEwSqeZOVXZCVw/MmpUMh/ufEa8CdOYc1mvReY="; + sha256 = "sha256-bE1tQgFg01FsR/rYgKZCDkhor0NZrHN3ACDbXHcpO6Q="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index c43260770e5..d503bda7876 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.33.1"; + version = "1.34.0"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "142h53qwmibi9bpdwla9ard771vcri8yibnynvgj5nvfgapj2p4z"; + sha256 = "1qbva38lcy1rm5k6r207hk3nqrr07h7x9sdppz4w5f37q0ll986r"; }; dontUnpack = true; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 06d4ce4b8b6..f0e9b379f42 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -153,7 +153,6 @@ , "katex" , "keyoxide" , "lcov-result-merger" -, "lean-language-server" , "lerna" , "less" , "less-plugin-clean-css" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index fc83b3c0acf..5f8eaa649d4 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -112,31 +112,31 @@ let sha512 = "lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg=="; }; }; - "@angular-devkit/architect-0.1602.8" = { + "@angular-devkit/architect-0.1602.9" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1602.8"; + version = "0.1602.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.8.tgz"; - sha512 = "bNdu2tF29Y/jOxMXlu9pmNbIlyZs9hRjLmi/tcfcMFay+3AhpNO59DWlUmI4gpvWu8CEXdQHSMuJTDHaNR+Ctg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.9.tgz"; + sha512 = "U3vfb/e2sFfg0D9FyyRBXRPP7g4FBFtGK8Q3JPmvAVsHHwi5AUFRNR7YBChB/T5TMNY077HcTyEirVh2FeUpdA=="; }; }; - "@angular-devkit/core-16.2.8" = { + "@angular-devkit/core-16.2.9" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "16.2.8"; + version = "16.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.8.tgz"; - sha512 = "PTGozYvh1Bin5lB15PwcXa26Ayd17bWGLS3H8Rs0s+04mUDvfNofmweaX1LgumWWy3nCUTDuwHxX10M3G0wE2g=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.9.tgz"; + sha512 = "dcHWjHBNGm3yCeNz19y8A1At4KgyC6XHNnbFL0y+nnZYiaESXjUoXJYKASedI6A+Bpl0HNq2URhH6bL6Af3+4w=="; }; }; - "@angular-devkit/schematics-16.2.8" = { + "@angular-devkit/schematics-16.2.9" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "16.2.8"; + version = "16.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.8.tgz"; - sha512 = "MBiKZOlR9/YMdflALr7/7w/BGAfo/BGTrlkqsIB6rDWV1dYiCgxI+033HsiNssLS6RQyCFx/e7JA2aBBzu9zEg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.9.tgz"; + sha512 = "lB51CGCILpcSI37CwKUAGDLxMqh7zmuRbiPo9s9mSkCM4ccqxFlaL+VFTq2/laneARD6aikpOHnkVm5myNzQPw=="; }; }; "@apidevtools/json-schema-ref-parser-9.0.6" = { @@ -310,13 +310,22 @@ let sha512 = "xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA=="; }; }; - "@astrojs/compiler-1.5.7" = { + "@astrojs/compiler-1.8.2" = { name = "_at_astrojs_slash_compiler"; packageName = "@astrojs/compiler"; - version = "1.5.7"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.8.2.tgz"; + sha512 = "o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw=="; + }; + }; + "@astrojs/compiler-2.2.1" = { + name = "_at_astrojs_slash_compiler"; + packageName = "@astrojs/compiler"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.5.7.tgz"; - sha512 = "dFU7GAMbpTUGPkRoCoMQrGFlTe3qIiQMSOxIXp/nB1Do4My9uogjEmBHdR5Cwr4i6rc5/1R3Od9v8kU/pkHXGQ=="; + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.2.1.tgz"; + sha512 = "NJ1lWKzMkyEjE3W5NpPNAVot4/PLF5om/P6ekxNu3iLS05CaYFTcp7WpYMjdCC252b7wkNVAs45FNkVQ+RHW/g=="; }; }; "@asyncapi/specs-4.3.1" = { @@ -427,13 +436,13 @@ let sha512 = "9Sp4vXjoG99qI6sFe09MfgIzsKwiOR0atqxmAcJJLn6fUNXhJEoW04n3w/YcRlk7P4gC9cOMsEyvb8xu+fDEOQ=="; }; }; - "@aws-sdk/client-cloudformation-3.436.0" = { + "@aws-sdk/client-cloudformation-3.441.0" = { name = "_at_aws-sdk_slash_client-cloudformation"; packageName = "@aws-sdk/client-cloudformation"; - version = "3.436.0"; + version = "3.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.436.0.tgz"; - sha512 = "eCjhIy2sDF1bawT9OCaF6njHLY/wQKKXzFxSfwCN323zHZqrc/zaHpDoTJV/MQrrJSW5RckCqfZA6IJDrIPMfA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.441.0.tgz"; + sha512 = "AeeSHYhEAUwV9ixw63i9QC4W8/EMKkHWJOo3tx8hMT9T5ZYNGz+SKaWFvS/3g0BQPneU7H3D/HurTKF2IbSc7g=="; }; }; "@aws-sdk/client-s3-3.296.0" = { @@ -445,13 +454,13 @@ let sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw=="; }; }; - "@aws-sdk/client-s3-3.436.0" = { + "@aws-sdk/client-s3-3.441.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.436.0"; + version = "3.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.436.0.tgz"; - sha512 = "4F/eg9caxUxRU9za+nppiq4VnjTy+QKc4V2A7bI+7N4GBXl/Ye8Q9zBjbEDpGBmZBHbuO/RtBtyf/ZyrYntEvA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.441.0.tgz"; + sha512 = "tJUhHk4Nvakw/q3IVI2oDFCu48DzuPCMu2G3n42JPyvmY0RvmtRjduduoG1lYIGgRKJu81/MFr9i8CGYNK+/5A=="; }; }; "@aws-sdk/client-sso-3.296.0" = { @@ -463,13 +472,13 @@ let sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA=="; }; }; - "@aws-sdk/client-sso-3.436.0" = { + "@aws-sdk/client-sso-3.441.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.436.0"; + version = "3.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.436.0.tgz"; - sha512 = "MM59VTikuehbN/iLz0rH0MhvUb9ngG9rB129darJkNBWNBQDNnQHox/31dm/Hyfq++YUf6GREsfW8r9HMMfLdg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.441.0.tgz"; + sha512 = "gndGymu4cEIN7WWhQ67RO0JMda09EGBlay2L8IKCHBK/65Y34FHUX1tCNbO2qezEzsi6BPW5o2n53Rd9QqpHUw=="; }; }; "@aws-sdk/client-sso-oidc-3.296.0" = { @@ -490,13 +499,13 @@ let sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA=="; }; }; - "@aws-sdk/client-sts-3.436.0" = { + "@aws-sdk/client-sts-3.441.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.436.0"; + version = "3.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.436.0.tgz"; - sha512 = "DJKvvtcjIziD8FMGIURwesrKdZcfTx0dZ3juBg8I0q2Y+kQYx1xFqy4dl9V/lQLBRWk1hku0iM+J/TI1YjlOrQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.441.0.tgz"; + sha512 = "GL0Cw2v7XL1cn0T+Sk5VHLlgBJoUdMsysXsHa1mFdk0l6XHMAAnwXVXiNnjmoDSPrG0psz7dL2AKzPVRXbIUjA=="; }; }; "@aws-sdk/config-resolver-3.296.0" = { @@ -508,13 +517,13 @@ let sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA=="; }; }; - "@aws-sdk/core-3.436.0" = { + "@aws-sdk/core-3.441.0" = { name = "_at_aws-sdk_slash_core"; packageName = "@aws-sdk/core"; - version = "3.436.0"; + version = "3.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.436.0.tgz"; - sha512 = "vX5/LjXvCejC2XUY6TSg1oozjqK6BvkE75t0ys9dgqyr5PlZyZksMoeAFHUlj0sCjhT3ziWCujP1oiSpPWY9hg=="; + url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.441.0.tgz"; + sha512 = "gV0eQwR0VnSPUYAbgDkbBtfXbSpZgl/K6UB13DP1IFFjQYbF/BxYwvcQe4jHoPOBifSgjEbl8MfOOeIyI7k9vg=="; }; }; "@aws-sdk/credential-provider-env-3.296.0" = { @@ -553,13 +562,13 @@ let sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.436.0" = { + "@aws-sdk/credential-provider-ini-3.441.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.436.0"; + version = "3.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.436.0.tgz"; - sha512 = "VWemmELcB+WSvP+hPk5CTlIYZMZdjcPFeoWrv11tpVqQ4be33AM1LEC1sTSU8fXKSgIL/tz7ilqp11fWm0MQwA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.441.0.tgz"; + sha512 = "SQipQYxYqDUuSOfIhDmaTdwPTcndGQotGZXWJl56mMWqAhU8MkwjK+oMf3VgRt/umJC0QwUCF5HUHIj7gSB1JA=="; }; }; "@aws-sdk/credential-provider-node-3.296.0" = { @@ -571,13 +580,13 @@ let sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA=="; }; }; - "@aws-sdk/credential-provider-node-3.436.0" = { + "@aws-sdk/credential-provider-node-3.441.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.436.0"; + version = "3.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.436.0.tgz"; - sha512 = "ZQIqR11TPU03RGI/eynOCMmH8FK4J+IxdDEsv2FBcxkuFl990CangoeEziRhVsw+a68TWVZA65kVv+oUX2u8Sw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.441.0.tgz"; + sha512 = "WB9p37yHq6fGJt6Vll29ijHbkh9VDbPM/n5ns73bTAgFD7R0ht5kPmdmHGQA6m3RKjcHLPbymQ3lXykkMwWf/Q=="; }; }; "@aws-sdk/credential-provider-process-3.296.0" = { @@ -607,13 +616,13 @@ let sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA=="; }; }; - "@aws-sdk/credential-provider-sso-3.436.0" = { + "@aws-sdk/credential-provider-sso-3.441.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.436.0"; + version = "3.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.436.0.tgz"; - sha512 = "40exwlz6Xfc/28e1dfpHP7vwK04gATWEQ1dBb30d0zXASpn0Z0PWyNgAO2owcGsw4TdceSREV1mj8HwYkl8+BA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.441.0.tgz"; + sha512 = "pTg16G+62mWCE8yGKuQnEBqPdpG5g71remf2jUqXaI1c7GCzbnkQDV9eD4DaAGOvzIs0wo9zAQnS2kVDPFlCYA=="; }; }; "@aws-sdk/credential-provider-web-identity-3.296.0" = { @@ -733,13 +742,13 @@ let sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag=="; }; }; - "@aws-sdk/lib-storage-3.436.0" = { + "@aws-sdk/lib-storage-3.441.0" = { name = "_at_aws-sdk_slash_lib-storage"; packageName = "@aws-sdk/lib-storage"; - version = "3.436.0"; + version = "3.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.436.0.tgz"; - sha512 = "APSAt3Na8uy0WnCGTL8cZiqNvKOAWztQYsMjJ9iU9QUnxDWBD4knlKUyhhjMaBTni7lZsrf+obUuMIcjqtGp9w=="; + url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.441.0.tgz"; + sha512 = "Olj/kVIhJo9Cvw06dzn0uQ8M29L7Vu8tSj4MHCewH0goJ0GGIclOf83uVofMZO94zG7X/bv6+4CtNBJIhlokQw=="; }; }; "@aws-sdk/md5-js-3.296.0" = { @@ -913,13 +922,13 @@ let sha512 = "zH4uZKEqumo01wn+dTwrYnvOui9GjDiuBHdECnSjnA0Mkxo/tfMPYzYD7mE8kUlBz7HfQcXeXlyaApj9fPkxvg=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.433.0" = { + "@aws-sdk/middleware-sdk-s3-3.440.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.433.0"; + version = "3.440.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.433.0.tgz"; - sha512 = "mkn3DiSuMVh4NTLsduC42Av+ApcOor52LMoQY0Wc6M5Mx7Xd05U+G1j8sjI9n/1bs5cZ/PoeRYJ/9bL1Xxznnw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.440.0.tgz"; + sha512 = "DVTSr+82Z8jR9xTwDN3YHzxX7qvi0n96V92OfxvSRDq2BldCEx/KEL1orUZjw97SAXhINOlUWjRR7j4HpwWQtQ=="; }; }; "@aws-sdk/middleware-sdk-sts-3.296.0" = { @@ -1003,13 +1012,13 @@ let sha512 = "L7jacxSt6gxX1gD3tQtfwHqBDk5rT2wWD3rxBa6rs7f81b9ObgY/sPT2IgRT7JNCVzvKLYFxJaTklDj65mY1SQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.433.0" = { + "@aws-sdk/middleware-user-agent-3.438.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.433.0"; + version = "3.438.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.433.0.tgz"; - sha512 = "jMgA1jHfisBK4oSjMKrtKEZf0sl2vzADivkFmyZFzORpSZxBnF6hC21RjaI+70LJLcc9rSCzLgcoz5lHb9LLDg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.438.0.tgz"; + sha512 = "a+xHT1wOxT6EA6YyLmrfaroKWOkwwyiktUfXKM0FsUutGzNi4fKhb5NZ2al58NsXzHgHFrasSDp+Lqbd/X2cEw=="; }; }; "@aws-sdk/node-config-provider-3.296.0" = { @@ -1075,13 +1084,13 @@ let sha512 = "xpjRjCZW+CDFdcMmmhIYg81ST5UAnJh61IHziQEk0FXONrg4kjyYPZAOjEdzXQ+HxJQuGQLKPhRdzxmQnbX7pg=="; }; }; - "@aws-sdk/s3-presigned-post-3.436.0" = { + "@aws-sdk/s3-presigned-post-3.441.0" = { name = "_at_aws-sdk_slash_s3-presigned-post"; packageName = "@aws-sdk/s3-presigned-post"; - version = "3.436.0"; + version = "3.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.436.0.tgz"; - sha512 = "S4FSdCh92dHMbATn0SktrJbAru21H7swreKFHUH1k5IZf+b7FbtQWWKdHp49Oj8l7eEcifeTrj2I/6h/3ufLow=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.441.0.tgz"; + sha512 = "IW8Q7wo7ACEcUjdzNeS6Ql7mMLjZVoxXssgrFCSlpdeykTXuD7Tx8frp7qCxzFKPm4sqtcGjmbTDRapZYJWlbQ=="; }; }; "@aws-sdk/s3-request-presigner-3.296.0" = { @@ -1093,13 +1102,13 @@ let sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw=="; }; }; - "@aws-sdk/s3-request-presigner-3.436.0" = { + "@aws-sdk/s3-request-presigner-3.441.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.436.0"; + version = "3.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.436.0.tgz"; - sha512 = "UQ7/HCj3jCuV3SB423MNHaQstJKH8x3eeaxQmvVQdO7O2t67FOFPsSxhvQtlMrHqyKARgsfbXFRjNRz0jgxsSA=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.441.0.tgz"; + sha512 = "EUVsmy92imURMLoA/MX+PL1SIONQ8YSi424BHJA6xGEoaqvQiaVKlv8jJfCqJ6qQ8oLiCLe2hOBSBTY1XZiy/g=="; }; }; "@aws-sdk/service-error-classification-3.296.0" = { @@ -1129,13 +1138,13 @@ let sha512 = "NQyJ/FClty4VmF1WoV4rOkbN0Unn0zevzy8iJrYhqxE3Sc7lySM4Btnsd4Iqelm2dR6l+jNRApGgD8NvoGjGig=="; }; }; - "@aws-sdk/signature-v4-crt-3.433.0" = { + "@aws-sdk/signature-v4-crt-3.438.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.433.0"; + version = "3.438.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.433.0.tgz"; - sha512 = "qkyVYXHDw33uiD88rxL8dmtRS7X3rxlNRRCXU9vpezOW9TEdYaIM/KZS3YIRKZ2RjVC2hiHe9Zo8MhivA1915A=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.438.0.tgz"; + sha512 = "1lUryu6b+JbL8WGleT6vHj3Yy+tmGLT4Ep+Kxcqktslc3/Eu0EaFV8gbK1SZBKpnfm3dh/3AApHHSLzEAqaYKA=="; }; }; "@aws-sdk/signature-v4-multi-region-3.296.0" = { @@ -1147,13 +1156,13 @@ let sha512 = "BNMXS0YJEgflPhO2KxXG4f0iTMOGdyxslDMNGmMWGGQm6bbwtqZ7Y9ZyMQYKfzk3GUPpfGQcaaSNiGfURPOCOg=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.433.0" = { + "@aws-sdk/signature-v4-multi-region-3.437.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.433.0"; + version = "3.437.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.433.0.tgz"; - sha512 = "wl2j1dos4VOKFawbapPm/0CNa3cIgpJXbEx+sp+DI3G8tSuP3c5UGtm0pXjM85egxZulhHVK1RVde0iD8j63pQ=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.437.0.tgz"; + sha512 = "MmrqudssOs87JgVg7HGVdvJws/t4kcOrJJd+975ki+DPeSoyK2U4zBDfDkJ+n0tFuZBs3sLwLh0QXE7BV28rRA=="; }; }; "@aws-sdk/smithy-client-3.296.0" = { @@ -1174,13 +1183,13 @@ let sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ=="; }; }; - "@aws-sdk/token-providers-3.435.0" = { + "@aws-sdk/token-providers-3.438.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.435.0"; + version = "3.438.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.435.0.tgz"; - sha512 = "JZKqsuoK321ozp2ufGmjfpbAqtK1tYnLn0PaePWjvDL48B5A5jGNqFyP3/tg7LFP7vTp9O3pJ7ln0QLh8FpsjQ=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.438.0.tgz"; + sha512 = "G2fUfTtU6/1ayYRMu0Pd9Ln4qYSvwJOWCqJMdkDgvXSwdgcOSOLsnAIk1AHGJDAvgLikdCzuyOsdJiexr9Vnww=="; }; }; "@aws-sdk/types-3.296.0" = { @@ -1309,13 +1318,13 @@ let sha512 = "YraGGLJepXM6HCTaqEGTFf8RFRBdJ0C6uG5k0kVhiXmYxBkeupn8J07CVp9jfWqcPYWElAnMGVEZKU1OjRo4HQ=="; }; }; - "@aws-sdk/util-endpoints-3.433.0" = { + "@aws-sdk/util-endpoints-3.438.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.433.0"; + version = "3.438.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.433.0.tgz"; - sha512 = "LFNUh9FH7RMtYjSjPGz9lAJQMzmJ3RcXISzc5X5k2R/9mNwMK7y1k2VAfvx+RbuDbll6xwsXlgv6QHcxVdF2zw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.438.0.tgz"; + sha512 = "6VyPTq1kN3GWxwFt5DdZfOsr6cJZPLjWh0troY/0uUv3hK74C9o3Y0Xf/z8UAUvQFkVqZse12O0/BgPVMImvfA=="; }; }; "@aws-sdk/util-format-url-3.296.0" = { @@ -1426,13 +1435,13 @@ let sha512 = "AMWac8aIBnaa9nxAEpZ752j29a/UQTViRfR5gnCX38ECBKGfOQMpgYnee5HdlMr4GHJj0WkOzQxBtInW4pV58g=="; }; }; - "@aws-sdk/util-user-agent-node-3.433.0" = { + "@aws-sdk/util-user-agent-node-3.437.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.433.0"; + version = "3.437.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.433.0.tgz"; - sha512 = "yT1tO4MbbsUBLl5+S+jVv8wxiAtP5TKjKib9B2KQ2x0OtWWTrIf2o+IZK8va+zQqdV4MVMjezdxdE20hOdB4yQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.437.0.tgz"; + sha512 = "JVEcvWaniamtYVPem4UthtCNoTBCfFTwYj7Y3CrWZ2Qic4TqrwLkAfaBGtI2TGrhIClVr77uzLI6exqMTN7orA=="; }; }; "@aws-sdk/util-utf8-3.295.0" = { @@ -1606,22 +1615,22 @@ let sha512 = "ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg=="; }; }; - "@azure/msal-browser-2.38.2" = { + "@azure/msal-browser-2.38.3" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.38.2"; + version = "2.38.3"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.38.2.tgz"; - sha512 = "71BeIn2we6LIgMplwCSaMq5zAwmalyJR3jFcVOZxNVfQ1saBRwOD+P77nLs5vrRCedVKTq8RMFhIOdpMLNno0A=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.38.3.tgz"; + sha512 = "2WuLFnWWPR1IdvhhysT18cBbkXx1z0YIchVss5AwVA95g7CU5CpT3d+5BcgVGNXDXbUU7/5p0xYHV99V5z8C/A=="; }; }; - "@azure/msal-common-13.3.0" = { + "@azure/msal-common-13.3.1" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "13.3.0"; + version = "13.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-13.3.0.tgz"; - sha512 = "/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-13.3.1.tgz"; + sha512 = "Lrk1ozoAtaP/cp53May3v6HtcFSVxdFrg2Pa/1xu5oIvsIwhxW6zSPibKefCOVgd5osgykMi5jjcZHv8XkzZEQ=="; }; }; "@azure/msal-common-7.6.0" = { @@ -1633,13 +1642,13 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-node-1.18.3" = { + "@azure/msal-node-1.18.4" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.18.3"; + version = "1.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.3.tgz"; - sha512 = "lI1OsxNbS/gxRD4548Wyj22Dk8kS7eGMwD9GlBZvQmFV8FJUXoXySL1BiNzDsHUE96/DS/DHmA+F73p1Dkcktg=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz"; + sha512 = "Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg=="; }; }; "@azure/storage-blob-12.11.0" = { @@ -3217,13 +3226,13 @@ let sha512 = "LGB3eI5UYu5LLayibNrRM4bSbowr1z9uyqvp0c7+0KaSJi+xHxy/QEhb6fy4bMAtbXEvygY0sUu9HxSWg41rVQ=="; }; }; - "@commitlint/load-18.1.0" = { + "@commitlint/load-18.2.0" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "18.1.0"; + version = "18.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-18.1.0.tgz"; - sha512 = "oZbAV3wdh4f5EB99y6U1uY1grvU1Oz1EYtWML9Zu4he6sgzVGHuIP81mka8exFp4bGytaUmuIKl+ahck3P4HoQ=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-18.2.0.tgz"; + sha512 = "xjX3d3CRlOALwImhOsmLYZh14/+gW/KxsY7+bPKrzmGuFailf9K7ckhB071oYZVJdACnpY4hDYiosFyOC+MpAA=="; }; }; "@commitlint/message-18.1.0" = { @@ -3415,13 +3424,13 @@ let sha512 = "Aw07qiTroqSST2P5joSrC4uOA05zTXzI2wMb+me3q4Davv1D9sCkzXY0TGoC2vzhNv5ooemRi9KATGaBSdU1sw=="; }; }; - "@cspell/dict-companies-3.0.26" = { + "@cspell/dict-companies-3.0.27" = { name = "_at_cspell_slash_dict-companies"; packageName = "@cspell/dict-companies"; - version = "3.0.26"; + version = "3.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.26.tgz"; - sha512 = "BGRZ/Uykx+IgQoTGqvRqbBMQy7QSuY0pbTHgtmKtc1scgzZMJQKMDwyuE6LJzlhdlrV7TsVY0lyXREybnDpQPQ=="; + url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.0.27.tgz"; + sha512 = "gaPR/luf+4oKGyxvW4GbxGGPdHiC5kj/QefnmQqrLFrLiCSXMZg5/NL+Lr4E5lcHsd35meX61svITQAvsT7lyQ=="; }; }; "@cspell/dict-cpp-1.1.40" = { @@ -3622,13 +3631,13 @@ let sha512 = "EllahNkhzvLWo0ptwu0l3oEeAJOQSUpZnDfnKRIh6mJVehuSovNHwA9vrdZ8jBUjuqcfaN2e7c32zN0D/qvWJQ=="; }; }; - "@cspell/dict-filetypes-3.0.1" = { + "@cspell/dict-filetypes-3.0.2" = { name = "_at_cspell_slash_dict-filetypes"; packageName = "@cspell/dict-filetypes"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.1.tgz"; - sha512 = "8z8mY1IbrTyTRumx2vvD9yzRhNMk9SajM/GtI5hdMM2pPpNSp25bnuauzjRf300eqlqPY2MNb5MmhBFO014DJw=="; + url = "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.2.tgz"; + sha512 = "StoC0wPmFNav6F6P8/FYFN1BpZfPgOmktb8gQ9wTauelWofPeBW+A0t5ncZt9hXHtnbGDA98v4ukacV+ucbnUg=="; }; }; "@cspell/dict-fonts-1.0.14" = { @@ -3937,13 +3946,13 @@ let sha512 = "KuyOQaby9NID/pn7EkXilpUxjVIvvyLzhr7BPsDS6FcvUE8Yhss6bJowEDHSv6pa+W2387phoqbDf2rTicquAA=="; }; }; - "@cspell/dict-python-4.1.9" = { + "@cspell/dict-python-4.1.10" = { name = "_at_cspell_slash_dict-python"; packageName = "@cspell/dict-python"; - version = "4.1.9"; + version = "4.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.1.9.tgz"; - sha512 = "JMA4v/ZPJWuDt3PPFz+23VIY3iDIB+xOTQ6nw+WkcJU5yr6FUl5zMU9ModKrgujg3jGRuuJqofErZVPqHNHYAA=="; + url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.1.10.tgz"; + sha512 = "ErF/Ohcu6Xk4QVNzFgo8p7CxkxvAKAmFszvso41qOOhu8CVpB35ikBRpGVDw9gsCUtZzi15Yl0izi4do6WcLkA=="; }; }; "@cspell/dict-r-2.0.1" = { @@ -5503,31 +5512,31 @@ let sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; - "@gitbeaker/core-39.21.1" = { + "@gitbeaker/core-39.21.2" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "39.21.1"; + version = "39.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-39.21.1.tgz"; - sha512 = "S0NQOPCYGgDKqShb6mbi4p0qBV2I4O/yOQRGAADQRha2ZZGlbOOFndlb6ZYUqy51AZZa7UsojSAaGOENaFm+tQ=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-39.21.2.tgz"; + sha512 = "HPFQVhbTKu+IaKw5+8TnRPTqAp6SPFzaCbwAEJ7nWLAsI2IRP+iWyASmMDG99RY8TcqnCBrxx3tAClV+QBhflg=="; }; }; - "@gitbeaker/requester-utils-39.21.1" = { + "@gitbeaker/requester-utils-39.21.2" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "39.21.1"; + version = "39.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-39.21.1.tgz"; - sha512 = "gCaItfWHzPiK0kYb93YLs6uf//KeOMTcaPCiTSPlKBX3jE3G1kMA7KGN9KTEeg5cMXjOzJ4bf9mregS4X4f47g=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-39.21.2.tgz"; + sha512 = "RlYJDzfqSEI/q2vY1xn4bQ6/j0kyuoySRUnA8huEdA48IfowNLAigaXxB9cQxBecmnt32JQZitUbxsHpelkQYw=="; }; }; - "@gitbeaker/rest-39.21.1" = { + "@gitbeaker/rest-39.21.2" = { name = "_at_gitbeaker_slash_rest"; packageName = "@gitbeaker/rest"; - version = "39.21.1"; + version = "39.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-39.21.1.tgz"; - sha512 = "EdHj3O2+nbL4JiDeWGCWQNSiDzkazrMeW+PGq4Qv4YVqFrp1+xCSVi2v/fWRGD139MTBylph1gOg71QDlXRU3A=="; + url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-39.21.2.tgz"; + sha512 = "631HpAApQcg2r0kkzp5tveSDclEeI382lNAXoKO9D9ndhZrAzY/gvskCi7FrOJ8+35lfzRmiEUIBpdUbdvblvg=="; }; }; "@grammarly/sdk-1.11.0" = { @@ -5611,13 +5620,13 @@ let sha512 = "SKlIcMA71Dha5JnEWlw4XxcaJ+YupuXg0QCZgl2TOLFz4SkGCwU/geAsJvUJFwK2RbVLpQv/UMq67lOaBuwDtg=="; }; }; - "@graphql-tools/executor-graphql-ws-1.1.0" = { + "@graphql-tools/executor-graphql-ws-1.1.1" = { name = "_at_graphql-tools_slash_executor-graphql-ws"; packageName = "@graphql-tools/executor-graphql-ws"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.0.tgz"; - sha512 = "yM67SzwE8rYRpm4z4AuGtABlOp9mXXVy6sxXnTJRoYIdZrmDbKVfIY+CpZUJCqS0FX3xf2+GoHlsj7Qswaxgcg=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.1.tgz"; + sha512 = "llfLyRpmXqMX6kM3AvepviTxi06UTutphJljQupoU8FaTh0OcGFPjLjVSbgP7tOqI6lD1YbPR7qY83vDeYLarA=="; }; }; "@graphql-tools/executor-http-1.0.3" = { @@ -5818,13 +5827,13 @@ let sha512 = "rPc9oDzMnycvz+X+wrN3PLrhMBQkG4+sd8EzaFN6dypcssiefgWKToXtRKI8HHK68n2xEq1PyrOpkjHFJB+GwA=="; }; }; - "@graphql-tools/utils-10.0.7" = { + "@graphql-tools/utils-10.0.8" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "10.0.7"; + version = "10.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.7.tgz"; - sha512 = "KOdeMj6Hd/MENDaqPbws3YJl3wVy0DeYnL7PyUms5Skyf7uzI9INynDwPMhLXfSb0/ph6BXTwMd5zBtWbF8tBQ=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.8.tgz"; + sha512 = "yjyA8ycSa1WRlJqyX/aLqXeE5DvF/H02+zXMUFnCzIDrj0UvLMUrxhmVFnMK0Q2n3bh4uuTeY3621m5za9ovXw=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -5962,6 +5971,15 @@ let sha512 = "dJO0VQZFtUcqledAAU8b0yCw3HdkIVyrNjv8sAwdhDcOMRKdaNumi7Punj39u5h2CpdMN4g6I4gp584g/zVSzA=="; }; }; + "@hpcc-js/wasm-2.14.1" = { + name = "_at_hpcc-js_slash_wasm"; + packageName = "@hpcc-js/wasm"; + version = "2.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.14.1.tgz"; + sha512 = "ncPvj0dEjoye8jD1NAwdThXlZ5mpuGRyRwaNWU6JVBgyT8TewVDmG+RAOXPysyaP1Ui8Lm7562W4KawZtPwa1A=="; + }; + }; "@httptoolkit/websocket-stream-6.0.1" = { name = "_at_httptoolkit_slash_websocket-stream"; packageName = "@httptoolkit/websocket-stream"; @@ -6700,15 +6718,6 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; - "@jsii/check-node-1.88.0" = { - name = "_at_jsii_slash_check-node"; - packageName = "@jsii/check-node"; - version = "1.88.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.88.0.tgz"; - sha512 = "AveFyqkJIb8qZvGk5nZal/8mEJB6lWhwqvAQLodHmqE3WzpmZD5+h+aspBVt0El5cEFRJ1k1mrQqhAnJCVpvxg=="; - }; - }; "@jsii/check-node-1.90.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; @@ -6763,22 +6772,22 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@lerna/child-process-7.4.1" = { + "@lerna/child-process-7.4.2" = { name = "_at_lerna_slash_child-process"; packageName = "@lerna/child-process"; - version = "7.4.1"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-7.4.1.tgz"; - sha512 = "Bx1cRCZcVcWoz+atDQc4CSVzGuEgGJPOpIAXjQbBEA2cX5nqIBWdbye8eHu31En/F03aH9BhpNEJghs6wy4iTg=="; + url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-7.4.2.tgz"; + sha512 = "je+kkrfcvPcwL5Tg8JRENRqlbzjdlZXyaR88UcnCdNW0AJ1jX9IfHRys1X7AwSroU2ug8ESNC+suoBw1vX833Q=="; }; }; - "@lerna/create-7.4.1" = { + "@lerna/create-7.4.2" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "7.4.1"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-7.4.1.tgz"; - sha512 = "zPO9GyWceRimtMD+j+aQ8xJgNPYn/Q/SzHf4wYN+4Rj5nrFKMyX+Et7FbWgUNpj0dRgyCCKBDYmTB7xQVVq4gQ=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-7.4.2.tgz"; + sha512 = "1wplFbQ52K8E/unnqB0Tq39Z4e+NEoNrpovEnl6GpsTUrC6WDp8+w0Le2uCBV0hXyemxChduCkLz4/y1H1wTeg=="; }; }; "@lezer/common-1.1.0" = { @@ -6961,13 +6970,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/rush-lib-5.109.2" = { + "@microsoft/rush-lib-5.110.1" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.109.2"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.109.2.tgz"; - sha512 = "VAiex7iQMI5UarIPl5zT/uikYPQACg7Y/Kancw73M0yJvHVDJ3jPr8pKXQum+PZ0lN/JFqg1vXftBT9j1EJefQ=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.110.1.tgz"; + sha512 = "+DhfZSUrxl5IOTJK452lahcXc8tPddyb0q8FmQ4LzShjUgOzTQrV3JIKY8BR93WeA47DMl1NpaiKiZEw++uY+w=="; }; }; "@mischnic/json-sourcemap-0.1.1" = { @@ -7096,6 +7105,15 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; + "@npmcli/agent-2.2.0" = { + name = "_at_npmcli_slash_agent"; + packageName = "@npmcli/agent"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.0.tgz"; + sha512 = "2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q=="; + }; + }; "@npmcli/config-6.4.0" = { name = "_at_npmcli_slash_config"; packageName = "@npmcli/config"; @@ -7114,6 +7132,15 @@ let sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="; }; }; + "@npmcli/fs-2.1.2" = { + name = "_at_npmcli_slash_fs"; + packageName = "@npmcli/fs"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz"; + sha512 = "yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ=="; + }; + }; "@npmcli/fs-3.1.0" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; @@ -7159,6 +7186,15 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; + "@npmcli/move-file-2.0.1" = { + name = "_at_npmcli_slash_move-file"; + packageName = "@npmcli/move-file"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz"; + sha512 = "mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ=="; + }; + }; "@npmcli/name-from-folder-2.0.0" = { name = "_at_npmcli_slash_name-from-folder"; packageName = "@npmcli/name-from-folder"; @@ -7951,337 +7987,337 @@ let sha512 = "A2LqEEM1eHusITeFXsQFNhVjXR5mg2oIwjQRmjJdCZ98HlZpMoO6opEURUTF2qNtREI8HrjEyN7mUNIcLxrDyA=="; }; }; - "@parcel/bundler-default-2.10.1" = { + "@parcel/bundler-default-2.10.2" = { name = "_at_parcel_slash_bundler-default"; packageName = "@parcel/bundler-default"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.10.1.tgz"; - sha512 = "R+0xfFoEkwGJ/6xYEFPvifd8zzatHz/YC7+IQLluxxutSJFhDcyewBfFkUgqlSJkYlSFRohS+w0T5y4V6T97Yw=="; + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.10.2.tgz"; + sha512 = "XlVGsScK5PgIFXNJ0Yx/+nHu1RFCuslCbrb8MIs0yqS790yzvyJF2QHX5WAr7Qc5powij/+2tfBHiViauWwVpA=="; }; }; - "@parcel/cache-2.10.1" = { + "@parcel/cache-2.10.2" = { name = "_at_parcel_slash_cache"; packageName = "@parcel/cache"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.10.1.tgz"; - sha512 = "qMJ6iMUIG9Ao42JSnDOuAzmEj6xGTrqKmz0tTgwbAhEaIjo974t0PAzOop+Ai074H12uZ1pWe6TvoL+qqJz8gg=="; + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.10.2.tgz"; + sha512 = "B69e5n+bBzYoaJdUOviYeUT7N1iXI3IC5G8dAxKNZ9Zgn+pjZ5BwltbfmP47+NTfQ7LqM8Ea4UJxysQsLdwb+Q=="; }; }; - "@parcel/codeframe-2.10.1" = { + "@parcel/codeframe-2.10.2" = { name = "_at_parcel_slash_codeframe"; packageName = "@parcel/codeframe"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.10.1.tgz"; - sha512 = "CyAJJGyFJ6TIU2onxbK4VVmtXnCpVdSZobbCyRPYkHKQfqlarnjeQXZHBLnsBX1qviF4VGXp4ePgcsyiaFxWZg=="; + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.10.2.tgz"; + sha512 = "EZrYSIlVg4qiBLHRRqC/BGN2MLG0SKnw4u7kpviwz63I+v36ghqmHGOomwfn4x13nDL+EgOFz4/+Q7QpbMTKug=="; }; }; - "@parcel/compressor-raw-2.10.1" = { + "@parcel/compressor-raw-2.10.2" = { name = "_at_parcel_slash_compressor-raw"; packageName = "@parcel/compressor-raw"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.10.1.tgz"; - sha512 = "dBDmMhl7E8Cs0i4nvsg/9mWqqfI0qKL6J7jLYQFn+oubJXS1WZCmtIGwlrYT5rw8NouaLJCoN62ahb2SmhuKqw=="; + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.10.2.tgz"; + sha512 = "zIbtmL7vGfWkvBwD29zVdDosFR1eKHa29SpPOQXYLmDO0EVdwzYcTQq2OrlZM07o759QUqwXJfuAYxwcBNRTYg=="; }; }; - "@parcel/config-default-2.10.1" = { + "@parcel/config-default-2.10.2" = { name = "_at_parcel_slash_config-default"; packageName = "@parcel/config-default"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.10.1.tgz"; - sha512 = "Yyv6NxM7fvA5AZH3+fVoxL5/eMZz/fWLWGYPHxe8KT2aYIvVPCQpdUaQ87JNGgzUsL/bgYDWA9da3FReGuBxIA=="; + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.10.2.tgz"; + sha512 = "BGn7G5MT6VXpnI5Rj8fzHT1ij0YElge3l2KVGSOJ5crho2Fmz7UKmm8kJ9kdcLrzHWOIH07T100YoQuAwKVQaA=="; }; }; - "@parcel/core-2.10.1" = { + "@parcel/core-2.10.2" = { name = "_at_parcel_slash_core"; packageName = "@parcel/core"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/core/-/core-2.10.1.tgz"; - sha512 = "d3ufgqp3nfxJJLFLiGccX3C2paF/mWFjhjltoLmeqtdR3SFfS8z1ysrC7WJqBlwHFwBtL8ZqjPquekGmaH2LoQ=="; + url = "https://registry.npmjs.org/@parcel/core/-/core-2.10.2.tgz"; + sha512 = "c6hh13oYk9w5creiQ9yCz9GLQ17ZRMonULhJ46J0yoFArynVhNTJ9B5xVst7rS/chOTY8jU0jSdJuxQCR4fjkg=="; }; }; - "@parcel/diagnostic-2.10.1" = { + "@parcel/diagnostic-2.10.2" = { name = "_at_parcel_slash_diagnostic"; packageName = "@parcel/diagnostic"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.10.1.tgz"; - sha512 = "PzYIyqg9QrIInPdfc4kellhfm0OlzylSvmDPfCCGlIdOnhFX5qqzaZkNAdFL1j4R4KwVqo90aeAy4I8AERRfaw=="; + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.10.2.tgz"; + sha512 = "FwtphyiV/TJEiYIRYXBOloXp7XhTW37ifRSLr7RdLbDVyn/P9q/7l0+ORlnOL+WuKwbDQtY+dXYLh/ijTsq7qQ=="; }; }; - "@parcel/events-2.10.1" = { + "@parcel/events-2.10.2" = { name = "_at_parcel_slash_events"; packageName = "@parcel/events"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/events/-/events-2.10.1.tgz"; - sha512 = "QONtaYl6YOZEbhpRFJ14OfnMu/rpUA2HlnhySTDdrv4N6vAiwbTIBhAAKqbQQNaRYH6OeKo9JSuXKggCFJr9Ag=="; + url = "https://registry.npmjs.org/@parcel/events/-/events-2.10.2.tgz"; + sha512 = "Dp8Oqh5UvSuIASfiHP8jrEtdtzzmTKiOG/RkSL3mtp2tK3mu6dZLJZbcdJXrvBTg7smtRiznkrIOJCawALC7AQ=="; }; }; - "@parcel/fs-2.10.1" = { + "@parcel/fs-2.10.2" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.10.1.tgz"; - sha512 = "LLSaXj3oG4uCAUktcsXpzaK0AhT+vXLwCkechSuu88vrHpGOLHLnO/VkRsMNskWPjX9jAXbYRRX1x6uacdf04g=="; + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.10.2.tgz"; + sha512 = "80SXdFGDJtil9tTbWrYiZRfQ5ehMAT/dq6eY4EYcFg+MvSiwBL/4GfYMfqXn6AamuSVeQlsFCPpunFLNl9YDDA=="; }; }; - "@parcel/graph-3.0.1" = { + "@parcel/graph-3.0.2" = { name = "_at_parcel_slash_graph"; packageName = "@parcel/graph"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/graph/-/graph-3.0.1.tgz"; - sha512 = "ymxlM2FEayLIQ+WaMR9ud188Jq0rS7omQgoywhCMhFRGyOqnZlLxGtCnZ20P0/1wtb11q5y6/UzpGiMfCu2OQg=="; + url = "https://registry.npmjs.org/@parcel/graph/-/graph-3.0.2.tgz"; + sha512 = "cPxCN3+QF+5l4BJ0wnLeb3DPJarWQoD3W984CfuEYy/8Zgo2oayd31soZzkevyTYtp7H4tJKo+I79i2TJdNq5Q=="; }; }; - "@parcel/logger-2.10.1" = { + "@parcel/logger-2.10.2" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.10.1.tgz"; - sha512 = "o9Qi2HB/7T3hqCI2+nUYaHPk8fGNMxdUADh13iOycmGf3gKrno/t67P9dECnD9M5+YZK52R/8MRS0/SPaERC6g=="; + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.10.2.tgz"; + sha512 = "5lufBuBnXDs3hjAaptmeEAxpH0eHe0+2hJvlVv5lE/RwHR7vDjh+FDwzPfCLWNM3TQhPQdZPdHcDsuA539GHcw=="; }; }; - "@parcel/markdown-ansi-2.10.1" = { + "@parcel/markdown-ansi-2.10.2" = { name = "_at_parcel_slash_markdown-ansi"; packageName = "@parcel/markdown-ansi"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.10.1.tgz"; - sha512 = "UYdrZWlUy3w5hr+k0KToshGZONWP1M9+ld4i2vl12/v32FNX20zc15BnnKqheY7X/ZuLdqlVyMR7P+Q5Z7RMwQ=="; + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.10.2.tgz"; + sha512 = "uZrysHjJ+0vbQNK2bhKy8yoVso8KnoW6O/SW8MiGQ4lpDJdqHShkW08wZUKr4sjl7h/WVFdNsDdgvi2/ANwoRQ=="; }; }; - "@parcel/namer-default-2.10.1" = { + "@parcel/namer-default-2.10.2" = { name = "_at_parcel_slash_namer-default"; packageName = "@parcel/namer-default"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.10.1.tgz"; - sha512 = "sYQswJ6ySFSld29EOYRj2hxhxj4qgnApUY44+0woWMvhkFdu/N+hbeZzS/d2owC/sfeE0lwiaLpcQEkhBsEqHw=="; + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.10.2.tgz"; + sha512 = "wjn3MCus0w9IOjCtQsp5fgb8hgITyxMr0OPF9cBVAhVJI1X9vvd4RurHuLJ3MjvlCqrP1en09yg3ME7VO1kPuA=="; }; }; - "@parcel/node-resolver-core-3.1.1" = { + "@parcel/node-resolver-core-3.1.2" = { name = "_at_parcel_slash_node-resolver-core"; packageName = "@parcel/node-resolver-core"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-3.1.1.tgz"; - sha512 = "LliCQ024WYGcmFt9zVvpzeHuMTvqywtDV7/HOtp2OS3up2pt7ryQwA/5OyrEYgeo+4pUHxlPDi9z1fm0AUCWQA=="; + url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-3.1.2.tgz"; + sha512 = "xvIBgYBRQGmCkfwK/yxVSDtPEvWDVH9poQcGpKHT1jqstYju5crXro0acni5nYF0hWZu7Kttrp9G9fXJQWBksw=="; }; }; - "@parcel/optimizer-css-2.10.1" = { + "@parcel/optimizer-css-2.10.2" = { name = "_at_parcel_slash_optimizer-css"; packageName = "@parcel/optimizer-css"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.10.1.tgz"; - sha512 = "/oGD+w/2elpwtowVKVetq/X9ief+x8WODuq3pnoNkAbCLiE/6CXXmJwly2BzugpTmJB2L6YqSblMXonMuki/GQ=="; + url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.10.2.tgz"; + sha512 = "05H/Ng90TErSFZkNaUwi7gNCf2gLWi3/w07oIzHu1wjRjjKjZidqaQqZtHTEYoO9ffmhK14Xwh9q4IpOTa0sbQ=="; }; }; - "@parcel/optimizer-htmlnano-2.10.1" = { + "@parcel/optimizer-htmlnano-2.10.2" = { name = "_at_parcel_slash_optimizer-htmlnano"; packageName = "@parcel/optimizer-htmlnano"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.10.1.tgz"; - sha512 = "o9Dj1Bv8ffGoHvxwADjcGKbCrRT9Fb9VrSJYx8+t0yY1FWeKdfu7rquy+Ca/2JfbprNCyBeeR6cfFX7yxHqCqw=="; + url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.10.2.tgz"; + sha512 = "9Sg2xLsfX7CPLd1AO3uVa/Kh9EROKVNHMnmNxlzmO2+LEOU/M1OHalvt4bhC7I+cNFPLN5BePdBv3QMYpO0yyA=="; }; }; - "@parcel/optimizer-image-2.10.1" = { + "@parcel/optimizer-image-2.10.2" = { name = "_at_parcel_slash_optimizer-image"; packageName = "@parcel/optimizer-image"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.10.1.tgz"; - sha512 = "5NA1GBRGvJpmbK+Oz0zHjM/t5oD3xFyrgWcRvV+3r9Kkp7SZmW3TLxHv4Z6hs0u7UqKOWsXESYzBEe30op3Dkw=="; + url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.10.2.tgz"; + sha512 = "X8q7mvWJEIXsEMYHYKbwIRUJvI0W41YWCEW7Ohmn0SSi+KuiO8BW5JEPKs7HboO9bX+i6Yxa/T1h9HgRXhdUug=="; }; }; - "@parcel/optimizer-svgo-2.10.1" = { + "@parcel/optimizer-svgo-2.10.2" = { name = "_at_parcel_slash_optimizer-svgo"; packageName = "@parcel/optimizer-svgo"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.10.1.tgz"; - sha512 = "ftgc0fIkrIlhOGDpDNg4C96gqceUPieMbhbjnwahDk4/hPlWkrE58wZWBpjpYxkRuqAPQ7ysUDMMlFRpvuOr1Q=="; + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.10.2.tgz"; + sha512 = "Ws+xd6nbetMCZHmRj54tIF8wYuu/JwkEvn5BotLE69l3naf2ELtsQ+PHg9G5jUa+PnSNMHhykIhBOqjxhTeq/w=="; }; }; - "@parcel/optimizer-swc-2.10.1" = { + "@parcel/optimizer-swc-2.10.2" = { name = "_at_parcel_slash_optimizer-swc"; packageName = "@parcel/optimizer-swc"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-swc/-/optimizer-swc-2.10.1.tgz"; - sha512 = "NMHvZ3zdk/uVeW8eiDIRlLdooUo27SO7LipyK7b5+Dpyn0Sxx5L9zgoQSlfvbmkgoAyj4Te3Usu8sDqUH+gpow=="; + url = "https://registry.npmjs.org/@parcel/optimizer-swc/-/optimizer-swc-2.10.2.tgz"; + sha512 = "/4yMgMgLvF4yCHh0QnZlTUTpKobuFK/lNhB1i5yrtiipRaYcS+OgtakB83grfK+x1KwTbYjzXZBILwqu6GKJDQ=="; }; }; - "@parcel/package-manager-2.10.1" = { + "@parcel/package-manager-2.10.2" = { name = "_at_parcel_slash_package-manager"; packageName = "@parcel/package-manager"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.10.1.tgz"; - sha512 = "Zv7gO/XEDya+D5lrlyQtn99BuUko45WxNBcnBQ4eGSpVoyOP/KnlAMYmk1DPPsXZEnnWeOnDC+R5DP0x9jJR2Q=="; + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.10.2.tgz"; + sha512 = "c91YYsIxjX3YhMvtPT7v2MpDOn/Qyw13bi1+0Ftd2JNjUZPlm8+xKizlmgvdi75dgs7dGIUVpvrGLU9LoKthCA=="; }; }; - "@parcel/packager-css-2.10.1" = { + "@parcel/packager-css-2.10.2" = { name = "_at_parcel_slash_packager-css"; packageName = "@parcel/packager-css"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.10.1.tgz"; - sha512 = "s9N56NRmNIhE92oif7pQ/Mu91QUF60JKai4TJYPbPUV4TKFncRlTT4VsxjtolJuOtVW2J+8XijDcVkbofJBT7A=="; + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.10.2.tgz"; + sha512 = "+X4dV7mBdOhXSHeg5gAkk0Qju6A1oezYIancqDC17zoFzbHUfD13nHNDOXrEfMNFVWy93lB8vLJwchH54MDMwQ=="; }; }; - "@parcel/packager-html-2.10.1" = { + "@parcel/packager-html-2.10.2" = { name = "_at_parcel_slash_packager-html"; packageName = "@parcel/packager-html"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.10.1.tgz"; - sha512 = "k/KLm7z+DaHIaSq4o9gYLiW3FnO2Q0FEXqyLpnzNdfm4FrMYyc4PzXmRiqwW5j2R4ZrPfT6/xc3ZYOSIoBcNBQ=="; + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.10.2.tgz"; + sha512 = "GonfLzuzEkelJde89sq9P9LowLJrFNkuEt33nRokc1Q5TPNOWfTYb6difjuVIMr/j0c4nWlOzUrkGJsyo++F7w=="; }; }; - "@parcel/packager-js-2.10.1" = { + "@parcel/packager-js-2.10.2" = { name = "_at_parcel_slash_packager-js"; packageName = "@parcel/packager-js"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.10.1.tgz"; - sha512 = "uBHlv/rCNzIDAwisCgkY+ZFJ5zm/CcJLvelauszQdUZr1962mRKxObBhc7t8UecIzRksGQHVBFlBcHlxPDzzHA=="; + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.10.2.tgz"; + sha512 = "SgKJqIvMt+UJM0x3F21yBVsgdHbTnOnBrNJ7VoY3nujQX5fa+pxTf0emWuX1vSUDbBaJOmO/pC9rKwWP5enqfQ=="; }; }; - "@parcel/packager-raw-2.10.1" = { + "@parcel/packager-raw-2.10.2" = { name = "_at_parcel_slash_packager-raw"; packageName = "@parcel/packager-raw"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.10.1.tgz"; - sha512 = "ViPPF1Ra8FFax5p/R3zEXi+zIfB9eBRwrN42jS6zsXzXMvvIvxvpGcNbmhMU76yM/rngdKSaOGHWCZWXORHsUg=="; + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.10.2.tgz"; + sha512 = "+/O2DeMIB9d+1+zCPOkaf2aTl2rN5TFod/UcMzG/HGFlDVqhkV9xgfwV4rV+Vso5TlyHA4p53BFgvGWQBQJAQw=="; }; }; - "@parcel/packager-svg-2.10.1" = { + "@parcel/packager-svg-2.10.2" = { name = "_at_parcel_slash_packager-svg"; packageName = "@parcel/packager-svg"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.10.1.tgz"; - sha512 = "g17Q4miXc0rudUi3BnSkqtQjknh16M1V++AU4YXAdAqVu5/PeA6T01MXK8c60nfa0HBysFjhML/s7nYV+cWOIg=="; + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.10.2.tgz"; + sha512 = "eQx3VJpuuDcen+DcLxlPn95txlnbpEH8TES+Ezym/LFyD8oQQfok/VFHy/iGoG4r1CtH0/c7lFUJE8+LZdwYmQ=="; }; }; - "@parcel/packager-wasm-2.10.1" = { + "@parcel/packager-wasm-2.10.2" = { name = "_at_parcel_slash_packager-wasm"; packageName = "@parcel/packager-wasm"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-wasm/-/packager-wasm-2.10.1.tgz"; - sha512 = "iYo0vKFqi73QcMDCeKJGZdyWrA0dI1llNW/YHnOTMz5kwQQ5IQ9bA/O1qqVS/QZVIgONhI/qLYxBDdkCjlgZ3A=="; + url = "https://registry.npmjs.org/@parcel/packager-wasm/-/packager-wasm-2.10.2.tgz"; + sha512 = "Y/UyyOePb3WmWy2WtmXn4QLLrb7wjWL/ZhVgvhFiQft4lCbdGBGz1BiKEzhFkkN2IGdX06XZolmKCQieAM6zlQ=="; }; }; - "@parcel/plugin-2.10.1" = { + "@parcel/plugin-2.10.2" = { name = "_at_parcel_slash_plugin"; packageName = "@parcel/plugin"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.10.1.tgz"; - sha512 = "fhsWI5dzsmkQ2ye6jArDMiObw4yBkp3UoqAYCG/pGSsGXDpn8N0tOknRfycH509CGvw6ooGg6LORhFgak4cjDw=="; + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.10.2.tgz"; + sha512 = "1u+GJhuqqlYjMAQLBbMExfFCbsbtuSAm6wXmMmTse5cBpFqxgsMumMeztAhcTy0oMnMhbZg2AKZV0XVSMrIgng=="; }; }; - "@parcel/profiler-2.10.1" = { + "@parcel/profiler-2.10.2" = { name = "_at_parcel_slash_profiler"; packageName = "@parcel/profiler"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/profiler/-/profiler-2.10.1.tgz"; - sha512 = "3jE+v2T9hAV+eeEI09dtN1J4j7fi4x4wTr1vQomUy3ipcxMchHH7su5Ru/qw6sNeOStKsZemHXAoisQs+Urkiw=="; + url = "https://registry.npmjs.org/@parcel/profiler/-/profiler-2.10.2.tgz"; + sha512 = "YQugGhf12u83O0RJLWbhkPV772nePPxNZjvFJmV++7buPUpgJW2m1lVOrut/s/8ZZIPqcxJe8dyxSSOtvdG7OQ=="; }; }; - "@parcel/reporter-cli-2.10.1" = { + "@parcel/reporter-cli-2.10.2" = { name = "_at_parcel_slash_reporter-cli"; packageName = "@parcel/reporter-cli"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.10.1.tgz"; - sha512 = "CfDHX9Sf41in/KAkOF2n/KJ234LMKtx0OIm00eycMB41I8GO14o5w7vDQTEgWHDpRfEj3Q7fA9xdkB/yuV6waw=="; + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.10.2.tgz"; + sha512 = "6/cLuiGfMh1ny8ULNOXJkugIvJRVo4tV4XA3vJXH96SYqFSfiWxtHqb6MAVndBy8MezEAv0EsLqc7yR7ygdZJw=="; }; }; - "@parcel/reporter-dev-server-2.10.1" = { + "@parcel/reporter-dev-server-2.10.2" = { name = "_at_parcel_slash_reporter-dev-server"; packageName = "@parcel/reporter-dev-server"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.10.1.tgz"; - sha512 = "nLv+584zWPIDMAGiMtMW2wuys9Y5PYnwSg6C1xGHwzPT9yImTy8NMOXp9LX83lUjjqPJBJnkOZeDXdlwW2Z9dQ=="; + url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.10.2.tgz"; + sha512 = "mLEcZFPpw0ixlvbT846NwmPEVv1ej7H5dwCQ3r1Ca1nQjyXkmQMM06rdb5M+/gk12WVEDOuienWqBL44Xsz3NA=="; }; }; - "@parcel/reporter-tracer-2.10.1" = { + "@parcel/reporter-tracer-2.10.2" = { name = "_at_parcel_slash_reporter-tracer"; packageName = "@parcel/reporter-tracer"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-tracer/-/reporter-tracer-2.10.1.tgz"; - sha512 = "7WircrCzQQcwT5ZQjCZEmSGC6n2Jwoi8Ti4stYh3Vmp6RNHTYv/EaLooIT0oEDtPUX9NM2EI7iRjdtMiYbRgQQ=="; + url = "https://registry.npmjs.org/@parcel/reporter-tracer/-/reporter-tracer-2.10.2.tgz"; + sha512 = "oreu3vIdN5u9ONSNhqypcK3nR91NoreR4B4vwD/1Rqod1ud2Vb9awJZv7QIrkdnEMmGcr5DQ/R872s7XYWeZnA=="; }; }; - "@parcel/resolver-default-2.10.1" = { + "@parcel/resolver-default-2.10.2" = { name = "_at_parcel_slash_resolver-default"; packageName = "@parcel/resolver-default"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.10.1.tgz"; - sha512 = "X8yIodBVibZQh6WXLpBqIJVpRlmXTQ7248pSNZkCs9J/UbhtQzxqz6oq5agY7nOCkxv5Wa2rF+P/PR6Qs2WCKw=="; + url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.10.2.tgz"; + sha512 = "ENEq8f4wRQlU7p3tCelXWK6xIsL+57q9hQ+b4eRJOEctjfN1/BguxZDh+P+fIlJ1lkqiX4UB/PUkK97uSI5XTQ=="; }; }; - "@parcel/runtime-browser-hmr-2.10.1" = { + "@parcel/runtime-browser-hmr-2.10.2" = { name = "_at_parcel_slash_runtime-browser-hmr"; packageName = "@parcel/runtime-browser-hmr"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.10.1.tgz"; - sha512 = "g5cHzrEBOy9nqB76USBZe9pkKDAa8l5l1zaQ/N78ANPXnV4XtTCzSjJTvMfSfKX9ZG/pdRm3QtbBfMWy3h3iXw=="; + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.10.2.tgz"; + sha512 = "ABlCzDYI16lAZLTTL2g3JZasU/dWuSzRGK5paC6JhIJJwQwPeTwu4PaUoEPKeyk0iE9PzVuXjkBbGuSLXQFmmA=="; }; }; - "@parcel/runtime-js-2.10.1" = { + "@parcel/runtime-js-2.10.2" = { name = "_at_parcel_slash_runtime-js"; packageName = "@parcel/runtime-js"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.10.1.tgz"; - sha512 = "wSu5o6ABO3XTwAHoLbrxXDSWN8aykb2iaCULwjBjzYd2zATTdtMRo3Tnl8N9+PwOXLBgDS0qvRpqMOLxNNDeuQ=="; + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.10.2.tgz"; + sha512 = "a6TaMVg1Xgy+WJJ0a3sC/Taw5hkN4hmLnz00jg7G6LwoGbBpvjJn8pm4eovkMFJz13RCjmS9q0K+qZnvXh1WYA=="; }; }; - "@parcel/runtime-react-refresh-2.10.1" = { + "@parcel/runtime-react-refresh-2.10.2" = { name = "_at_parcel_slash_runtime-react-refresh"; packageName = "@parcel/runtime-react-refresh"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.10.1.tgz"; - sha512 = "SH2cz2ELCOzUg/mTXs4xGUxUUZLshstLhgn1N/+cuCUQYhdulVSj+TLxX0c0zdpbpEytDhdOIGDYpXHWJYuQmA=="; + url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.10.2.tgz"; + sha512 = "9xW3g4FH9iizHWscHD2yEWJOCfYkIYMbWsZoj0EOMILqrRd1OZxHH8FbLYBQKT6swRbZI2mM19veVVBBfxco/Q=="; }; }; - "@parcel/runtime-service-worker-2.10.1" = { + "@parcel/runtime-service-worker-2.10.2" = { name = "_at_parcel_slash_runtime-service-worker"; packageName = "@parcel/runtime-service-worker"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.10.1.tgz"; - sha512 = "5Vrso+8YQk+2ZnmsoWktfdKeRc3YBFxb755jYLOoIXg0OfIAM24tJHX+bH0GmHwGMXG6a3nvMOVC4i0LApBemQ=="; + url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.10.2.tgz"; + sha512 = "XY1GrY4r+zu0b/pZiTflZHdk9+I3XoxpExgPcZzep5hnq2UdyXbS4yDhmen7pTcqay5U9NmRw/62YrKL+yPang=="; }; }; - "@parcel/rust-2.10.1" = { + "@parcel/rust-2.10.2" = { name = "_at_parcel_slash_rust"; packageName = "@parcel/rust"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/rust/-/rust-2.10.1.tgz"; - sha512 = "HBW4QmuzFIb42p9e1MDsr7KnNs1sPIAiml0Zd8GPd0t+bNDR+3YwvFUVEINR7VhQzh3zv+nshL0MFwWVUO/tZw=="; + url = "https://registry.npmjs.org/@parcel/rust/-/rust-2.10.2.tgz"; + sha512 = "v/Cyf3iXlzSc6vgvPiEZzqdKAZ1jJ/aZX7y1YSupDh3RoqJI2bZ93kAOyEi+S7P3kshJkQM0px3YveJFOAMUOA=="; }; }; "@parcel/source-map-2.1.1" = { @@ -8293,121 +8329,121 @@ let sha512 = "Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew=="; }; }; - "@parcel/transformer-babel-2.10.1" = { + "@parcel/transformer-babel-2.10.2" = { name = "_at_parcel_slash_transformer-babel"; packageName = "@parcel/transformer-babel"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.10.1.tgz"; - sha512 = "dwJcdrWB+DeZ3XXirUAtnoFUTAWF5bj774eyonEmcb3Yx3QrtncRf5YnSfP3QXnT+rHQ67fQIdHrb/xw3ndPNQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.10.2.tgz"; + sha512 = "lmuksSzEBdPL1nVTznsQi5hQ+4mJ7GP+jvOv/Tvx3MjnzIu1G6Fs5MvNpAwBRXmG/F1+0aw/Wa8J38HYfN05dA=="; }; }; - "@parcel/transformer-css-2.10.1" = { + "@parcel/transformer-css-2.10.2" = { name = "_at_parcel_slash_transformer-css"; packageName = "@parcel/transformer-css"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.10.1.tgz"; - sha512 = "MWrLEd7GAoHhiAiP5pTy8MfTte3TT/oPAPwEFIULojK4wYryL96LFVn0ETHpYejueXLHO4WExjSEWXs7vTwIyA=="; + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.10.2.tgz"; + sha512 = "WxKe1YherQrX0vEfxAsBALEIsztGStmfXF0GAMeynE4q/w1iHQdTzu29tqLrJY7x532Ric8TxnwO8zR0r89DJg=="; }; }; - "@parcel/transformer-html-2.10.1" = { + "@parcel/transformer-html-2.10.2" = { name = "_at_parcel_slash_transformer-html"; packageName = "@parcel/transformer-html"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.10.1.tgz"; - sha512 = "dYgMmOI4hTBOlKkQTXnlZs831hJJ8HYUWkCWthuK5nHxhDjZUUeQgWk2K7af69zkkE5rXv6LWcMXjZGD7Z4D8w=="; + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.10.2.tgz"; + sha512 = "Zkg1HHdYp14ecdtNF+s4d/e1lr8/PAQgBTYhyEVLVC1N7uivjjZ9XClxZlHuZImbQvX3q3PgZS+PocIizhY4rQ=="; }; }; - "@parcel/transformer-image-2.10.1" = { + "@parcel/transformer-image-2.10.2" = { name = "_at_parcel_slash_transformer-image"; packageName = "@parcel/transformer-image"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.10.1.tgz"; - sha512 = "Eiba9tqtu0QBNSCYZuOveAewNxNlAUqb3M/EHUrYfB5oMCQxRDKpApsUxZwk97qctfdfN8b6paUS5IMLn0Plbw=="; + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.10.2.tgz"; + sha512 = "sR2kTsPykYRujKR7ISn0d6Fhem1pMQoqm0cFTrtC9Te5pfIjZ72NfM9clP7jPK660Gd2DYudhUa48y+qKBfCAw=="; }; }; - "@parcel/transformer-js-2.10.1" = { + "@parcel/transformer-js-2.10.2" = { name = "_at_parcel_slash_transformer-js"; packageName = "@parcel/transformer-js"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.10.1.tgz"; - sha512 = "Ybc2r6UxRvX0GUSyJLJOC88iaQw2sI8/mVBgAHsuwDRQzuQtE/nccQq+FpTSwsHR9XXzdoKXqb8Vg5dfHiXmlQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.10.2.tgz"; + sha512 = "qcVLyikhSVf3oHhzReECkKdPU5uHVH4L0TC5O9ahlsq2IUTqR8Swq+9wUgUN0S2aYFTWreH05bQwBCNrLzF/eQ=="; }; }; - "@parcel/transformer-json-2.10.1" = { + "@parcel/transformer-json-2.10.2" = { name = "_at_parcel_slash_transformer-json"; packageName = "@parcel/transformer-json"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.10.1.tgz"; - sha512 = "yK06/v9NfqeePAEkU+BcXPibAjJljazg3CnJALsQGE8bkm6LnG+cfYNw2URj2AgCl5zQgGn72SlUP1WdDK8PHw=="; + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.10.2.tgz"; + sha512 = "iVgwuaLNqH3jgoBzMds63zd9FULvYb/s/5Hq9JZJ6pCZrOQoPruurgAW8A/t2IE4CSFkDDNoFvRpjsq1WBsSvA=="; }; }; - "@parcel/transformer-postcss-2.10.1" = { + "@parcel/transformer-postcss-2.10.2" = { name = "_at_parcel_slash_transformer-postcss"; packageName = "@parcel/transformer-postcss"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.10.1.tgz"; - sha512 = "kvSeNDWsrRW/8o9ASPWkoHwQjF/tGlDMuvwYgv32hblvtz978zOTeLuZh8cbnrFLas8ejOekJ6EW9mz+4pTtWw=="; + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.10.2.tgz"; + sha512 = "2/ehCZgj5TOmsAIeGiLwrm6gO/M+X4fZ/O71MhpmXd8zr08j25T0VdSdw5UyopsBvtPYM7DI/FJCviZc7AigCg=="; }; }; - "@parcel/transformer-posthtml-2.10.1" = { + "@parcel/transformer-posthtml-2.10.2" = { name = "_at_parcel_slash_transformer-posthtml"; packageName = "@parcel/transformer-posthtml"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.10.1.tgz"; - sha512 = "CN1zlxAGjzJj24d57xebjLl6J4n+6blZ+kSSJd3QqmSyp4VVqpn1shmI5OMMtpsOMmlnGy3IcI0xs6yw6nqRxA=="; + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.10.2.tgz"; + sha512 = "0jvqqXfrLqPYBD62aWIMldDnZ9hO/esX6TGKNhAO+85ljeaS2+QZ5XLLb8uPJq8UXB4olhsoEGyGtJSByigndg=="; }; }; - "@parcel/transformer-raw-2.10.1" = { + "@parcel/transformer-raw-2.10.2" = { name = "_at_parcel_slash_transformer-raw"; packageName = "@parcel/transformer-raw"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.10.1.tgz"; - sha512 = "w+CH/zXDJaz1jKK31M+4ZGPzOyTKAgBVIelJs2j75jw41qFRn/tb9HqKNhPEEXhPhIs2L13D9O0/h1X/tmVK3w=="; + url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.10.2.tgz"; + sha512 = "h6SoIZ3u+Lq8z8SEEAVsHg4IQbUtkBWCln5SG4qfjGiclUDDA2hcG7grsP06Wb6/U7oEc8n0ksTtaG4dekYIxw=="; }; }; - "@parcel/transformer-react-refresh-wrap-2.10.1" = { + "@parcel/transformer-react-refresh-wrap-2.10.2" = { name = "_at_parcel_slash_transformer-react-refresh-wrap"; packageName = "@parcel/transformer-react-refresh-wrap"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.10.1.tgz"; - sha512 = "ni7uyUsqPgwCohSqyF6AUmHbICrPUNhkREaTl5HFzTHS8CblEyVWUnY5X4UaT5BAlhQ3noo8/s9mGISi8sTIuQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.10.2.tgz"; + sha512 = "1jpzaEbKwJnDUmF8Kgf3/XvT9BnUWIQ7FWkg5EL5kEx6tq2KLKdzD17nFigNj8fr2V+faX0Qa63h+e3OOpnMAA=="; }; }; - "@parcel/transformer-svg-2.10.1" = { + "@parcel/transformer-svg-2.10.2" = { name = "_at_parcel_slash_transformer-svg"; packageName = "@parcel/transformer-svg"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.10.1.tgz"; - sha512 = "6h0ABUiLWiDKLrTMvN2oHPGPYGQb8poe68eErPdtVxyw88P3AQKJOl/HHxHMXclRukV9Qc+N/izQf7jv9j+Ehw=="; + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.10.2.tgz"; + sha512 = "SsCjiM9LZwGne3LUn+GuwhyqklAnr7CER6D0ozdpw+tPOeODsXZXNSktvtpE1Qbia61c/zdlU0yOEuhkeXz29w=="; }; }; - "@parcel/types-2.10.1" = { + "@parcel/types-2.10.2" = { name = "_at_parcel_slash_types"; packageName = "@parcel/types"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/types/-/types-2.10.1.tgz"; - sha512 = "aoVVCL9AJ2wPIZujvAA4prof0RVg5cHZKAx2CrBVFk6RyEwonSGKh0XCqWzqy7Ufuu+M5lmvshJPHGCrMfKLWQ=="; + url = "https://registry.npmjs.org/@parcel/types/-/types-2.10.2.tgz"; + sha512 = "fwHJu03ROcc4/Kr/00VfOQUD6aV+6FBLN5bDW1+Xblgrpkb1MSUGTWRuz0YH5X6xhkVigC1llCIR2uHSwA+YBg=="; }; }; - "@parcel/utils-2.10.1" = { + "@parcel/utils-2.10.2" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.10.1.tgz"; - sha512 = "Nh3TFaMa8lyjplT8acWVrIUytQGqMLT75Xp711yhs2hB5xHeRdpckLRadk+V5Nyz5g6dyzD2fad6ZpQFp89B+w=="; + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.10.2.tgz"; + sha512 = "XLUhTh0UkPB5n8r7agX9iIz9f+3JsBIVsmqltsJYX7n/GAa6EQtqrIYyZu8cEFeZlZw3zaf7wTmf9xJppdlj7Q=="; }; }; "@parcel/watcher-2.0.4" = { @@ -8536,13 +8572,13 @@ let sha512 = "dLx+0XRdMnVI62kU3wbXvbIRhLck4aE28bIGKbRGS7BJNt54IIj9+c/Dkqb+7DJEbHUZAX1bwaoM8PqVlHJmCA=="; }; }; - "@parcel/workers-2.10.1" = { + "@parcel/workers-2.10.2" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.10.1.tgz"; - sha512 = "1Z/X53gUQlkx0soLiEgk6Ydi0tFVQOwv0V4KJGg6Rzjcsmjn8ViV8s79Tw0mauCu2KiMJx5ZP0rn6rlFVmbtSQ=="; + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.10.2.tgz"; + sha512 = "LvifdeORXKGGyhwOwnYxn1AsJ5u6Ihk2RJUxsVA4WYEjz2PSsmLAUDdp48ovssSMnTb9P2g4RrbEG1mJjYtBGA=="; }; }; "@peculiar/asn1-schema-2.3.8" = { @@ -8860,13 +8896,13 @@ let sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; - "@putdotio/api-client-8.38.0" = { + "@putdotio/api-client-8.39.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.38.0"; + version = "8.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.38.0.tgz"; - sha512 = "Uqb1t8hLGaoPSEtGnRdQCJMYqnPnrcI31pmO5FWTP4+5pKP6CTarg47J3WqT+XIbqhXrh08X0LMt/jsBg5l8QA=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.39.0.tgz"; + sha512 = "xQJ+tuKmTo/gy+WFat86Avhqy8mlIZF2ZpbzBQc8173LTvRcrf9E7B8dKqz/P0pjLn+kM/IkiKwmudV9Q8NXdw=="; }; }; "@react-native/normalize-color-2.1.0" = { @@ -9112,22 +9148,22 @@ let sha512 = "tdOjdErme+/YOu4gPed3sFS72GhtWCgNV9oDsHDnoLY5oDfwjKUc9Z+JOZZ37uAxcm/OCahDHfuu2ugqrfWAVQ=="; }; }; - "@rushstack/package-deps-hash-4.1.9" = { + "@rushstack/package-deps-hash-4.1.11" = { name = "_at_rushstack_slash_package-deps-hash"; packageName = "@rushstack/package-deps-hash"; - version = "4.1.9"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.1.9.tgz"; - sha512 = "KOG+zOlPf3waRz9ANT2GQ5pbZTYt32JrdYGHuP1u/arFMroGSAtTKHREEFy00/VL+tFv8/R4vmO8Qsuy4P0n4w=="; + url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.1.11.tgz"; + sha512 = "6gpZ7Zn9u4F3CiOwqhQbBKPq06iX7yUt3ooeqIKMfBZ92DKBZOTGDN6ImC4Kev/yUoL5HLVX5+a6xWHW+ptCvg=="; }; }; - "@rushstack/package-extractor-0.6.10" = { + "@rushstack/package-extractor-0.6.12" = { name = "_at_rushstack_slash_package-extractor"; packageName = "@rushstack/package-extractor"; - version = "0.6.10"; + version = "0.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.6.10.tgz"; - sha512 = "oF+GKXAu4AQ+g2aBdP72k2z/U8TBNGUQVWF8zLuV8YSrvPN9p74I7FMg8bsnQDmT3RNt4UzEM8fbPcIUpHXDdg=="; + url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.6.12.tgz"; + sha512 = "i+TbTu2QXZ96A0QiuCDPmTX7Cwjs250XPVrDS3QhmQTOd1EBatkwd4dzlRJyfZdhiKGuDY2kN7khPiVIOOg6zg=="; }; }; "@rushstack/rig-package-0.5.1" = { @@ -9139,67 +9175,67 @@ let sha512 = "pXRYSe29TjRw7rqxD4WS3HN/sRSbfr+tJs4a9uuaSIBAITbUggygdhuG0VrO0EO+QqH91GhYMN4S6KRtOEmGVA=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.109.2" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.110.1" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.109.2"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.109.2.tgz"; - sha512 = "py+vDuY6GPw9fCX8mgAubLLxyapBE80mVTeVk4/WHBE6+sdoeu3/wSk0LgY7SpgG70j9OVOmWM1zy2y0oPg6Fg=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.110.1.tgz"; + sha512 = "r9ZbIHIRlyWc6DkGIshtNthRAH0XIs7Z9O3eQWdGTGry0LZSjeiZGO+YJXKIxhoGUoqSJ5qr12b+lnWprZjeCg=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.109.2" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.110.1" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.109.2"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.109.2.tgz"; - sha512 = "BQqbbqVZDv6CSEOeHJPTX48uixRUwVEnZ5fhpuQul84o5vcxH1xE3G69aydvEaQbVv78cDWDJuPSMrtCifuK9A=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.110.1.tgz"; + sha512 = "uJkWYUyQjb3Lot9GLj0oJtRiLw+obkcZocvNSTnjKoTZVPT9XNJJzUleldUjBtS9zKqC+XMYRxFRWLfLOikBOQ=="; }; }; - "@rushstack/rush-http-build-cache-plugin-5.109.2" = { + "@rushstack/rush-http-build-cache-plugin-5.110.1" = { name = "_at_rushstack_slash_rush-http-build-cache-plugin"; packageName = "@rushstack/rush-http-build-cache-plugin"; - version = "5.109.2"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.109.2.tgz"; - sha512 = "6LNBqlfm9fmY/5ygyRnxOXcNNxHUqN2p/HpVflVMXzgvKLMgBHwzTgi3VUyZtX3lQGiuH2JRKEtuZQLvJa8J5g=="; + url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.110.1.tgz"; + sha512 = "rYOrKAJi55OrvKNE3xcwAgq3KRnV95DNubkfHT2TuRV4FajkDyhLnB41U6PNlnxv1ax7gYohy/Wb8L/XidxAxA=="; }; }; - "@rushstack/rush-sdk-5.109.2" = { + "@rushstack/rush-sdk-5.110.1" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.109.2"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.109.2.tgz"; - sha512 = "aMTvZDIC43+2Wfzw72L6ybSAAql0C8Fq/qi9jCnY3jJ0RVHeNzOy7I8x7bQOxt0dXKt7mNKKDERkCWfT8Ek88w=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.110.1.tgz"; + sha512 = "Yp/70meJCicmblyf8XFogF7NYzAM6DpZCPJNuExs33E5X5JiUIxEcupFMEw1huVdGtm+7nDc1ylVl3bwUH4IQg=="; }; }; - "@rushstack/stream-collator-4.1.10" = { + "@rushstack/stream-collator-4.1.12" = { name = "_at_rushstack_slash_stream-collator"; packageName = "@rushstack/stream-collator"; - version = "4.1.10"; + version = "4.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.1.10.tgz"; - sha512 = "b7AXOBoUKgCCdWvooImm9tPDHYvCqvrymuslppzIdqZ5Tbj1c+Tfr0KYD47sdciEAiNo9GpwmdUR7tGJ5n4UVQ=="; + url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.1.12.tgz"; + sha512 = "03rYjs73hAk13Az9GEutmy5hPRT7zrKuMeOC0U0XVW2pvPfQAbh3mu81qLL0lzieM5bsEafJk+SRtEb7LP0BWg=="; }; }; - "@rushstack/terminal-0.7.9" = { + "@rushstack/terminal-0.7.11" = { name = "_at_rushstack_slash_terminal"; packageName = "@rushstack/terminal"; - version = "0.7.9"; + version = "0.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.7.9.tgz"; - sha512 = "ypDvpgAklc4m1ONamk1WpERmMyPJUkxSOG7YJyolMUz9gbsMxaEEhc4l7Qc1ZIZZTh2HfhX+yb0dETSJG/r+bg=="; + url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.7.11.tgz"; + sha512 = "91M8zjwsrwkLAck2xGXn4tUUu2kZPfDZb3shQoZ3VBkgvOPCopPSDKeuHN2NCN9pRm6BRcbMjj75a4RBtaZKPQ=="; }; }; - "@rushstack/ts-command-line-4.16.1" = { + "@rushstack/ts-command-line-4.17.1" = { name = "_at_rushstack_slash_ts-command-line"; packageName = "@rushstack/ts-command-line"; - version = "4.16.1"; + version = "4.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.16.1.tgz"; - sha512 = "+OCsD553GYVLEmz12yiFjMOzuPeCiZ3f8wTiFHL30ZVXexTyPmgjwXEhg2K2P0a2lVf+8YBy7WtPoflB2Fp8/A=="; + url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.17.1.tgz"; + sha512 = "2jweO1O57BYP5qdBGl6apJLB+aRIn5ccIRTPDyULh0KMwVzFqWtw6IZWt1qtUoZD/pD2RNkIOosH6Cq45rIYeg=="; }; }; "@samverschueren/stream-to-observable-0.3.1" = { @@ -9211,13 +9247,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-16.2.8" = { + "@schematics/angular-16.2.9" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "16.2.8"; + version = "16.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.8.tgz"; - sha512 = "yxfxJ2IMRIt+dQcqyJR30qd/osb5NwRsi9US3gFIHP1jfjOAs1Nk8ENNd5ycYV+yykCa78KWhmbOw4G1zpR56Q=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.9.tgz"; + sha512 = "uiU2YbZRVHgk1N1DDsek/5CKhfpZ8myJYNJk8eHV5LswnXOP3aqvH23VhneaAgOYwK5fISC7eMG0pLVKMvFfZQ=="; }; }; "@scure/base-1.1.3" = { @@ -9274,49 +9310,49 @@ let sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; }; }; - "@sentry-internal/tracing-7.75.1" = { + "@sentry-internal/tracing-7.77.0" = { name = "_at_sentry-internal_slash_tracing"; packageName = "@sentry-internal/tracing"; - version = "7.75.1"; + version = "7.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.75.1.tgz"; - sha512 = "nynV+7iVcF8k3CqhvI2K7iA8h4ovJhgYHKnXR8RDDevQOqNG2AEX9+hjCj9fZM4MhKHYFqf1od2oO9lTr38kwg=="; + url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.77.0.tgz"; + sha512 = "8HRF1rdqWwtINqGEdx8Iqs9UOP/n8E0vXUu3Nmbqj4p5sQPA7vvCfq+4Y4rTqZFc7sNdFpDsRION5iQEh8zfZw=="; }; }; - "@sentry/core-7.75.1" = { + "@sentry/core-7.77.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.75.1"; + version = "7.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.75.1.tgz"; - sha512 = "Kw4KyKBxbxbh8OKO0S11Tm0gWP+6AaXXYrsq3hp8H338l/wOmIzyckmCbUrc/XJeoRqaFLJbdcCrcUEDZUvsVQ=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.77.0.tgz"; + sha512 = "Tj8oTYFZ/ZD+xW8IGIsU6gcFXD/gfE+FUxUaeSosd9KHwBQNOLhZSsYo/tTVf/rnQI/dQnsd4onPZLiL+27aTg=="; }; }; - "@sentry/node-7.75.1" = { + "@sentry/node-7.77.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.75.1"; + version = "7.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.75.1.tgz"; - sha512 = "E174NbP3j7OIqQQYPtpMGz1FfL/KE5PeGnhoACyMIk0D5MGB7Ia7Y9+nYfHB7+EOJPV2Ob6BYlhemX/MxPrYWg=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.77.0.tgz"; + sha512 = "Ob5tgaJOj0OYMwnocc6G/CDLWC7hXfVvKX/ofkF98+BbN/tQa5poL+OwgFn9BA8ud8xKzyGPxGU6LdZ8Oh3z/g=="; }; }; - "@sentry/types-7.75.1" = { + "@sentry/types-7.77.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.75.1"; + version = "7.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.75.1.tgz"; - sha512 = "km+ygqgMDaFfTrbQwdhrptFqx0Oq15jZABqIoIpbaOCkCAMm+tyCqrFS8dTfaq5wpCktqWOy2qU/DOpppO99Cg=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.77.0.tgz"; + sha512 = "nfb00XRJVi0QpDHg+JkqrmEBHsqBnxJu191Ded+Cs1OJ5oPXEW6F59LVcBScGvMqe+WEk1a73eH8XezwfgrTsA=="; }; }; - "@sentry/utils-7.75.1" = { + "@sentry/utils-7.77.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.75.1"; + version = "7.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.75.1.tgz"; - sha512 = "QzW2eRjY20epD//9/tQ0FTNwdAL6XZi+LyJNUQIeK3NMnc5NgHrgpxId87gmFq8cNx47utH1Blub8RuMbKqiwQ=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.77.0.tgz"; + sha512 = "NmM2kDOqVchrey3N5WSzdQoCsyDkQkiRxExPaNI2oKQ/jMWHs9yt0tSy7otPBcXs0AP59ihl75Bvm1tDRcsp5g=="; }; }; "@serialport/binding-mock-10.2.2" = { @@ -9499,22 +9535,22 @@ let sha512 = "7eDbqKv/OBd11jjdZjUwFGN8sHWkeUqLeHXHQxQ1azja2IM7WIH+z/aLgzR6LhB3/MINNwtjesDpjGqTMj2JKQ=="; }; }; - "@shopify/cli-kit-3.50.0" = { + "@shopify/cli-kit-3.50.1" = { name = "_at_shopify_slash_cli-kit"; packageName = "@shopify/cli-kit"; - version = "3.50.0"; + version = "3.50.1"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.50.0.tgz"; - sha512 = "MTtEZjP0UqiapO9QLX4+wS8H0oePdSC6GYRPCWICQfbIT1HRbfhkIqk2L1WixNP+Dc2TS4IAYU9ChfZhJpqUVg=="; + url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.50.1.tgz"; + sha512 = "pi8khn358ntuBEUq+XEVp90fMI12ehNx6U+NVyqwOzEAwktmNxJmiG4aXf1oIyjOnitZ0JGIaS6swjDO1IWQjw=="; }; }; - "@shopify/plugin-did-you-mean-3.50.0" = { + "@shopify/plugin-did-you-mean-3.50.1" = { name = "_at_shopify_slash_plugin-did-you-mean"; packageName = "@shopify/plugin-did-you-mean"; - version = "3.50.0"; + version = "3.50.1"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.50.0.tgz"; - sha512 = "viIAmL76RL1vtTvQ5+hrTVko/lYIdCF6/JUExjDEv8NFMEv3gYrhIOB0mJNOGMEsXUHKyapXmc4d25dpI1otPg=="; + url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.50.1.tgz"; + sha512 = "F8Bs4xtYJp2z1BJgu0KDAp//Uw+ZtTOfDltwedtTWqrZlZl5bHk82fYmWicCxVxTmI53A4+qmuredngXgC/iqA=="; }; }; "@sideway/address-4.1.4" = { @@ -10039,6 +10075,15 @@ let sha512 = "cUEsttVZ79B7Al2rWK2FW03HBpD9LyuqFtm+1qFty5u9sHSdesr215gS2Ln53fTopNiPgeXpdoM3IgjvIO0rJw=="; }; }; + "@smithy/util-endpoints-1.0.2" = { + name = "_at_smithy_slash_util-endpoints"; + packageName = "@smithy/util-endpoints"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.0.2.tgz"; + sha512 = "QEdq+sP68IJHAMVB2ugKVVZEWeKQtZLuf+akHzc8eTVElsZ2ZdVLWC6Cp+uKjJ/t4yOj1qu6ZzyxJQEQ8jdEjg=="; + }; + }; "@smithy/util-hex-encoding-2.0.0" = { name = "_at_smithy_slash_util-hex-encoding"; packageName = "@smithy/util-hex-encoding"; @@ -10741,6 +10786,15 @@ let sha512 = "vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA=="; }; }; + "@tsconfig/strictest-2.0.2" = { + name = "_at_tsconfig_slash_strictest"; + packageName = "@tsconfig/strictest"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/strictest/-/strictest-2.0.2.tgz"; + sha512 = "jt4jIsWKvUvuY6adJnQJlb/UR7DdjC8CjHI/OaSQruj2yX9/K6+KOvDt/vD6udqos/FUk5Op66CvYT7TBLYO5Q=="; + }; + }; "@tufjs/canonical-json-1.0.0" = { name = "_at_tufjs_slash_canonical-json"; packageName = "@tufjs/canonical-json"; @@ -10822,13 +10876,13 @@ let sha512 = "z5fVgG6QAUY9ecy4zTsrhNEFaCGIU9qgfvFSGTbxVACaUMK1fJICZWE/JreBvZGc4BNgafnFkCWMDBeCebpeKg=="; }; }; - "@types/bn.js-5.1.3" = { + "@types/bn.js-5.1.4" = { name = "_at_types_slash_bn.js"; packageName = "@types/bn.js"; - version = "5.1.3"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.3.tgz"; - sha512 = "wT1B4iIO82ecXkdN6waCK8Ou7E71WU+mP1osDA5Q8c6Ur+ozU2vIKUIhSpUr6uE5L2YHocKS1Z2jG2fBC1YVeg=="; + url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.4.tgz"; + sha512 = "ZtBd9L8hVtoBpPMSWfbwjC4dhQtJdlPS+e1A0Rydb7vg7bDcUwiRklPx24sMYtXcmAMST/k0Wze7JLbNU/5SkA=="; }; }; "@types/body-parser-1.19.2" = { @@ -11029,13 +11083,13 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/estree-1.0.3" = { + "@types/estree-1.0.4" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.3.tgz"; - sha512 = "CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.4.tgz"; + sha512 = "2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw=="; }; }; "@types/estree-jsx-1.0.2" = { @@ -11461,13 +11515,13 @@ let sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; }; }; - "@types/node-16.18.59" = { + "@types/node-16.18.60" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.59"; + version = "16.18.60"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.59.tgz"; - sha512 = "PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.60.tgz"; + sha512 = "ZUGPWx5vKfN+G2/yN7pcSNLkIkXEvlwNaJEd4e0ppX7W2S8XAkdc/37hM4OUNJB9sa0p12AOvGvxL4JCPiz9DA=="; }; }; "@types/node-16.9.1" = { @@ -11488,13 +11542,13 @@ let sha512 = "YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw=="; }; }; - "@types/node-18.18.7" = { + "@types/node-18.18.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.18.7"; + version = "18.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.18.7.tgz"; - sha512 = "bw+lEsxis6eqJYW8Ql6+yTqkE6RuFtsQPSe5JxXbqYRFQEER5aJA9a5UH9igqDWm3X4iLHIKOHlnAXLM4mi7uQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.18.8.tgz"; + sha512 = "OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ=="; }; }; "@types/node-20.5.9" = { @@ -11506,13 +11560,13 @@ let sha512 = "PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ=="; }; }; - "@types/node-20.8.9" = { + "@types/node-20.8.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.8.9"; + version = "20.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.8.9.tgz"; - sha512 = "UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz"; + sha512 = "TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w=="; }; }; "@types/node-6.14.13" = { @@ -11524,15 +11578,6 @@ let sha512 = "J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw=="; }; }; - "@types/node-9.6.61" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "9.6.61"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.61.tgz"; - sha512 = "/aKAdg5c8n468cYLy2eQrcR5k6chlbNwZNGUj3TboyPa2hcO2QAJcfymlqPzMiRj8B6nYKXjzQz36minFE0RwQ=="; - }; - }; "@types/node-fetch-2.6.2" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; @@ -11542,13 +11587,22 @@ let sha512 = "DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A=="; }; }; - "@types/node-fetch-2.6.7" = { + "@types/node-fetch-2.6.8" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.6.7"; + version = "2.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.7.tgz"; - sha512 = "lX17GZVpJ/fuCjguZ5b3TjEbSENxmEk1B2z02yoXSK9WMEWRivhdSY73wWMn6bpcCDAOh6qAdktpKHIlkDk2lg=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.8.tgz"; + sha512 = "nnH5lV9QCMPsbEVdTb5Y+F3GQxLSw1xQgIydrb2gSfEavRPs50FnMr+KUaa+LoPSqibm2N+ZZxH7lavZlAT4GA=="; + }; + }; + "@types/node-forge-1.3.8" = { + name = "_at_types_slash_node-forge"; + packageName = "@types/node-forge"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.8.tgz"; + sha512 = "vGXshY9vim9CJjrpcS5raqSjEfKlJcWy2HNdgUasR66fAnVEYarrf1ULV4nfvpC1nZq/moA9qyqBcu83x+Jlrg=="; }; }; "@types/normalize-package-data-2.4.3" = { @@ -11614,13 +11668,13 @@ let sha512 = "+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA=="; }; }; - "@types/react-18.2.32" = { + "@types/react-18.2.34" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.2.32"; + version = "18.2.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.2.32.tgz"; - sha512 = "F0FVIZQ1x5Gxy/VYJb7XcWvCcHR28Sjwt1dXLspdIatfPq1MVACfnBDwKe6ANLxQ64riIJooXClpUR6oxTiepg=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.2.34.tgz"; + sha512 = "U6eW/alrRk37FU/MS2RYMjx0Va2JGIVXELTODaTIYgvWGCV4Y4TfTUzG8DdmpDNIT0Xpj/R7GfyHOJJrDttcvg=="; }; }; "@types/react-dom-18.2.14" = { @@ -11830,13 +11884,13 @@ let sha512 = "qnYBwfN7O/+i6E1Kr8JaCKsrCLpRCiQ1XxkSxNIYuJ/5Aagt0+HlMX78DJMUrNzDULMz0eu2gcprlxJaDtACOw=="; }; }; - "@types/vscode-1.66.0" = { + "@types/vscode-1.75.1" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.66.0"; + version = "1.75.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.66.0.tgz"; - sha512 = "ZfJck4M7nrGasfs4A4YbUoxis3Vu24cETw3DERsNYtDZmYSYtk6ljKexKFKhImO/ZmY6ZMsmegu2FPkXoUFImA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.75.1.tgz"; + sha512 = "emg7wdsTFzdi+elvoyoA+Q8keEautdQHyY5LNmHVM4PTpY8JgOTVADrGVyXGepJ6dVW2OS5/xnLUWh+nZxvdiA=="; }; }; "@types/websocket-1.0.2" = { @@ -11911,15 +11965,6 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-5.62.0" = { - name = "_at_typescript-eslint_slash_eslint-plugin"; - packageName = "@typescript-eslint/eslint-plugin"; - version = "5.62.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz"; - sha512 = "TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag=="; - }; - }; "@typescript-eslint/eslint-plugin-6.0.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; @@ -11929,13 +11974,13 @@ let sha512 = "xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A=="; }; }; - "@typescript-eslint/parser-5.62.0" = { - name = "_at_typescript-eslint_slash_parser"; - packageName = "@typescript-eslint/parser"; - version = "5.62.0"; + "@typescript-eslint/eslint-plugin-6.9.1" = { + name = "_at_typescript-eslint_slash_eslint-plugin"; + packageName = "@typescript-eslint/eslint-plugin"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz"; - sha512 = "VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz"; + sha512 = "w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg=="; }; }; "@typescript-eslint/parser-6.0.0" = { @@ -11947,13 +11992,13 @@ let sha512 = "TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg=="; }; }; - "@typescript-eslint/scope-manager-5.62.0" = { - name = "_at_typescript-eslint_slash_scope-manager"; - packageName = "@typescript-eslint/scope-manager"; - version = "5.62.0"; + "@typescript-eslint/parser-6.9.1" = { + name = "_at_typescript-eslint_slash_parser"; + packageName = "@typescript-eslint/parser"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz"; - sha512 = "VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.1.tgz"; + sha512 = "C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg=="; }; }; "@typescript-eslint/scope-manager-6.0.0" = { @@ -11965,13 +12010,13 @@ let sha512 = "o4q0KHlgCZTqjuaZ25nw5W57NeykZT9LiMEG4do/ovwvOcPnDO1BI5BQdCsUkjxFyrCL0cSzLjvIMfR9uo7cWg=="; }; }; - "@typescript-eslint/type-utils-5.62.0" = { - name = "_at_typescript-eslint_slash_type-utils"; - packageName = "@typescript-eslint/type-utils"; - version = "5.62.0"; + "@typescript-eslint/scope-manager-6.9.1" = { + name = "_at_typescript-eslint_slash_scope-manager"; + packageName = "@typescript-eslint/scope-manager"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz"; - sha512 = "xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz"; + sha512 = "38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg=="; }; }; "@typescript-eslint/type-utils-6.0.0" = { @@ -11983,13 +12028,13 @@ let sha512 = "ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ=="; }; }; - "@typescript-eslint/types-5.62.0" = { - name = "_at_typescript-eslint_slash_types"; - packageName = "@typescript-eslint/types"; - version = "5.62.0"; + "@typescript-eslint/type-utils-6.9.1" = { + name = "_at_typescript-eslint_slash_type-utils"; + packageName = "@typescript-eslint/type-utils"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz"; - sha512 = "87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz"; + sha512 = "eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg=="; }; }; "@typescript-eslint/types-6.0.0" = { @@ -12001,13 +12046,13 @@ let sha512 = "Zk9KDggyZM6tj0AJWYYKgF0yQyrcnievdhG0g5FqyU3Y2DRxJn4yWY21sJC0QKBckbsdKKjYDV2yVrrEvuTgxg=="; }; }; - "@typescript-eslint/typescript-estree-5.62.0" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "5.62.0"; + "@typescript-eslint/types-6.9.1" = { + name = "_at_typescript-eslint_slash_types"; + packageName = "@typescript-eslint/types"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz"; - sha512 = "CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz"; + sha512 = "BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ=="; }; }; "@typescript-eslint/typescript-estree-6.0.0" = { @@ -12019,13 +12064,13 @@ let sha512 = "2zq4O7P6YCQADfmJ5OTDQTP3ktajnXIRrYAtHM9ofto/CJZV3QfJ89GEaM2BNGeSr1KgmBuLhEkz5FBkS2RQhQ=="; }; }; - "@typescript-eslint/utils-5.62.0" = { - name = "_at_typescript-eslint_slash_utils"; - packageName = "@typescript-eslint/utils"; - version = "5.62.0"; + "@typescript-eslint/typescript-estree-6.9.1" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz"; - sha512 = "n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz"; + sha512 = "U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw=="; }; }; "@typescript-eslint/utils-6.0.0" = { @@ -12037,13 +12082,13 @@ let sha512 = "SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ=="; }; }; - "@typescript-eslint/visitor-keys-5.62.0" = { - name = "_at_typescript-eslint_slash_visitor-keys"; - packageName = "@typescript-eslint/visitor-keys"; - version = "5.62.0"; + "@typescript-eslint/utils-6.9.1" = { + name = "_at_typescript-eslint_slash_utils"; + packageName = "@typescript-eslint/utils"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz"; - sha512 = "07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz"; + sha512 = "L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA=="; }; }; "@typescript-eslint/visitor-keys-6.0.0" = { @@ -12055,6 +12100,15 @@ let sha512 = "cvJ63l8c0yXdeT5POHpL0Q1cZoRcmRKFCtSjNGJxPkcP571EfZMcNbzWAc7oK3D1dRzm/V5EwtkANTZxqvuuUA=="; }; }; + "@typescript-eslint/visitor-keys-6.9.1" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "6.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz"; + sha512 = "MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw=="; + }; + }; "@ungap/structured-clone-1.2.0" = { name = "_at_ungap_slash_structured-clone"; packageName = "@ungap/structured-clone"; @@ -12334,22 +12388,22 @@ let sha512 = "NwqBBruD1DvVmFVyPinOuuMGqpSroVTnl1R1vOnhbKquButOj+0b2k43Gn1fz/Uqe9hijLCxMEtMIIcW38ny8w=="; }; }; - "@volar/kit-1.10.5" = { + "@volar/kit-1.10.10" = { name = "_at_volar_slash_kit"; packageName = "@volar/kit"; - version = "1.10.5"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/kit/-/kit-1.10.5.tgz"; - sha512 = "sK3w8bXBgqjUWfju8HYAiYwCp+sdm1TseF3ULjaqJoC8zWR0uU9hfBASfZDPFB2p6ealRFwkjWOp2kCnWaYxBA=="; + url = "https://registry.npmjs.org/@volar/kit/-/kit-1.10.10.tgz"; + sha512 = "V2SyUPCPUhueqH8j5t48LJ0QsjExGSXzTv/XOdkUHV7hJ/ekyRGFqKxcfBtMq/nK6Tgu2G1ba+6u0d7e6wKcQw=="; }; }; - "@volar/language-core-1.10.5" = { + "@volar/language-core-1.10.10" = { name = "_at_volar_slash_language-core"; packageName = "@volar/language-core"; - version = "1.10.5"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-core/-/language-core-1.10.5.tgz"; - sha512 = "xD71j4Ee0Ycq8WsiAE6H/aCThGdTobiZZeD+jFD+bvmbopa1Az296pqJysr3Ck8c7n5+GGF+xlKCS3WxRFYgSQ=="; + url = "https://registry.npmjs.org/@volar/language-core/-/language-core-1.10.10.tgz"; + sha512 = "nsV1o3AZ5n5jaEAObrS3MWLBWaGwUj/vAsc15FVNIv+DbpizQRISg9wzygsHBr56ELRH8r4K75vkYNMtsSNNWw=="; }; }; "@volar/language-core-1.4.1" = { @@ -12361,13 +12415,13 @@ let sha512 = "EIY+Swv+TjsWpxOxujjMf1ZXqOjg9MT2VMXZ+1dKva0wD8W0L6EtptFFcCJdBbcKmGMFkr57Qzz9VNMWhs3jXQ=="; }; }; - "@volar/language-server-1.10.5" = { + "@volar/language-server-1.10.10" = { name = "_at_volar_slash_language-server"; packageName = "@volar/language-server"; - version = "1.10.5"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-server/-/language-server-1.10.5.tgz"; - sha512 = "IEvLph46UzLHVnF+G70gLBO2WbTpnKZgJE0D3R5hCFGPKhZhzR2hViswKBctLnl0bbEz0Ko3lVAW/yMRrjoe2A=="; + url = "https://registry.npmjs.org/@volar/language-server/-/language-server-1.10.10.tgz"; + sha512 = "F2PRBU+CRjT7L9qe8bjof/uz/LbAXVmgwNU2gOSX2y1bUl3E8DHmD0dB6pwIVublvkx+Ivg/0r3Z6oyxfPPruQ=="; }; }; "@volar/language-server-1.4.1" = { @@ -12379,13 +12433,13 @@ let sha512 = "UxhiN205o8ZfTnMNhRPCtW+ncrBtqZMd+f08Xf99Je4WB+SYyv3VNnIZEQDXfaTXR6mLUgQ1mDwPsUOLKKGY8A=="; }; }; - "@volar/language-service-1.10.5" = { + "@volar/language-service-1.10.10" = { name = "_at_volar_slash_language-service"; packageName = "@volar/language-service"; - version = "1.10.5"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-service/-/language-service-1.10.5.tgz"; - sha512 = "HORaZ3x8hDGKO0KoezJ8CNjAdpXngocJAXOym3vJN0yPu5M+VjShG+M4lt+JP/zts0Ef02G7KY3gGbLltfhUYA=="; + url = "https://registry.npmjs.org/@volar/language-service/-/language-service-1.10.10.tgz"; + sha512 = "P4fiPWDI6fLGO6BghlksCVHs1nr9gvWAMDyma3Bca4aowxXusxjUVTsnJq0EVorIN5uIr1Xel4B/tNdXt/IKyw=="; }; }; "@volar/language-service-1.4.1" = { @@ -12397,13 +12451,13 @@ let sha512 = "F30uT+xk20ZYpxRwNW9xBEoErSqd9zNW7iuFwSIX9bYO/12RLjB2I+vgM/GdPZnzZ37imXa76ykwqTRXrafigQ=="; }; }; - "@volar/source-map-1.10.5" = { + "@volar/source-map-1.10.10" = { name = "_at_volar_slash_source-map"; packageName = "@volar/source-map"; - version = "1.10.5"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/source-map/-/source-map-1.10.5.tgz"; - sha512 = "s4kgo66SA1kMzYvF9HFE6Vc1rxtXLUmcLrT2WKnchPDvLne+97Kw+xoR2NxJFmsvHoL18vmu/YGXYcN+Q5re1g=="; + url = "https://registry.npmjs.org/@volar/source-map/-/source-map-1.10.10.tgz"; + sha512 = "GVKjLnifV4voJ9F0vhP56p4+F3WGf+gXlRtjFZsv6v3WxBTWU3ZVeaRaEHJmWrcv5LXmoYYpk/SC25BKemPRkg=="; }; }; "@volar/source-map-1.4.1" = { @@ -12415,13 +12469,13 @@ let sha512 = "bZ46ad72dsbzuOWPUtJjBXkzSQzzSejuR3CT81+GvTEI2E994D8JPXzM3tl98zyCNnjgs4OkRyliImL1dvJ5BA=="; }; }; - "@volar/typescript-1.10.5" = { + "@volar/typescript-1.10.10" = { name = "_at_volar_slash_typescript"; packageName = "@volar/typescript"; - version = "1.10.5"; + version = "1.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/typescript/-/typescript-1.10.5.tgz"; - sha512 = "kfDehpeLJku9i1BgsFOYIczPmFFH4herl+GZrLGdvX5urTqeCKsKYlF36iNmFaADzjMb9WlENcUZzPjK8MxNrQ=="; + url = "https://registry.npmjs.org/@volar/typescript/-/typescript-1.10.10.tgz"; + sha512 = "4a2r5bdUub2m+mYVnLu2wt59fuoYWe7nf0uXtGHU8QQ5LDNfzAR0wK7NgDiQ9rcl2WT3fxT2AA9AylAwFtj50A=="; }; }; "@volar/vue-language-core-1.6.5" = { @@ -12487,6 +12541,15 @@ let sha512 = "M31xGH0RgqNU6CZ4/9g39oUMJ99nLzfjA+4UbtIQ6TcXQ6+2qkjOOxedmPBDDCg26/3Al5ubjY80hIoaMwKYSw=="; }; }; + "@vscode/vsce-2.22.0" = { + name = "_at_vscode_slash_vsce"; + packageName = "@vscode/vsce"; + version = "2.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.22.0.tgz"; + sha512 = "8df4uJiM3C6GZ2Sx/KilSKVxsetrTBBIUb3c0W4B1EWHcddioVs5mkyDKtMNP0khP/xBILVSzlXxhV+nm2rC9A=="; + }; + }; "@vue/cli-shared-utils-5.0.8" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -13432,58 +13495,58 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-12.2.3" = { + "@zwave-js/cc-12.3.0" = { name = "_at_zwave-js_slash_cc"; packageName = "@zwave-js/cc"; - version = "12.2.3"; + version = "12.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-12.2.3.tgz"; - sha512 = "MT6jh/YYhzOjMOZyH32T1RHr7xlbJVRjdgvN3KVnKKFJNOq1glfZ3ocb23XXhwVz6/g6+zXgvWvqPvfwjyF/SA=="; + url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-12.3.0.tgz"; + sha512 = "oEajP6yigFlHtGmorlQQ6L5RacwZciDBFihjZJxvxbbzOcoKskaxdR62SR51nf6o7jeWMudSP1jra6dYz5Q18A=="; }; }; - "@zwave-js/config-12.2.3" = { + "@zwave-js/config-12.3.0" = { name = "_at_zwave-js_slash_config"; packageName = "@zwave-js/config"; - version = "12.2.3"; + version = "12.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-12.2.3.tgz"; - sha512 = "oZmWPfNTwd62qV39rPAys1gUzNkTkk7VR1A530N3Lk1/LNzCavFUadZV4wGJ16cw8as0zoE0cunR6JZH0b7uTQ=="; + url = "https://registry.npmjs.org/@zwave-js/config/-/config-12.3.0.tgz"; + sha512 = "idwjJrYFFaPZ70ZZV8kOQSee/dVQmz1qAKy53aS0bLrKihX/qr66hjApnyAR+fgqKBXsvaFk1QJm8dy+Q/g1WQ=="; }; }; - "@zwave-js/core-12.2.3" = { + "@zwave-js/core-12.3.0" = { name = "_at_zwave-js_slash_core"; packageName = "@zwave-js/core"; - version = "12.2.3"; + version = "12.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-12.2.3.tgz"; - sha512 = "U91p5g7empMIuBCs31HkrrCnOditPDEQCJ1f36PqMpkabHiFAstlCnIvdy4tZcXuUkb5sHxX732DH8InrA/+1g=="; + url = "https://registry.npmjs.org/@zwave-js/core/-/core-12.3.0.tgz"; + sha512 = "QHH5brGId+gr/bwrAkkjg4CGDRJb9PKCqy6jdLNxPhJdNSRaQ2DLzlWfKbfGnyYd39U6/b/JdGg9h+Gutb9s0w=="; }; }; - "@zwave-js/host-12.2.3" = { + "@zwave-js/host-12.3.0" = { name = "_at_zwave-js_slash_host"; packageName = "@zwave-js/host"; - version = "12.2.3"; + version = "12.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-12.2.3.tgz"; - sha512 = "Idi7M8Z4wFyR1RRVUN3Q32DovJtYA+OBwgRmobaA9MLrfh1bLeOMncxJ89AOqxXu2BYQEsG2yO+7F6h0vQeY0g=="; + url = "https://registry.npmjs.org/@zwave-js/host/-/host-12.3.0.tgz"; + sha512 = "2ngot/kI363S2iLglKCTqwHjhVeuX6nCjynuak1RZXSRO1oH0W8JxNfVL9WexadBj9ygrdHtRTIUY4e1csbcIw=="; }; }; - "@zwave-js/nvmedit-12.2.3" = { + "@zwave-js/nvmedit-12.3.0" = { name = "_at_zwave-js_slash_nvmedit"; packageName = "@zwave-js/nvmedit"; - version = "12.2.3"; + version = "12.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-12.2.3.tgz"; - sha512 = "A59EEw1n2UGaRmui0W27BCP1bxsS1Gw2u0UjcpycMt9D/oZ5I7n3F0zaL5MflMiy5uxYdbz3MuATM1uNkAKk0Q=="; + url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-12.3.0.tgz"; + sha512 = "eAPvpOSNS5wzS6Hs7+BOmDtAbIoozfOyB6/TOW9DtwEHdvKreR4x4D/tUVvxqnc7icCOcLo+iOM8jqR3VYXbMg=="; }; }; - "@zwave-js/serial-12.2.3" = { + "@zwave-js/serial-12.3.0" = { name = "_at_zwave-js_slash_serial"; packageName = "@zwave-js/serial"; - version = "12.2.3"; + version = "12.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-12.2.3.tgz"; - sha512 = "/CI9dL6qiF52Ym8rVP6BdZ+/VuDtfcXzvHSWxIwm00bWdQu73wBzvSWevaePZYjhPgq456JxvrC61hF3G8XvZg=="; + url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-12.3.0.tgz"; + sha512 = "mNjGI2BzDua+dL7T9nqxAqBqwL8cZvP5SJw0aZ4vPUERnSJGd230dbTSjvOA0VrO7DwU21UHcI86uMUD2yOgDQ=="; }; }; "@zwave-js/shared-12.2.3" = { @@ -13495,13 +13558,13 @@ let sha512 = "UwUas5IZxaPywaTY8lQNBE/e5aEWddgHQGJ3yn6Se0O717SeboIlw+Xu3befPBANadCk7EFGiN2SX/DaQCyggQ=="; }; }; - "@zwave-js/testing-12.2.3" = { + "@zwave-js/testing-12.3.0" = { name = "_at_zwave-js_slash_testing"; packageName = "@zwave-js/testing"; - version = "12.2.3"; + version = "12.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-12.2.3.tgz"; - sha512 = "b7nh3EF5WIF6o0sJyb4JsCm86zLzf4nxaziFxZPD/AyPZokQlLbKhuyeqnvtguNH8NS9J0dpMiLHJX66p7HQhA=="; + url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-12.3.0.tgz"; + sha512 = "mAyimQf+uuTj3CfciAGw+xBRz5WvbEAaUCATI0aHoSxd21pbYFcrspLpnotQK8rbAbUHTb+fGzHj4unFTVrkvw=="; }; }; "CSSselect-0.4.1" = { @@ -13684,13 +13747,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.10.0" = { + "acorn-8.11.2" = { name = "acorn"; packageName = "acorn"; - version = "8.10.0"; + version = "8.11.2"; 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.2.tgz"; + sha512 = "nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w=="; }; }; "acorn-8.8.2" = { @@ -13792,6 +13855,15 @@ let sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; }; + "acorn-walk-8.3.0" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.0.tgz"; + sha512 = "FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA=="; + }; + }; "add-stream-1.0.0" = { name = "add-stream"; packageName = "add-stream"; @@ -14062,13 +14134,13 @@ let sha512 = "GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg=="; }; }; - "all-package-names-2.0.770" = { + "all-package-names-2.0.771" = { name = "all-package-names"; packageName = "all-package-names"; - version = "2.0.770"; + version = "2.0.771"; src = fetchurl { - url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.770.tgz"; - sha512 = "yGp4ACgiXjUBRBATxzRxoqHCbJwHXtsX7MtjFy9MkzEXohaovEjcqFrvX7pLw5feIB4vvTn2hCWM4HNANzjw8g=="; + url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.771.tgz"; + sha512 = "rOeeaPYdzDezjpnh6K3ZxaReFsd+Ecflii66nAVcwD/72aU5lO6Bb4OIW8wVOOnUDvhloaqKf3Y1Tl0NqrnQAw=="; }; }; "amdefine-1.0.1" = { @@ -15628,13 +15700,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.18.2" = { + "aws-crt-1.18.3" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.18.2"; + version = "1.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.18.2.tgz"; - sha512 = "FO7H96Db4oiz7ZIJCVA8pcUTGN37BxJgdmIQivkP2WWkyqpsoTrstbcFewfD7atdg7w1RhXmST1bg/zQNzh8YA=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.18.3.tgz"; + sha512 = "SgY9bKtQQpuqWuXMdJS07lIr4JV80nFS4bpR9cW1TbfOhRLDBIHSHc/iat7T+6Co7+ukni1dhd5iZ0Uf24vqtQ=="; }; }; "aws-sdk-2.1340.0" = { @@ -15655,13 +15727,13 @@ let sha512 = "U7kAHRbvTy753IXKV8Oom/AqlqnsbXG+Kw5gRbKi6VcsZ3hR/EpNMzdRXTWO5U415bnLWGo8WAqIz67PIaaKsw=="; }; }; - "aws-sdk-2.1481.0" = { + "aws-sdk-2.1486.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1481.0"; + version = "2.1486.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1481.0.tgz"; - sha512 = "frg2IDi5Ozw6Vym0Y7WNyGUpgGalhmz41oAJVVvNl9AfKFLMw8AU8RfUvKt16snQ1yq847wuF14O73eFIKuIpw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1486.0.tgz"; + sha512 = "YVGhKGWP5mHWIla6/a7MXwHyKrjcy2xIo65Z6rCvG2uxVa3NxGz4Wo7yNRqA8QGCS6buYz9MmRJLv2KOtkb7JQ=="; }; }; "aws-sign2-0.7.0" = { @@ -15745,13 +15817,13 @@ let sha512 = "S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA=="; }; }; - "axios-1.5.1" = { + "axios-1.6.0" = { name = "axios"; packageName = "axios"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz"; - sha512 = "Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A=="; + url = "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz"; + sha512 = "EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg=="; }; }; "axobject-query-3.2.1" = { @@ -17572,6 +17644,15 @@ let sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; }; }; + "cacache-16.1.3" = { + name = "cacache"; + packageName = "cacache"; + version = "16.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz"; + sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ=="; + }; + }; "cacache-17.1.4" = { name = "cacache"; packageName = "cacache"; @@ -17581,6 +17662,15 @@ let sha512 = "/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A=="; }; }; + "cacache-18.0.0" = { + name = "cacache"; + packageName = "cacache"; + version = "18.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-18.0.0.tgz"; + sha512 = "I7mVOPl3PUCeRub1U8YoGz2Lqv9WOBpobZ8RyWFXmReuILz+3OAyTa5oH3QPdtKZD7N0Yk00aLfzn0qvp8dZ1w=="; + }; + }; "cache-base-1.0.1" = { name = "cache-base"; packageName = "cache-base"; @@ -17932,13 +18022,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001554" = { + "caniuse-lite-1.0.30001559" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001554"; + version = "1.0.30001559"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001554.tgz"; - sha512 = "A2E3U//MBwbJVzebddm1YfNp7Nud5Ip+IPn4BozBmn4KqVX7AvluoIDFWjsv5OkGnKUXQVmMSoMKLa3ScCblcQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz"; + sha512 = "cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA=="; }; }; "canvas-2.11.2" = { @@ -18067,22 +18157,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.67.3" = { + "cdk8s-2.67.6" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.67.3"; + version = "2.67.6"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.67.3.tgz"; - sha512 = "UgdJORDS9o+jBMGh4qa4sVlnNoJxjLiDemL0rJuilVYNh8CVAwXdFs9FK4quuxq/fCxx/WQdB5Zak+j2PjAyYA=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.67.6.tgz"; + sha512 = "GlIeZmXxnPRWNtxgMXhHOV/qPy5kyaxgA4uUpQTn9bVgBwwMnv9AmVeQKiLjRQ0Mq0DjVWHTVXnmP1mu3zjQ6Q=="; }; }; - "cdk8s-plus-25-2.22.44" = { + "cdk8s-plus-25-2.22.49" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.22.44"; + version = "2.22.49"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.44.tgz"; - sha512 = "82QAK0o28RzCQNaLzLdKlmx5yxBAigWJD0N6aKNRQi/co31gKvlZmxOxr3NME0znfytXOuKg+d40TM1DX1QPlg=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.49.tgz"; + sha512 = "qQTymImB/uu89WiipR1pMuGJP/CS1o8QHdye4abPYT085H6i9P1lzxvvWtXnjYUFScU63X79R5uh8xx2AzaO0A=="; }; }; "cdktf-0.19.0" = { @@ -20714,22 +20804,22 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.33.1" = { + "core-js-3.33.2" = { name = "core-js"; packageName = "core-js"; - version = "3.33.1"; + version = "3.33.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.33.1.tgz"; - sha512 = "qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.33.2.tgz"; + sha512 = "XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ=="; }; }; - "core-js-compat-3.33.1" = { + "core-js-compat-3.33.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.33.1"; + version = "3.33.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.1.tgz"; - sha512 = "6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.2.tgz"; + sha512 = "axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw=="; }; }; "core-util-is-1.0.2" = { @@ -20822,13 +20912,13 @@ let sha512 = "H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA=="; }; }; - "cosmiconfig-typescript-loader-4.4.0" = { + "cosmiconfig-typescript-loader-5.0.0" = { name = "cosmiconfig-typescript-loader"; packageName = "cosmiconfig-typescript-loader"; - version = "4.4.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.4.0.tgz"; - sha512 = "BabizFdC3wBHhbI4kJh0VkQP9GkBfoHPydD0COMce1nJ1kJAB3F2TmJ/I7diULBKtmEWSwEbuN/KDtgnmUUVmw=="; + url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-5.0.0.tgz"; + sha512 = "+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA=="; }; }; "cp-file-10.0.0" = { @@ -20912,13 +21002,13 @@ let sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; }; }; - "create-gatsby-3.12.2" = { + "create-gatsby-3.12.3" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "3.12.2"; + version = "3.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.12.2.tgz"; - sha512 = "4E0kR/56Bs/WlFONSuIu7AO841NZqMkZxnA4//gARyodieo/5zr6eG1I0V/1dy9lTLIJSQPTm97DysZB5ql1WA=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.12.3.tgz"; + sha512 = "N0K/Z/MD5LMRJcBy669WpSgrn+31zBV72Lv0RHolX0fXa77Yx58HsEiLWz83j/dtciGMQfEOEHFRetUqZhOggA=="; }; }; "create-graphback-1.0.1" = { @@ -20993,15 +21083,6 @@ let sha512 = "d6S6+ep7dJxsAG8OQQCdKuByI/S/AV64d9OF5mtmcykOyPu92cAkAnF3Tbc9s5oOaLQBYYQmTNvjqYRkPJ/u5Q=="; }; }; - "cross-env-7.0.3" = { - name = "cross-env"; - packageName = "cross-env"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz"; - sha512 = "+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw=="; - }; - }; "cross-fetch-3.0.6" = { name = "cross-fetch"; packageName = "cross-fetch"; @@ -21038,6 +21119,15 @@ let sha512 = "cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg=="; }; }; + "cross-inspect-1.0.0" = { + name = "cross-inspect"; + packageName = "cross-inspect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-inspect/-/cross-inspect-1.0.0.tgz"; + sha512 = "4PFfn4b5ZN6FMNGSZlyb7wUhuN8wvj8t/VQHZdM4JsDcruGJ8L2kf9zao98QIrBPFCpdk27qst/AGTl7pL3ypQ=="; + }; + }; "cross-spawn-5.1.0" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -24350,13 +24440,13 @@ let sha512 = "XofXdikjYI7MVBcnXeoOvRR+yFFFHOLs3J7PF5KYQweigtgLshcH4W660PsvHr4lYZ03JBpLyEcUB8DzHZ+BNw=="; }; }; - "electron-to-chromium-1.4.567" = { + "electron-to-chromium-1.4.574" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.567"; + version = "1.4.574"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.567.tgz"; - sha512 = "8KR114CAYQ4/r5EIEsOmOMqQ9j0MRbJZR3aXD/KFA8RuKzyoUB4XrUCg+l8RUGqTVQgKNIgTpjaG8YHRPAbX2w=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.574.tgz"; + sha512 = "bg1m8L0n02xRzx4LsTTMbBPiUd9yIR+74iPtS/Ao65CuXvhVZHP0ym1kSdDG3yHFDXqHQQBKujlN1AQ8qZnyFg=="; }; }; "elegant-spinner-1.0.1" = { @@ -24828,13 +24918,13 @@ let sha512 = "IsYv64dtlNXTm4huvCBpbXsdZQurYUju9WoYCkSj+SDYpO3v4/dq346QsCnNZ3JcnWw0G3E6+saVkVtmPw98Gg=="; }; }; - "envinfo-7.10.0" = { + "envinfo-7.11.0" = { name = "envinfo"; packageName = "envinfo"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz"; - sha512 = "ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw=="; + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.11.0.tgz"; + sha512 = "G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg=="; }; }; "envinfo-7.8.1" = { @@ -25719,13 +25809,13 @@ let sha512 = "oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g=="; }; }; - "eslint-plugin-react-refresh-0.4.3" = { + "eslint-plugin-react-refresh-0.4.4" = { name = "eslint-plugin-react-refresh"; packageName = "eslint-plugin-react-refresh"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.3.tgz"; - sha512 = "Hh0wv8bUNY877+sI0BlCUlsS0TYYQqvzEwJsJJPM2WF4RnTStSnSR3zdJYa2nPOJgg3UghXi54lVyMSmpCalzA=="; + url = "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.4.tgz"; + sha512 = "eD83+65e8YPVg6603Om2iCIwcQJf/y7++MWm4tACtEswFLYMwxwVWAfwN+e19f5Ad/FOyyNg9Dfi5lXhH3Y3rA=="; }; }; "eslint-plugin-unicorn-48.0.1" = { @@ -25746,13 +25836,13 @@ let sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw=="; }; }; - "eslint-plugin-vue-9.18.0" = { + "eslint-plugin-vue-9.18.1" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.18.0"; + version = "9.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.18.0.tgz"; - sha512 = "yUM8a2OD/7Qs0PiugkRaxgz5KBRvzMvWShity2UvVFAN0yk8029mGpTdg/TNARPiYzp335mEwDHwcAR8tQNe4g=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.18.1.tgz"; + sha512 = "7hZFlrEgg9NIzuVik2I9xSnJA5RsmOfueYgsUGUokEDLJ1LHtxO0Pl4duje1BriZ/jDWb+44tcIlC3yi0tdlZg=="; }; }; "eslint-rule-docs-1.1.235" = { @@ -27915,13 +28005,13 @@ let sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA=="; }; }; - "flow-parser-0.219.5" = { + "flow-parser-0.220.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.219.5"; + version = "0.220.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.219.5.tgz"; - sha512 = "lHx/cl2XjopBx/ma9RYhG7FGj2JLKacoBwtI3leOp8AwRDPGwu6bzJoaCMfIl/sq14KdtY5MGzd5q6nKfGzcuQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.220.0.tgz"; + sha512 = "Fks+nOCqhorp4NpAtAxf09UaR/9xDf3AnU1UkWczmpneoHh06Y3AoEA4tIe2HbYrOHT9JArUgDZpCFhP4clo1A=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -28644,22 +28734,22 @@ let sha512 = "R1fam6D4CyKQGNlvJne4dkNF+PvUUl7TAJInvTGa9fti9qAv95quQz29GXapA4d8Ec266mJJxFVh82M4GIIGDQ=="; }; }; - "gatsby-core-utils-4.12.0" = { + "gatsby-core-utils-4.12.1" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "4.12.0"; + version = "4.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.12.0.tgz"; - sha512 = "1vK0cmL8FNHAddQ5WZt0yTPdFSZuMPNUSsHckM+ZdVmRxyif3aZYSi7ofj6sJo/UvhKj7fBqJv/smZYpp2PRqg=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.12.1.tgz"; + sha512 = "YW7eCK2M6yGQerT5LkdOHLZTNYMsDvcgeDMRy0q66FWKj7twPZX428I6NaLCMeF5dYoj1HOOO0u96iNlW5jcKQ=="; }; }; - "gatsby-telemetry-4.12.0" = { + "gatsby-telemetry-4.12.1" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "4.12.0"; + version = "4.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.12.0.tgz"; - sha512 = "pgaGCzKPZKWvNrX/VC/nE1S9Z20fzg4aA4ETD6hlI7ztu+BSyQG+Oebly4SdFGlVSLeq3x3+gOe/LY9Fry7TrA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.12.1.tgz"; + sha512 = "MTHcKt5Cl68DveBpsduwfJdRjoXg48fcjITo1TspbxS2R0WnTZPRohGbA+JmQdY+O1eUSysdrONIjf6r86nhiA=="; }; }; "gauge-2.7.4" = { @@ -32650,22 +32740,13 @@ let sha512 = "/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A=="; }; }; - "is-accessor-descriptor-0.1.6" = { + "is-accessor-descriptor-1.0.1" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha512 = "e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="; - }; - }; - "is-accessor-descriptor-1.0.0" = { - 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-alphabetical-1.0.4" = { @@ -32884,22 +32965,13 @@ let sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; }; }; - "is-data-descriptor-0.1.4" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - 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" = { @@ -32929,22 +33001,22 @@ let sha512 = "AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A=="; }; }; - "is-descriptor-0.1.6" = { + "is-descriptor-0.1.7" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz"; + sha512 = "C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg=="; }; }; - "is-descriptor-1.0.2" = { + "is-descriptor-1.0.3" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz"; + sha512 = "JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw=="; }; }; "is-docker-2.2.1" = { @@ -34468,13 +34540,13 @@ let sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jiti-1.20.0" = { + "jiti-1.21.0" = { name = "jiti"; packageName = "jiti"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz"; - sha512 = "3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA=="; + url = "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz"; + sha512 = "gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q=="; }; }; "jju-1.4.0" = { @@ -34855,22 +34927,13 @@ let sha512 = "dJ2FbnUfX5Eg9BdZx6Cz2JhDsvzGi2DoQeomzdjO9ltvVUouAFPWkpcUtJdLXaNmHQtPM4/I+AzelUX7w2mWVw=="; }; }; - "jsii-5.1.12" = { - name = "jsii"; - packageName = "jsii"; - version = "5.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.1.12.tgz"; - sha512 = "iY3zLosUEKbeua6IAGJXjFxibiiI0xHFjyYPyewOc56MBRHC7nczWSVGRP+Jgwyo7HWXs4TvJKLG6w8zSuAZrg=="; - }; - }; - "jsii-5.2.20" = { + "jsii-5.2.23" = { name = "jsii"; packageName = "jsii"; - version = "5.2.20"; + version = "5.2.23"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.2.20.tgz"; - sha512 = "iXfSgEHGuE1OJBefZ7P3x+FwlEVaAV8M2blR6HWfg/IAmvBoCc1qbMPkQgUXRaXxH36HKR+BOFZ4n8QX0S2BXA=="; + url = "https://registry.npmjs.org/jsii/-/jsii-5.2.23.tgz"; + sha512 = "OrQU4r4187z93ORCgjtMYKTomygNmIE8zMFqGohBjD4sCLqgzSB70O2KBTas8Hplz5iZULdxP3+6a8P3kr1MnQ=="; }; }; "jsii-pacmak-1.91.0" = { @@ -34909,13 +34972,13 @@ let sha512 = "X98IBiNZSIkwmYfZ0de2b3dh7/BVBW//j8a/CVwm55J1YXYW9r6M/uIqRvqihD0GXgPVRCUjLpM/6BDluNSA8w=="; }; }; - "jsii-srcmak-0.1.951" = { + "jsii-srcmak-0.1.953" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.951"; + version = "0.1.953"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.951.tgz"; - sha512 = "zaKqrsR416yX+QhE1T4mkBWqPpsHQmBnBbsR0f5a32Uknr3+l4PCVtuV5/rgthAG6iE4Pa6c/jO0vcTzyzEY6A=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.953.tgz"; + sha512 = "HIJEsYUgwj+Xsg368PPJVAWVJB9m0YYRT1xbP4SexWc9OU8/pulMb8QPkPc7STe37qE/AreNzfj95JsmKdU0+A=="; }; }; "json-buffer-3.0.0" = { @@ -36043,24 +36106,6 @@ let sha512 = "IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow=="; }; }; - "lean-client-js-core-3.3.1" = { - name = "lean-client-js-core"; - packageName = "lean-client-js-core"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lean-client-js-core/-/lean-client-js-core-3.3.1.tgz"; - sha512 = "Br1BHuLgPISE7EnC8Mn5uKZC2LLPoWyC4d6vhB7eXhgBWX+EUU6YaYD7zBWscXTEP2i2EwsFbiYuJtd/8/pnpw=="; - }; - }; - "lean-client-js-node-3.3.1" = { - name = "lean-client-js-node"; - packageName = "lean-client-js-node"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lean-client-js-node/-/lean-client-js-node-3.3.1.tgz"; - sha512 = "AAZN7Kvwp2+UDGZPjSC3WEkursgPB/4WNrgFlG+9CaOcaIhWXg1XYax/JmIDTkZVRCi1YgKi785AAU2QIqHCOQ=="; - }; - }; "left-pad-1.3.0" = { name = "left-pad"; packageName = "left-pad"; @@ -38240,6 +38285,15 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; + "make-fetch-happen-10.2.1" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "10.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz"; + sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w=="; + }; + }; "make-fetch-happen-11.1.1" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -38249,6 +38303,15 @@ let sha512 = "rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w=="; }; }; + "make-fetch-happen-13.0.0" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz"; + sha512 = "7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A=="; + }; + }; "make-fetch-happen-9.1.0" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -39869,13 +39932,13 @@ let sha512 = "m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw=="; }; }; - "micromark-util-decode-numeric-character-reference-2.0.0" = { + "micromark-util-decode-numeric-character-reference-2.0.1" = { name = "micromark-util-decode-numeric-character-reference"; packageName = "micromark-util-decode-numeric-character-reference"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.0.tgz"; - sha512 = "pIgcsGxpHEtTG/rPJRz/HOLSqp5VTuIIjXlPI+6JSDlK2oljApusG6KzpS8AF0ENUMCHlC/IBb5B9xdFiVlm5Q=="; + url = "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.1.tgz"; + sha512 = "bmkNc7z8Wn6kgjZmVHOX3SowGmVdhYS7yBpMnuMnPzDq/6xwVA604DuOXMZTO1lvq01g+Adfa0pE2UKGlxL1XQ=="; }; }; "micromark-util-decode-string-1.1.0" = { @@ -40346,13 +40409,13 @@ let sha512 = "r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg=="; }; }; - "miniflare-3.20231016.0" = { + "miniflare-3.20231025.0" = { name = "miniflare"; packageName = "miniflare"; - version = "3.20231016.0"; + version = "3.20231025.0"; src = fetchurl { - url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20231016.0.tgz"; - sha512 = "AmlqI89zsnBJfC+nKKZdCB/fuu0q/br24Kqt9NZwcT6yJEpO5NytNKfjl6nJROHROwuJSRQR1T3yopCtG1/0DA=="; + url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20231025.0.tgz"; + sha512 = "pFcr2BRaGIQ26UfdDo8BMJ6kkd/Jo/FkQ/4K7UG/eORlDepsLrR/sTJddcSSIGl07MA+MGjhzopFTPpFskkS+g=="; }; }; "minilog-3.1.0" = { @@ -40598,6 +40661,15 @@ let sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; }; }; + "minipass-fetch-2.1.2" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz"; + sha512 = "LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA=="; + }; + }; "minipass-fetch-3.0.4" = { name = "minipass-fetch"; packageName = "minipass-fetch"; @@ -41940,13 +42012,13 @@ let sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; - "node-gyp-9.4.0" = { + "node-gyp-9.4.1" = { name = "node-gyp"; packageName = "node-gyp"; - version = "9.4.0"; + version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz"; - sha512 = "dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz"; + sha512 = "OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ=="; }; }; "node-gyp-build-4.6.0" = { @@ -43632,13 +43704,13 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ovsx-0.5.2" = { + "ovsx-0.8.3" = { name = "ovsx"; packageName = "ovsx"; - version = "0.5.2"; + version = "0.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/ovsx/-/ovsx-0.5.2.tgz"; - sha512 = "UbLultRCk46WddeA0Cly4hoRhzBJUiLgbIEViXlgOvV54LbsppClDkMLoCevUUBHoiNdMX2NuiSgURAEXgCZdw=="; + url = "https://registry.npmjs.org/ovsx/-/ovsx-0.8.3.tgz"; + sha512 = "LG7wTzy4eYV/KolFeO4AwWPzQSARvCONzd5oHQlNvYOlji2r/zjbdK8pyObZN84uZlk6rQBWrJrAdJfh/SX0Hg=="; }; }; "ow-1.1.1" = { @@ -44451,13 +44523,13 @@ let sha512 = "SA5aMiaIjXkAiBrW/yPgLgQAQg42f7K3ACO+2l/zOvtQBwX58DMUsFJXelW2fx3yMBmWOVkR6j1MGsdSbCA4UA=="; }; }; - "parse-json-7.1.0" = { + "parse-json-7.1.1" = { name = "parse-json"; packageName = "parse-json"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-7.1.0.tgz"; - sha512 = "ihtdrgbqdONYD156Ap6qTcaGcGdkdAxodO1wLqQ/j7HP1u2sFYppINiq4jyC8F+Nm+4fVufylCV00QmkTHkSUg=="; + url = "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz"; + sha512 = "SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw=="; }; }; "parse-json-object-1.1.0" = { @@ -46953,13 +47025,13 @@ let sha512 = "YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA=="; }; }; - "property-information-6.3.0" = { + "property-information-6.4.0" = { name = "property-information"; packageName = "property-information"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/property-information/-/property-information-6.3.0.tgz"; - sha512 = "gVNZ74nqhRMiIUYWGQdosYetaKc83x8oT41a0LlV3AAFCAZwCpg4vmGkq8t34+cUhp3cnM4XDiU/7xlgK7HGrg=="; + url = "https://registry.npmjs.org/property-information/-/property-information-6.4.0.tgz"; + sha512 = "9t5qARVofg2xQqKtytzt+lZ4d1Qvj8t5B8fEwXK6qOfgRLgH/b13QlgEyDh033NOS31nXeFbYv7CLUDG1CeifQ=="; }; }; "proto-list-1.2.4" = { @@ -47277,13 +47349,13 @@ let sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; }; - "punycode-2.3.0" = { + "punycode-2.3.1" = { name = "punycode"; packageName = "punycode"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; - sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"; + sha512 = "vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="; }; }; "pupa-2.1.1" = { @@ -47340,13 +47412,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.333" = { + "pyright-1.1.334" = { name = "pyright"; packageName = "pyright"; - version = "1.1.333"; + version = "1.1.334"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.333.tgz"; - sha512 = "oFHXvzvg2cU1enatWqI76+sjSi+McsUBIJ9aR5W6p4kU9Rrgu+MYfXX5aHEPaZE64Vz3sNbG7IelXuAVEkyk/A=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.334.tgz"; + sha512 = "EJoW78gXPeAWd0e86P8kSIbY1pO3JJxNYu2BRlv/ZflcMvCY+zpyamuQC5EcXxXtr1WzBdcQwfo/NIBqtQPEow=="; }; }; "q-1.5.1" = { @@ -49986,6 +50058,15 @@ let sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="; }; }; + "resolve.exports-2.0.2" = { + name = "resolve.exports"; + packageName = "resolve.exports"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz"; + sha512 = "X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg=="; + }; + }; "resp-modifier-6.0.2" = { name = "resp-modifier"; packageName = "resp-modifier"; @@ -50193,13 +50274,13 @@ let sha512 = "4LMcbvBonVhsufIwa7Po+HhK0rznNyvQxIG/14/wTm7W88eFQy1jU+T7i5afaWOQ53czEJlaI3ua9pzZtqXE0w=="; }; }; - "rfc4648-1.5.2" = { + "rfc4648-1.5.3" = { name = "rfc4648"; packageName = "rfc4648"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/rfc4648/-/rfc4648-1.5.2.tgz"; - sha512 = "tLOizhR6YGovrEBLatX1sdcuhoSCXddw3mqNVAcKxGJ+J0hFeJ+SjeWCv5UPA/WU3YzWPPuCVYgXBKZUPGpKtg=="; + url = "https://registry.npmjs.org/rfc4648/-/rfc4648-1.5.3.tgz"; + sha512 = "MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ=="; }; }; "rfdc-1.3.0" = { @@ -50733,13 +50814,13 @@ let sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg=="; }; }; - "sass-1.69.4" = { + "sass-1.69.5" = { name = "sass"; packageName = "sass"; - version = "1.69.4"; + version = "1.69.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.69.4.tgz"; - sha512 = "+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz"; + sha512 = "qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ=="; }; }; "sass-formatter-0.7.8" = { @@ -50913,13 +50994,13 @@ let sha512 = "mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="; }; }; - "selfsigned-2.1.1" = { + "selfsigned-2.4.1" = { name = "selfsigned"; packageName = "selfsigned"; - version = "2.1.1"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz"; - sha512 = "GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz"; + sha512 = "th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q=="; }; }; "semver-4.3.6" = { @@ -51147,13 +51228,13 @@ let sha512 = "eDqaz4MasTn6Mp3dagKzIbiNsJpgpueMEQqCJeN9F9XQRFLDGFJ0kX8R3uMp+mU7J58dWjr4q6eks/nUX/vnJQ=="; }; }; - "sentence-splitter-4.2.1" = { + "sentence-splitter-4.3.0" = { name = "sentence-splitter"; packageName = "sentence-splitter"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-4.2.1.tgz"; - sha512 = "zn7awgCg40lyb+fe6N/fRJS3r+Ag3SmrmiYHZZSM9oQ2HTnwSMooUgQXSMLeQdi5HWMYOnhrovE2JZ3pyGU0dg=="; + url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-4.3.0.tgz"; + sha512 = "srJOMqv7JeEmsbVa/N64ULey2N6/OuZzeKWn2Zrj0DiTBlU930JGr/rKKlKQRigzXtLMOtl32/Gm5G3HW8/ULA=="; }; }; "serialize-error-2.1.0" = { @@ -52596,13 +52677,13 @@ let sha512 = "eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="; }; }; - "spdx-license-list-6.7.0" = { + "spdx-license-list-6.8.0" = { name = "spdx-license-list"; packageName = "spdx-license-list"; - version = "6.7.0"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.7.0.tgz"; - sha512 = "NFqavuJxNsHdwSy/0PjmUpcc76XwlmHQRPjVVtE62qmSLhKJUnzSvJCkU9nrY6TsChfGU1xqGePriBkNtNRMiA=="; + url = "https://registry.npmjs.org/spdx-license-list/-/spdx-license-list-6.8.0.tgz"; + sha512 = "5UdM7r9yJ1EvsPQZWfa41AZjLQngl9iMMysm9XBW7Lqhq7aF8cllfqjS+rFCHB8FFMGSM0yFWue2LUV9mR0QzQ=="; }; }; "spdy-1.32.5" = { @@ -53343,13 +53424,13 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; - "streamx-2.15.1" = { + "streamx-2.15.2" = { name = "streamx"; packageName = "streamx"; - version = "2.15.1"; + version = "2.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz"; - sha512 = "fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.15.2.tgz"; + sha512 = "b62pAV/aeMjUoRN2C/9F0n+G8AfcJjNC0zw/ZmOHeFsIe4m4GzjVW9m6VHXVjk536NbdU9JRwKMJRfkc+zUFTg=="; }; }; "strict-uri-encode-1.1.0" = { @@ -54333,13 +54414,13 @@ let sha512 = "ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA=="; }; }; - "systeminformation-5.21.13" = { + "systeminformation-5.21.15" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.21.13"; + version = "5.21.15"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.13.tgz"; - sha512 = "sGgMhQxxjKHSIJtv7g5s19IRpfCgLG3tZqGbFcfGFyMm1hJ3BmzTfaq0yyOO2oLHlbkM49mgMjnPPB8g573LMA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.15.tgz"; + sha512 = "vMLwsGgJZW6GvoBXVWNZuRQG0MPxlfQnIIIY9ZxoogWftUpJ9C33qD+32e1meFlXuWpN0moNApPFLpbsSi4OaQ=="; }; }; "sywac-1.3.0" = { @@ -54721,13 +54802,13 @@ let sha512 = "flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg=="; }; }; - "terser-5.22.0" = { + "terser-5.24.0" = { name = "terser"; packageName = "terser"; - version = "5.22.0"; + version = "5.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.22.0.tgz"; - sha512 = "hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz"; + sha512 = "ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw=="; }; }; "terser-webpack-plugin-5.3.9" = { @@ -55873,15 +55954,6 @@ let sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; - "tsutils-3.21.0" = { - name = "tsutils"; - packageName = "tsutils"; - version = "3.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"; - sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; - }; - }; "tty-browserify-0.0.1" = { name = "tty-browserify"; packageName = "tty-browserify"; @@ -56341,15 +56413,6 @@ let sha512 = "cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw=="; }; }; - "typescript-5.1.6" = { - name = "typescript"; - packageName = "typescript"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz"; - sha512 = "zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA=="; - }; - }; "typescript-5.2.2" = { name = "typescript"; packageName = "typescript"; @@ -56359,13 +56422,13 @@ let sha512 = "mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w=="; }; }; - "typescript-5.3.0-dev.20231025" = { + "typescript-5.3.0-dev.20231101" = { name = "typescript"; packageName = "typescript"; - version = "5.3.0-dev.20231025"; + version = "5.3.0-dev.20231101"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.3.0-dev.20231025.tgz"; - sha512 = "DW0GNkWzKHnI9lcYCVIw5SO5nzlaZ9iHAdcN7zCxt/OJsKg7s33xRtEa5nmPTIC5qvKzLLZboWWBJ+KRD9cKFw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.3.0-dev.20231101.tgz"; + sha512 = "yt5zz7L+TBfzeJhMA/tAEO1YU8J2DWsFN3LbeMslNPXL3S0lR3yvePdl6fXCk7QFjnfaRtXH0noNdWg2imHWXg=="; }; }; "typescript-auto-import-cache-0.2.1" = { @@ -56431,13 +56494,13 @@ let sha512 = "RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ=="; }; }; - "ua-parser-js-1.0.36" = { + "ua-parser-js-1.0.37" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "1.0.36"; + version = "1.0.37"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.36.tgz"; - sha512 = "znuyCIXzl8ciS3+y3fHJI/2OhQIXbXw9MWC/o3qwyR+RGppjZHrM27CGFSKCJXi2Kctiz537iOu2KnXs1lMQhw=="; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz"; + sha512 = "bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ=="; }; }; "uc.micro-1.0.6" = { @@ -56683,13 +56746,13 @@ let sha512 = "1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg=="; }; }; - "undici-5.26.5" = { + "undici-5.27.0" = { name = "undici"; packageName = "undici"; - version = "5.26.5"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz"; - sha512 = "cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw=="; + url = "https://registry.npmjs.org/undici/-/undici-5.27.0.tgz"; + sha512 = "l3ydWhlhOJzMVOYkymLykcRRXqbUaQriERtR70B9LzNkZ4bX52Fc8wbTDneMiwo8T+AemZXvXaTx+9o5ROxrXg=="; }; }; "undici-types-5.26.5" = { @@ -56791,13 +56854,13 @@ let sha512 = "pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q=="; }; }; - "unified-11.0.3" = { + "unified-11.0.4" = { name = "unified"; packageName = "unified"; - version = "11.0.3"; + version = "11.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-11.0.3.tgz"; - sha512 = "jlCV402P+YDcFcB2VcN/n8JasOddqIiaxv118wNBoZXEhOn+lYG7BR4Bfg2BwxvlK58dwbuH2w7GX2esAjL6Mg=="; + url = "https://registry.npmjs.org/unified/-/unified-11.0.4.tgz"; + sha512 = "apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ=="; }; }; "unified-8.4.2" = { @@ -56944,6 +57007,15 @@ let sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; }; + "unique-filename-2.0.1" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz"; + sha512 = "ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A=="; + }; + }; "unique-filename-3.0.0" = { name = "unique-filename"; packageName = "unique-filename"; @@ -56962,6 +57034,15 @@ let sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; }; + "unique-slug-3.0.0" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz"; + sha512 = "8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w=="; + }; + }; "unique-slug-4.0.0" = { name = "unique-slug"; packageName = "unique-slug"; @@ -57403,13 +57484,13 @@ let sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="; }; }; - "universalify-2.0.0" = { + "universalify-2.0.1" = { name = "universalify"; packageName = "universalify"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz"; + sha512 = "gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="; }; }; "unix-crypt-td-js-1.1.4" = { @@ -58951,15 +59032,6 @@ let sha512 = "Lg/AcacxyBmVbZhHZwnwvt+MEn/5YlbLiJ7DJG6Dt3xiuQmpXwZmM+JE7/ZMvPt4gxW6AL9zHz21M6JSPCkJ+g=="; }; }; - "vsce-2.15.0" = { - name = "vsce"; - packageName = "vsce"; - version = "2.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-2.15.0.tgz"; - sha512 = "P8E9LAZvBCQnoGoizw65JfGvyMqNGlHdlUXD1VAuxtvYAaHBKLBdKPnpy60XKVDAkQCfmMu53g+gq9FM+ydepw=="; - }; - }; "vscode-css-languageservice-3.0.13" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; @@ -60382,13 +60454,13 @@ let sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; - "workerd-1.20231016.0" = { + "workerd-1.20231025.0" = { name = "workerd"; packageName = "workerd"; - version = "1.20231016.0"; + version = "1.20231025.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerd/-/workerd-1.20231016.0.tgz"; - sha512 = "v2GDb5XitSqgub/xm7EWHVAlAK4snxQu3itdMQxXstGtUG9hl79fQbXS/8fNFbmms2R2bAxUwSv47q8k5T5Erw=="; + url = "https://registry.npmjs.org/workerd/-/workerd-1.20231025.0.tgz"; + sha512 = "W1PFtpMFfvmm+ozBf+u70TE3Pviv7WA4qzDeejHDC4z+PFDq4+3KJCkgffaGBO86h+akWO0hSsc0uXL2zAqofQ=="; }; }; "workerpool-6.2.1" = { @@ -61670,13 +61742,13 @@ let sha512 = "fjUZh4nQ1s6HMccgIeE0VP4QG/YRGPmyjO9sAh890aQKPEk3nqbfUXhMFaC+Dr5KvYBm8BCyvfpZf2jY9aGSsw=="; }; }; - "zwave-js-12.2.3" = { + "zwave-js-12.3.0" = { name = "zwave-js"; packageName = "zwave-js"; - version = "12.2.3"; + version = "12.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-12.2.3.tgz"; - sha512 = "R7bP4vMM2awjdLaUIbwuEYaXkXxewNVABEisNiFnBAA7yGCZroExV/syH7ZQMfPkl9DR5g2UWYqJFDy3+Erh5g=="; + url = "https://registry.npmjs.org/zwave-js/-/zwave-js-12.3.0.tgz"; + sha512 = "ZiGFyWSHT6xXgFsMj0gh+5D76h4oKSqoDBBVlrZitJShpan6LqE9eEhocP4XFTXs7XrLlbbo54gEz7y5P0KP9Q=="; }; }; "zwitch-1.0.5" = { @@ -61703,15 +61775,16 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "16.2.8"; + version = "16.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-16.2.8.tgz"; - sha512 = "iPrDv+SemRb6ZhayxwLsEdykHpV2TYSgH5Smg8GqSaIR/KUiemuzBrIKEUEaIG4n2dVEOtcsuh2JRHQndF7wmw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-16.2.9.tgz"; + sha512 = "wkpV/Ni26LUeDmhee2TPXXEq3feEdZMSG8+nkfUK9kqIcxm0IjI1GLPeiVOX7aQobuKNe2cCAFNwsrXWjj+2og=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1602.8" - sources."@angular-devkit/core-16.2.8" - sources."@angular-devkit/schematics-16.2.8" + sources."@angular-devkit/architect-0.1602.9" + sources."@angular-devkit/core-16.2.9" + sources."@angular-devkit/schematics-16.2.9" + sources."@gar/promisify-1.1.3" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -61723,16 +61796,23 @@ in ]; }) sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@npmcli/fs-3.1.0" + sources."@npmcli/fs-2.1.2" sources."@npmcli/git-4.1.0" sources."@npmcli/installed-package-contents-2.0.2" + sources."@npmcli/move-file-2.0.1" sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.2" - sources."@schematics/angular-16.2.8" + sources."@schematics/angular-16.2.9" sources."@sigstore/bundle-1.1.0" sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" + (sources."@sigstore/sign-1.0.0" // { + dependencies = [ + sources."make-fetch-happen-11.1.1" + sources."minipass-7.0.4" + sources."minipass-fetch-3.0.4" + ]; + }) sources."@sigstore/tuf-1.0.3" sources."@tootallnate/once-2.0.0" sources."@tufjs/canonical-json-1.0.0" @@ -61766,10 +61846,13 @@ in sources."builtins-5.0.1" (sources."cacache-17.1.4" // { dependencies = [ + sources."@npmcli/fs-3.1.0" sources."brace-expansion-2.0.1" sources."glob-10.3.10" sources."minimatch-9.0.3" sources."minipass-7.0.4" + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" ]; }) sources."chalk-4.1.2" @@ -61802,6 +61885,11 @@ in sources."delegates-1.0.0" sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."escalade-3.1.1" @@ -61847,6 +61935,7 @@ in }) sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-4.1.1" @@ -61873,7 +61962,17 @@ in sources."log-symbols-4.1.0" sources."lru-cache-7.18.3" sources."magic-string-0.30.1" - sources."make-fetch-happen-11.1.1" + (sources."make-fetch-happen-10.2.1" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."cacache-16.1.3" + sources."fs-minipass-2.1.0" + sources."glob-8.1.0" + sources."minimatch-5.1.6" + sources."minipass-3.3.6" + sources."ssri-9.0.1" + ]; + }) sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" sources."minipass-5.0.0" @@ -61882,9 +61981,9 @@ in sources."minipass-3.3.6" ]; }) - (sources."minipass-fetch-3.0.4" // { + (sources."minipass-fetch-2.1.2" // { dependencies = [ - sources."minipass-7.0.4" + sources."minipass-3.3.6" ]; }) (sources."minipass-flush-1.0.5" // { @@ -61916,7 +62015,7 @@ in sources."ms-2.1.3" sources."mute-stream-0.0.8" sources."negotiator-0.6.3" - (sources."node-gyp-9.4.0" // { + (sources."node-gyp-9.4.1" // { dependencies = [ sources."which-2.0.2" ]; @@ -61930,7 +62029,16 @@ in sources."npm-package-arg-10.1.0" sources."npm-packlist-7.0.4" sources."npm-pick-manifest-8.0.1" - sources."npm-registry-fetch-14.0.5" + (sources."npm-registry-fetch-14.0.5" // { + dependencies = [ + sources."make-fetch-happen-11.1.1" + (sources."minipass-fetch-3.0.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + ]; + }) sources."npmlog-6.0.2" sources."once-1.4.0" sources."onetime-5.1.2" @@ -61951,7 +62059,7 @@ in sources."proc-log-3.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" (sources."read-package-json-6.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" @@ -61981,7 +62089,13 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."sigstore-1.9.0" + (sources."sigstore-1.9.0" // { + dependencies = [ + sources."make-fetch-happen-11.1.1" + sources."minipass-7.0.4" + sources."minipass-fetch-3.0.4" + ]; + }) sources."smart-buffer-4.2.0" sources."socks-2.7.1" sources."socks-proxy-agent-7.0.0" @@ -62016,10 +62130,16 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" - sources."tuf-js-1.1.7" + (sources."tuf-js-1.1.7" // { + dependencies = [ + sources."make-fetch-happen-11.1.1" + sources."minipass-7.0.4" + sources."minipass-fetch-3.0.4" + ]; + }) sources."type-fest-0.21.3" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" + sources."unique-filename-2.0.1" + sources."unique-slug-3.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -62066,13 +62186,13 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "2.4.1"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.4.1.tgz"; - sha512 = "+yHvvcLcyfr1kq2UsQ4/b84EhQo3450MZGRhIA+aw7/1BrJVjWiyOrBi4nVLVyBq8i4a5qIU+MsYu3HdS7kWwQ=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.5.1.tgz"; + sha512 = "CBSGC3lsGnauVloVWq7+8N8F+IRsyiVe/3WevYf0TmmO8aPhmSzbAAF3vhYWfja3/HLtwNJsm6ltfRkMyYOyaQ=="; }; dependencies = [ - sources."@astrojs/compiler-1.5.7" + sources."@astrojs/compiler-2.2.1" sources."@emmetio/abbreviation-2.3.3" sources."@emmetio/css-abbreviation-2.1.8" sources."@emmetio/scanner-1.0.4" @@ -62080,12 +62200,12 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@volar/kit-1.10.5" - sources."@volar/language-core-1.10.5" - sources."@volar/language-server-1.10.5" - sources."@volar/language-service-1.10.5" - sources."@volar/source-map-1.10.5" - sources."@volar/typescript-1.10.5" + sources."@volar/kit-1.10.10" + sources."@volar/language-core-1.10.10" + sources."@volar/language-server-1.10.10" + sources."@volar/language-service-1.10.10" + sources."@volar/source-map-1.10.10" + sources."@volar/typescript-1.10.10" (sources."@vscode/emmet-helper-2.9.2" // { dependencies = [ sources."vscode-uri-2.1.2" @@ -62106,9 +62226,14 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."muggle-string-0.3.1" + sources."path-browserify-1.0.1" sources."picomatch-2.3.1" sources."prettier-3.0.3" - sources."prettier-plugin-astro-0.12.1" + (sources."prettier-plugin-astro-0.12.1" // { + dependencies = [ + sources."@astrojs/compiler-1.8.2" + ]; + }) sources."queue-microtask-1.2.3" sources."request-light-0.7.0" sources."reusify-1.0.4" @@ -62196,7 +62321,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.22.1" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -62204,7 +62329,7 @@ in sources."concat-map-0.0.1" sources."convert-source-map-2.0.0" sources."debug-4.3.4" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fs-readdir-recursive-1.1.0" @@ -62248,10 +62373,10 @@ in "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "18.1.0"; + version = "18.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-18.1.0.tgz"; - sha512 = "ZT95pRNGD9fEEX1ih0yKyJ65U3Y88vLrJjK6hlSpLrJFioQNXTI4sSoOq7hHnOsJAmTsgEg5zxIY8qTzgEQtWg=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-18.2.0.tgz"; + sha512 = "F/DCG791kMFmWg5eIdogakuGeg4OiI2kD430ed1a1Hh3epvrJdeIAgcGADAMIOmF+m0S1+VlIYUKG2dvQQ1Izw=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -62281,7 +62406,7 @@ in sources."@commitlint/format-18.1.0" sources."@commitlint/is-ignored-18.1.0" sources."@commitlint/lint-18.1.0" - sources."@commitlint/load-18.1.0" + sources."@commitlint/load-18.2.0" sources."@commitlint/message-18.1.0" sources."@commitlint/parse-18.1.0" sources."@commitlint/read-18.1.0" @@ -62290,29 +62415,13 @@ in sources."@commitlint/to-lines-18.1.0" sources."@commitlint/top-level-18.1.0" sources."@commitlint/types-18.1.0" - sources."@cspotcode/source-map-support-0.8.1" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.95" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" - sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" - sources."@tsconfig/node10-1.0.9" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.4" sources."@types/minimist-1.2.4" - sources."@types/node-18.18.7" + sources."@types/node-18.18.8" sources."@types/normalize-package-data-2.4.3" sources."JSONStream-1.3.5" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."arg-4.1.3" sources."argparse-2.0.1" sources."array-ify-1.0.0" sources."arrify-1.0.1" @@ -62327,8 +62436,7 @@ in sources."conventional-changelog-angular-6.0.0" sources."conventional-commits-parser-5.0.0" sources."cosmiconfig-8.3.6" - sources."cosmiconfig-typescript-loader-4.4.0" - sources."create-require-1.1.1" + sources."cosmiconfig-typescript-loader-5.0.0" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" sources."decamelize-1.2.0" @@ -62337,7 +62445,6 @@ in sources."map-obj-1.0.1" ]; }) - sources."diff-4.0.2" sources."dot-prop-5.3.0" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" @@ -62379,6 +62486,7 @@ in sources."is-stream-2.0.1" sources."is-text-path-2.0.0" sources."isexe-2.0.0" + sources."jiti-1.21.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-parse-even-better-errors-2.3.1" @@ -62400,7 +62508,6 @@ in sources."lodash.uniq-4.5.0" sources."lodash.upperfirst-4.3.1" sources."lru-cache-6.0.0" - sources."make-error-1.3.6" sources."map-obj-4.3.0" sources."meow-12.1.1" sources."merge-stream-2.0.0" @@ -62420,7 +62527,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -62467,15 +62574,12 @@ in sources."through-2.3.8" sources."through2-4.0.2" sources."trim-newlines-3.0.1" - sources."ts-node-10.9.1" - sources."tslib-2.6.2" sources."type-fest-0.18.1" sources."typescript-5.2.2" sources."undici-types-5.26.5" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" - sources."v8-compile-cache-lib-3.0.1" sources."validate-npm-package-license-3.0.4" sources."which-2.0.2" sources."wrap-ansi-7.0.0" @@ -62487,7 +62591,6 @@ in ]; }) sources."yargs-parser-20.2.9" - sources."yn-3.1.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -62528,10 +62631,10 @@ in "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.109.2"; + version = "5.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.109.2.tgz"; - sha512 = "1jkaGSguZJlWBgk3xAsMPifQW3A7Kuovk1LC4vcDrpY0it8l6821PZzfXhfm4p2DIrSR7oOZg+Ht1hJCjqVRNw=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.110.1.tgz"; + sha512 = "uH/EmZdfOSesbN9mvVn1GEJPjencrXbOl2mx4fLuMpc4Fxi8eK5nw9NUxt/XBAySS/HiZgD3PKAuFugD3tMuJQ=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { @@ -62592,15 +62695,15 @@ in sources."tslib-2.6.2" ]; }) - (sources."@azure/msal-browser-2.38.2" // { + (sources."@azure/msal-browser-2.38.3" // { dependencies = [ - sources."@azure/msal-common-13.3.0" + sources."@azure/msal-common-13.3.1" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.18.3" // { + (sources."@azure/msal-node-1.18.4" // { dependencies = [ - sources."@azure/msal-common-13.3.0" + sources."@azure/msal-common-13.3.1" ]; }) (sources."@azure/storage-blob-12.11.0" // { @@ -62628,7 +62731,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" - sources."@microsoft/rush-lib-5.109.2" + sources."@microsoft/rush-lib-5.110.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -62665,13 +62768,9 @@ in ]; }) sources."@rushstack/heft-config-file-0.14.2" - (sources."@rushstack/node-core-library-3.61.0" // { - dependencies = [ - sources."import-lazy-4.0.0" - ]; - }) - sources."@rushstack/package-deps-hash-4.1.9" - (sources."@rushstack/package-extractor-0.6.10" // { + sources."@rushstack/node-core-library-3.61.0" + sources."@rushstack/package-deps-hash-4.1.11" + (sources."@rushstack/package-extractor-0.6.12" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.0.8" @@ -62682,13 +62781,13 @@ in sources."strip-json-comments-3.1.1" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.109.2" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.109.2" - sources."@rushstack/rush-http-build-cache-plugin-5.109.2" - sources."@rushstack/rush-sdk-5.109.2" - sources."@rushstack/stream-collator-4.1.10" - sources."@rushstack/terminal-0.7.9" - (sources."@rushstack/ts-command-line-4.16.1" // { + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.110.1" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.110.1" + sources."@rushstack/rush-http-build-cache-plugin-5.110.1" + sources."@rushstack/rush-sdk-5.110.1" + sources."@rushstack/stream-collator-4.1.12" + sources."@rushstack/terminal-0.7.11" + (sources."@rushstack/ts-command-line-4.17.1" // { dependencies = [ sources."argparse-1.0.10" ]; @@ -62700,7 +62799,7 @@ in sources."@types/lodash-4.14.200" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/node-fetch-2.6.2" sources."@types/normalize-package-data-2.4.3" sources."@types/parse-json-4.0.1" @@ -62865,11 +62964,7 @@ in }) sources."findup-sync-5.0.0" sources."form-data-3.0.1" - (sources."fs-extra-7.0.1" // { - dependencies = [ - sources."universalify-0.1.2" - ]; - }) + sources."fs-extra-7.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" @@ -62928,7 +63023,7 @@ in sources."resolve-from-4.0.0" ]; }) - sources."import-lazy-2.1.0" + sources."import-lazy-4.0.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inflight-1.0.6" @@ -63170,7 +63265,7 @@ in sources."process-nextick-args-2.0.1" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."pupa-2.1.1" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -63227,7 +63322,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" - sources."rfc4648-1.5.2" + sources."rfc4648-1.5.3" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rxjs-6.6.7" @@ -63282,7 +63377,11 @@ in sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."tough-cookie-4.1.3" + (sources."tough-cookie-4.1.3" // { + dependencies = [ + sources."universalify-0.2.0" + ]; + }) sources."tr46-0.0.3" sources."trim-newlines-3.0.1" sources."true-case-path-2.2.1" @@ -63292,7 +63391,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."undici-types-5.26.5" sources."unique-string-2.0.0" - sources."universalify-0.2.0" + sources."universalify-0.1.2" (sources."update-notifier-5.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -63300,6 +63399,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."import-lazy-2.1.0" sources."supports-color-7.2.0" ]; }) @@ -63355,10 +63455,10 @@ in "@shopify/cli" = nodeEnv.buildNodePackage { name = "_at_shopify_slash_cli"; packageName = "@shopify/cli"; - version = "3.50.0"; + version = "3.50.1"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.50.0.tgz"; - sha512 = "zzUYwlE8FJA78KW6YqHbxdYrf43RT3BCt3vC+IJfJltJvTceeip1DBWEOLA2m8rsUBkh9LpcTZR6Ik5sfgLacA=="; + url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.50.1.tgz"; + sha512 = "B7r0I4Ft5Tg814hKnIabQVZ4hXKK+PcpaYlLu1IEfCCueaL4r43IBnVeOzLOqIa3REfxS3RTglxSYOPl1vawQg=="; }; dependencies = [ (sources."@alcalzone/ansi-tokenize-0.1.3" // { @@ -63446,7 +63546,7 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - (sources."@shopify/cli-kit-3.50.0" // { + (sources."@shopify/cli-kit-3.50.1" // { dependencies = [ sources."ansi-escapes-6.2.0" sources."ansi-regex-6.0.1" @@ -63460,7 +63560,7 @@ in sources."type-fest-3.13.1" ]; }) - sources."@shopify/plugin-did-you-mean-3.50.0" + sources."@shopify/plugin-did-you-mean-3.50.1" sources."@sindresorhus/is-5.6.0" sources."@swc/core-1.3.95" sources."@swc/counter-0.1.2" @@ -63475,15 +63575,15 @@ in sources."@types/archiver-5.3.2" sources."@types/cli-progress-3.11.4" sources."@types/http-cache-semantics-4.0.3" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.32" + sources."@types/react-18.2.34" sources."@types/readdir-glob-1.1.3" sources."@types/scheduler-0.16.5" sources."@types/tinycolor2-1.4.5" sources."abort-controller-3.0.0" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" (sources."aggregate-error-3.1.0" // { dependencies = [ sources."clean-stack-2.2.0" @@ -63852,7 +63952,7 @@ in sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."rc-1.2.8" @@ -63960,7 +64060,7 @@ in sources."typescript-5.2.2" sources."undici-types-5.26.5" sources."unique-string-3.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."upper-case-2.0.2" sources."upper-case-first-2.0.2" sources."uri-js-4.4.1" @@ -64029,9 +64129,9 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.9" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."arg-5.0.2" @@ -64072,7 +64172,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."make-error-1.3.6" @@ -64164,9 +64264,9 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.9" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."arg-5.0.2" @@ -64207,7 +64307,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."make-error-1.3.6" @@ -64275,10 +64375,10 @@ in "@tailwindcss/language-server" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_language-server"; packageName = "@tailwindcss/language-server"; - version = "0.0.13"; + version = "0.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.13.tgz"; - sha512 = "C5OKPG8F6IiSbiEgXMxskMsOnbzSGnZvKBxEGHUhBGIB/tlX5rc7Iv/prdwYrUj2Swhjj5TrXuxZgACo+blB4A=="; + url = "https://registry.npmjs.org/@tailwindcss/language-server/-/language-server-0.0.14.tgz"; + sha512 = "WLkoJWzcYoysef/yPouukwpIB5pdAeXML0B+O2rCLAM/GmGT2jB3+431y7SLghy1ByscILcQt+iUpvTwNjJjPw=="; }; buildInputs = globalBuildInputs; meta = { @@ -64318,9 +64418,9 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.9" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."arg-5.0.2" @@ -64361,7 +64461,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."make-error-1.3.6" @@ -64453,9 +64553,9 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.9" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."arg-5.0.2" @@ -64496,7 +64596,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lodash.castarray-4.4.0" @@ -64620,17 +64720,17 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/client-s3-3.436.0" - sources."@aws-sdk/client-sso-3.436.0" - sources."@aws-sdk/client-sts-3.436.0" - sources."@aws-sdk/core-3.436.0" + sources."@aws-sdk/client-s3-3.441.0" + sources."@aws-sdk/client-sso-3.441.0" + sources."@aws-sdk/client-sts-3.441.0" + sources."@aws-sdk/core-3.441.0" sources."@aws-sdk/credential-provider-env-3.433.0" - sources."@aws-sdk/credential-provider-ini-3.436.0" - sources."@aws-sdk/credential-provider-node-3.436.0" + sources."@aws-sdk/credential-provider-ini-3.441.0" + sources."@aws-sdk/credential-provider-node-3.441.0" sources."@aws-sdk/credential-provider-process-3.433.0" - sources."@aws-sdk/credential-provider-sso-3.436.0" + sources."@aws-sdk/credential-provider-sso-3.441.0" sources."@aws-sdk/credential-provider-web-identity-3.433.0" - (sources."@aws-sdk/lib-storage-3.436.0" // { + (sources."@aws-sdk/lib-storage-3.441.0" // { dependencies = [ sources."buffer-5.6.0" ]; @@ -64642,23 +64742,23 @@ in sources."@aws-sdk/middleware-location-constraint-3.433.0" sources."@aws-sdk/middleware-logger-3.433.0" sources."@aws-sdk/middleware-recursion-detection-3.433.0" - sources."@aws-sdk/middleware-sdk-s3-3.433.0" + sources."@aws-sdk/middleware-sdk-s3-3.440.0" sources."@aws-sdk/middleware-sdk-sts-3.433.0" sources."@aws-sdk/middleware-signing-3.433.0" sources."@aws-sdk/middleware-ssec-3.433.0" - sources."@aws-sdk/middleware-user-agent-3.433.0" + sources."@aws-sdk/middleware-user-agent-3.438.0" sources."@aws-sdk/region-config-resolver-3.433.0" - sources."@aws-sdk/s3-presigned-post-3.436.0" - sources."@aws-sdk/s3-request-presigner-3.436.0" - sources."@aws-sdk/signature-v4-multi-region-3.433.0" - sources."@aws-sdk/token-providers-3.435.0" + sources."@aws-sdk/s3-presigned-post-3.441.0" + sources."@aws-sdk/s3-request-presigner-3.441.0" + sources."@aws-sdk/signature-v4-multi-region-3.437.0" + sources."@aws-sdk/token-providers-3.438.0" sources."@aws-sdk/types-3.433.0" sources."@aws-sdk/util-arn-parser-3.310.0" - sources."@aws-sdk/util-endpoints-3.433.0" + sources."@aws-sdk/util-endpoints-3.438.0" sources."@aws-sdk/util-format-url-3.433.0" sources."@aws-sdk/util-locate-window-3.310.0" sources."@aws-sdk/util-user-agent-browser-3.433.0" - sources."@aws-sdk/util-user-agent-node-3.433.0" + sources."@aws-sdk/util-user-agent-node-3.437.0" sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@aws-sdk/xml-builder-3.310.0" sources."@httptoolkit/websocket-stream-6.0.1" @@ -64710,6 +64810,7 @@ in sources."@smithy/util-config-provider-2.0.0" sources."@smithy/util-defaults-mode-browser-2.0.16" sources."@smithy/util-defaults-mode-node-2.0.21" + sources."@smithy/util-endpoints-1.0.2" sources."@smithy/util-hex-encoding-2.0.0" sources."@smithy/util-middleware-2.0.5" sources."@smithy/util-retry-2.0.5" @@ -64721,7 +64822,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/responselike-1.0.2" sources."@types/ws-8.5.8" sources."accepts-1.3.8" @@ -64730,7 +64831,7 @@ in sources."asn1.js-5.4.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."aws-crt-1.18.2" + sources."aws-crt-1.18.3" sources."axios-0.24.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -65441,7 +65542,7 @@ in }) sources."@types/long-4.0.2" sources."@types/mime-3.0.3" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/normalize-package-data-2.4.3" sources."@types/qs-6.9.9" sources."@types/range-parser-1.2.6" @@ -65550,25 +65651,14 @@ in }) sources."call-bind-1.0.5" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."clean-stack-2.2.0" @@ -65599,7 +65689,7 @@ in sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.33.1" + sources."core-js-compat-3.33.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -65661,13 +65751,13 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."envinfo-7.10.0" + sources."envinfo-7.11.0" sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -65684,18 +65774,7 @@ in sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."express-4.18.2" // { @@ -65772,7 +65851,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.219.5" + sources."flow-parser-0.220.0" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -65856,12 +65935,12 @@ in }) sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" - sources."is-accessor-descriptor-1.0.0" + sources."is-accessor-descriptor-1.0.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-core-module-2.13.1" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-docker-2.2.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" @@ -65991,13 +66070,7 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) @@ -66159,18 +66232,7 @@ in sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" sources."source-map-0.5.7" ]; }) @@ -66200,18 +66262,7 @@ in (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."statuses-2.0.1" @@ -66283,7 +66334,7 @@ in sources."unicode-match-property-value-ecmascript-2.1.0" sources."unicode-property-aliases-ecmascript-2.1.0" sources."union-value-1.0.1" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -66591,7 +66642,7 @@ in sources."@types/acorn-4.0.6" sources."@types/concat-stream-2.0.1" sources."@types/debug-4.1.10" - sources."@types/estree-1.0.3" + sources."@types/estree-1.0.4" sources."@types/estree-jsx-1.0.2" sources."@types/hast-2.3.7" sources."@types/http-cache-semantics-4.0.3" @@ -66600,12 +66651,12 @@ in sources."@types/minimist-1.2.4" sources."@types/ms-0.7.33" sources."@types/nlcst-1.0.3" - sources."@types/node-18.18.7" + sources."@types/node-18.18.8" sources."@types/normalize-package-data-2.4.3" sources."@types/supports-color-8.1.2" sources."@types/unist-2.0.9" sources."abbrev-2.0.0" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -66890,7 +66941,7 @@ in sources."pluralize-8.0.0" sources."proc-log-3.0.0" sources."process-nextick-args-1.0.7" - sources."property-information-6.3.0" + sources."property-information-6.4.0" sources."proto-list-1.2.4" sources."pump-1.0.3" sources."pump-chain-1.0.0" @@ -67157,8 +67208,8 @@ in }; dependencies = [ sources."browserslist-4.22.1" - sources."caniuse-lite-1.0.30001554" - sources."electron-to-chromium-1.4.567" + sources."caniuse-lite-1.0.30001559" + sources."electron-to-chromium-1.4.574" sources."escalade-3.1.1" sources."fraction.js-4.3.7" sources."nanoid-3.3.6" @@ -67221,10 +67272,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.102.1"; + version = "2.103.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.102.1.tgz"; - sha512 = "GWGXUaadkn9Nv1YoZZj+iuV6j0t7brcf/cwfXqsK6FEWOCMkn1d+B5P3SlGYgCGqpPjvs8w8Llj/fTUviZ6t9g=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.103.1.tgz"; + sha512 = "5DXPlMi8Gf/a6fMqwY6uVwuR21PDDNGkAGkMVTTuaiulc4RsMjQUGq8I4xaPIYQRvR+VHFU+JQ5j5PnI5/gBrA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -67266,7 +67317,7 @@ in sources."@szmarczak/http-timer-5.0.1" sources."@types/debug-4.1.10" sources."@types/eslint-8.44.6" - sources."@types/estree-1.0.3" + sources."@types/estree-1.0.4" sources."@types/estree-jsx-1.0.2" (sources."@types/hast-2.3.7" // { dependencies = [ @@ -67477,7 +67528,7 @@ in sources."micromark-util-chunked-2.0.0" sources."micromark-util-classify-character-2.0.0" sources."micromark-util-combine-extensions-2.0.0" - sources."micromark-util-decode-numeric-character-reference-2.0.0" + sources."micromark-util-decode-numeric-character-reference-2.0.1" sources."micromark-util-decode-string-2.0.0" sources."micromark-util-encode-2.0.0" sources."micromark-util-html-tag-name-2.0.0" @@ -67506,7 +67557,7 @@ in sources."ora-7.0.1" sources."p-cancelable-3.0.0" sources."parse-github-url-1.0.2" - (sources."parse-json-7.1.0" // { + (sources."parse-json-7.1.1" // { dependencies = [ sources."type-fest-3.13.1" ]; @@ -68133,7 +68184,7 @@ in sources."to-vfile-8.0.0" sources."trough-2.1.0" sources."type-fest-4.6.0" - sources."unified-11.0.3" + sources."unified-11.0.4" (sources."unified-lint-rule-2.1.2" // { dependencies = [ sources."@types/unist-2.0.9" @@ -68670,7 +68721,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.15" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -68828,7 +68879,7 @@ in sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."ua-parser-js-1.0.36" + sources."ua-parser-js-1.0.37" sources."undici-types-5.26.5" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -68860,10 +68911,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.156.0"; + version = "2.163.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.156.0.tgz"; - sha512 = "/Pse8DIgpIm1HGMKHKbEwvz8017nbxHUyAZOFsLfHWn6bWtLPBXDLwtBz6iy1+xuSENdzKEUHx1ZELu8T2+YKw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.163.0.tgz"; + sha512 = "NmAubHYjEj4VzjT/F82x+LLu5jCdLKC4Q/xYdOdrDeyw5ceZsmpNZD/kiTyeAleJpVO9BL2YpdHLd4zZiyPZHw=="; }; dependencies = [ sources."@colors/colors-1.6.0" @@ -68885,7 +68936,7 @@ in sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.41.0" - sources."@types/node-16.18.59" + sources."@types/node-16.18.60" sources."@types/triple-beam-1.3.4" sources."@xmldom/xmldom-0.8.10" sources."aggregate-error-3.1.0" @@ -68919,8 +68970,8 @@ in sources."buffer-5.7.1" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.67.3" - sources."cdk8s-plus-25-2.22.44" + sources."cdk8s-2.67.6" + sources."cdk8s-plus-25-2.22.49" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."clean-stack-2.2.0" @@ -68968,7 +69019,7 @@ in sources."dotenv-16.3.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.3.0-dev.20231025" + sources."typescript-5.3.0-dev.20231101" ]; }) sources."emoji-regex-8.0.0" @@ -69061,17 +69112,16 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.951" // { + (sources."jsii-srcmak-0.1.953" // { dependencies = [ - sources."@jsii/check-node-1.88.0" sources."cliui-8.0.1" sources."fs-extra-9.1.0" - (sources."jsii-5.1.12" // { + (sources."jsii-5.2.23" // { dependencies = [ sources."yargs-17.7.2" ]; }) - sources."typescript-5.1.6" + sources."typescript-5.2.2" sources."yargs-parser-21.1.1" ]; }) @@ -69121,7 +69171,7 @@ in sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."readable-stream-3.6.2" sources."rechoir-0.6.2" @@ -69154,7 +69204,7 @@ in sources."slice-ansi-4.0.0" sources."snake-case-3.0.4" sources."sort-json-2.0.1" - sources."spdx-license-list-6.7.0" + sources."spdx-license-list-6.8.0" sources."sscaff-1.2.274" sources."stack-trace-0.0.10" sources."stream-chain-2.2.5" @@ -69180,7 +69230,7 @@ in sources."type-fest-0.21.3" sources."typescript-3.9.10" sources."universal-user-agent-6.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utility-types-3.10.0" @@ -69362,20 +69412,20 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" - sources."@jsii/check-node-1.88.0" + sources."@jsii/check-node-1.90.0" sources."@jsii/spec-1.91.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@sentry-internal/tracing-7.75.1" - sources."@sentry/core-7.75.1" - sources."@sentry/node-7.75.1" - sources."@sentry/types-7.75.1" - sources."@sentry/utils-7.75.1" + sources."@sentry-internal/tracing-7.77.0" + sources."@sentry/core-7.77.0" + sources."@sentry/node-7.77.0" + sources."@sentry/types-7.77.0" + sources."@sentry/utils-7.77.0" sources."@types/mute-stream-0.0.2" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.32" + sources."@types/react-18.2.34" sources."@types/scheduler-0.16.5" sources."@types/wrap-ansi-3.0.0" sources."@types/yauzl-2.10.2" @@ -69430,11 +69480,7 @@ in sources."cli-spinners-2.7.0" sources."cli-truncate-2.1.0" sources."cli-width-4.1.0" - (sources."cliui-8.0.1" // { - dependencies = [ - sources."wrap-ansi-7.0.0" - ]; - }) + sources."cliui-6.0.0" sources."clone-2.1.2" sources."code-excerpt-3.0.0" (sources."codemaker-1.91.0" // { @@ -69476,7 +69522,7 @@ in sources."detect-port-1.5.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.3.0-dev.20231025" + sources."typescript-5.3.0-dev.20231101" ]; }) sources."eastasianwidth-0.2.0" @@ -69611,10 +69657,9 @@ in sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-5.2.20" // { + (sources."jsii-5.2.23" // { dependencies = [ - sources."@jsii/check-node-1.90.0" - sources."typescript-5.2.2" + sources."@jsii/check-node-1.91.0" ]; }) (sources."jsii-pacmak-1.91.0" // { @@ -69627,6 +69672,7 @@ in sources."jsii-rosetta-1.91.0" sources."typescript-3.9.10" sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; @@ -69637,31 +69683,16 @@ in sources."cliui-7.0.4" sources."fs-extra-10.1.0" sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-5.2.1" // { - dependencies = [ - sources."@jsii/check-node-1.90.0" - sources."typescript-5.2.2" - ]; - }) - (sources."jsii-srcmak-0.1.951" // { + sources."jsii-rosetta-5.2.1" + (sources."jsii-srcmak-0.1.953" // { dependencies = [ sources."fs-extra-9.1.0" - (sources."jsii-5.1.12" // { - dependencies = [ - sources."yargs-17.7.2" - ]; - }) - (sources."yargs-15.4.1" // { - dependencies = [ - sources."cliui-6.0.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" - ]; - }) + sources."yargs-15.4.1" ]; }) sources."json-schema-traverse-1.0.0" @@ -69750,7 +69781,7 @@ in sources."prettier-2.8.8" sources."process-nextick-args-2.0.1" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."react-18.2.0" @@ -69798,7 +69829,7 @@ in sources."simple-get-4.0.1" sources."slice-ansi-3.0.0" sources."sort-json-2.0.1" - sources."spdx-license-list-6.7.0" + sources."spdx-license-list-6.8.0" sources."sscaff-1.2.274" sources."stack-utils-2.0.6" sources."stop-iteration-iterator-1.0.0" @@ -69824,9 +69855,9 @@ in sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" sources."type-fest-0.12.0" - sources."typescript-5.1.6" + sources."typescript-5.2.2" sources."undici-types-5.26.5" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" @@ -69847,10 +69878,17 @@ in sources."xml-js-1.6.11" sources."xmlbuilder-15.1.1" sources."xstate-4.38.3" - sources."y18n-5.0.8" + sources."y18n-4.0.3" sources."yallist-4.0.0" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" + (sources."yargs-17.7.2" // { + dependencies = [ + sources."cliui-8.0.1" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" + sources."yargs-parser-21.1.1" + ]; + }) + sources."yargs-parser-18.1.3" sources."yauzl-2.10.0" sources."yoga-layout-prebuilt-1.10.0" (sources."zip-stream-4.1.1" // { @@ -70184,10 +70222,10 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "1.3.26"; + version = "1.3.27"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.26.tgz"; - sha512 = "J66k2LBOcqDLS4vdEcSymFGW1GXg9LlEIH47Juw5uExpUtJ5Xc9b+fhtZ3djh6QJjJrIeJkbjl+7Jk+Gc49l2g=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.27.tgz"; + sha512 = "db1WeOPFArtbNEa6IMCtovlXJUS4W+qfXWoqiUCDPvRxBMDZMROSum2nx+hbo6TZwkDacT9X59hkqRxDLVdprA=="; }; dependencies = [ sources."isexe-2.0.0" @@ -70665,13 +70703,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.333"; + version = "1.1.334"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.333.tgz"; - sha512 = "yKsvv7mgUlFuE6QS2AvTocAEMuA9i5puBSuBOYgbEDFsz96V8eZdyJR3bhFMdDnd5j/V1mV02D6MCRpEWc9E0w=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.334.tgz"; + sha512 = "U6gGd8uvMPXW1TMrIcx1QeW+GnbKrWWGer5EOgbQFRFrzWuEipe/NU5Iv/S+YqUnkkdPMN2HeKL2BLoLsNq60Q=="; }; dependencies = [ - sources."pyright-1.1.333" + sources."pyright-1.1.334" ]; buildInputs = globalBuildInputs; meta = { @@ -70981,7 +71019,7 @@ in sources."tslib-1.14.1" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -71081,7 +71119,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -71118,7 +71156,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -71261,7 +71299,7 @@ in sources."postcss-selector-parser-6.0.13" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.2.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -71746,7 +71784,7 @@ in sources."progress-2.0.3" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" sources."resolve-1.22.8" @@ -72239,7 +72277,7 @@ in sources."normalize-package-data-6.0.0" sources."p-limit-4.0.0" sources."p-locate-6.0.0" - (sources."parse-json-7.1.0" // { + (sources."parse-json-7.1.1" // { dependencies = [ sources."type-fest-3.13.1" ]; @@ -72361,7 +72399,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.3" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -72562,7 +72600,7 @@ in sources."@cspell/dict-ada-4.0.2" sources."@cspell/dict-aws-4.0.0" sources."@cspell/dict-bash-4.1.2" - sources."@cspell/dict-companies-3.0.26" + sources."@cspell/dict-companies-3.0.27" sources."@cspell/dict-cpp-5.0.9" sources."@cspell/dict-cryptocurrencies-4.0.0" sources."@cspell/dict-csharp-4.0.2" @@ -72576,7 +72614,7 @@ in sources."@cspell/dict-en-common-misspellings-1.0.2" sources."@cspell/dict-en-gb-1.1.33" sources."@cspell/dict-en_us-4.3.11" - sources."@cspell/dict-filetypes-3.0.1" + sources."@cspell/dict-filetypes-3.0.2" sources."@cspell/dict-fonts-4.0.0" sources."@cspell/dict-fsharp-1.0.1" sources."@cspell/dict-fullstack-3.1.5" @@ -72596,7 +72634,7 @@ in sources."@cspell/dict-php-4.0.4" sources."@cspell/dict-powershell-5.0.2" sources."@cspell/dict-public-licenses-2.0.5" - sources."@cspell/dict-python-4.1.9" + sources."@cspell/dict-python-4.1.10" sources."@cspell/dict-r-2.0.1" sources."@cspell/dict-ruby-5.0.1" sources."@cspell/dict-rust-4.0.1" @@ -73050,9 +73088,9 @@ in sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/cli-progress-3.11.4" - sources."@types/node-20.8.9" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -73230,7 +73268,7 @@ in sources."type-fest-0.21.3" sources."typescript-5.2.2" sources."undici-types-5.26.5" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wcwidth-1.0.1" @@ -73376,7 +73414,7 @@ in dependencies = [ sources."http-signature-1.2.0" sources."jsprim-1.4.2" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."request-2.88.2" sources."tough-cookie-2.5.0" @@ -73406,7 +73444,7 @@ in sources."through-2.3.8" (sources."tough-cookie-4.1.3" // { dependencies = [ - sources."punycode-2.3.0" + sources."punycode-2.3.1" ]; }) sources."tunnel-agent-0.6.0" @@ -73414,7 +73452,7 @@ in sources."universalify-0.2.0" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.3.0" + sources."punycode-2.3.1" ]; }) sources."url-0.10.3" @@ -73484,19 +73522,20 @@ in sources."fs-extra-9.1.0" ]; }) - sources."@isaacs/cliui-8.0.2" + sources."@gar/promisify-1.1.3" sources."@malept/cross-spawn-promise-2.0.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-3.1.0" + sources."@npmcli/fs-2.1.2" + sources."@npmcli/move-file-2.0.1" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-2.0.0" sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/responselike-1.0.2" sources."@types/yauzl-2.10.2" sources."@xmldom/xmldom-0.8.10" @@ -73511,7 +73550,7 @@ in ]; }) sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" + sources."ansi-styles-4.3.0" sources."aproba-2.0.0" sources."are-we-there-yet-3.0.1" sources."astral-regex-2.0.0" @@ -73528,41 +73567,22 @@ in sources."buffer-crc32-0.2.13" sources."buffer-equal-1.0.1" sources."buffer-from-1.1.2" - (sources."cacache-17.1.4" // { + (sources."cacache-16.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" + sources."glob-8.1.0" + sources."minimatch-5.1.6" ]; }) sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.4" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) + sources."chalk-4.1.2" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.1" - (sources."cli-truncate-2.1.0" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."cliui-8.0.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - 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."cli-truncate-2.1.0" + sources."cliui-8.0.1" sources."clone-1.0.4" sources."clone-response-1.0.3" sources."color-convert-2.0.1" @@ -73597,20 +73617,15 @@ in sources."detect-libc-2.0.2" sources."detect-node-2.1.0" sources."dir-compare-3.3.0" - sources."eastasianwidth-0.2.0" (sources."electron-packager-17.1.2" // { dependencies = [ sources."fs-extra-11.1.1" ]; }) - sources."emoji-regex-9.2.2" + sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - (sources."enquirer-2.4.1" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."enquirer-2.4.1" sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" @@ -73625,7 +73640,6 @@ in sources."semver-5.7.2" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.7" sources."which-1.3.1" ]; }) @@ -73647,24 +73661,12 @@ in ]; }) sources."flora-colossus-2.0.0" - sources."foreground-child-3.1.1" sources."fs-extra-10.1.0" - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."galactus-1.0.0" - (sources."gauge-4.0.4" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."signal-exit-3.0.7" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."gauge-4.0.4" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" sources."get-intrinsic-1.2.2" @@ -73705,6 +73707,7 @@ in sources."ieee754-1.2.1" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -73725,21 +73728,12 @@ in sources."is-wsl-2.2.0" sources."isbinaryfile-4.0.10" sources."isexe-2.0.0" - sources."jackspeak-2.3.6" sources."json-buffer-3.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" sources."junk-3.1.0" sources."keyv-4.5.4" - (sources."listr2-5.0.8" // { - dependencies = [ - sources."ansi-styles-4.3.0" - 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."listr2-5.0.8" sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.21" @@ -73747,17 +73741,13 @@ in sources."log-symbols-4.1.0" (sources."log-update-4.0.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" sources."slice-ansi-4.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" sources."wrap-ansi-6.2.0" ]; }) sources."lowercase-keys-2.0.0" sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" + sources."make-fetch-happen-10.2.1" sources."map-age-cleaner-0.1.3" (sources."matcher-3.0.0" // { dependencies = [ @@ -73771,37 +73761,13 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) + sources."minipass-3.3.6" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-2.1.2" + sources."minipass-flush-1.0.5" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.3" sources."negotiator-0.6.3" @@ -73809,7 +73775,7 @@ in sources."node-abi-3.51.0" sources."node-api-version-0.1.4" sources."node-fetch-2.7.0" - sources."node-gyp-9.4.0" + sources."node-gyp-9.4.1" sources."nopt-6.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -73826,11 +73792,7 @@ in sources."object-keys-1.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - (sources."ora-5.4.1" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."ora-5.4.1" sources."p-cancelable-2.1.1" sources."p-defer-1.0.0" sources."p-finally-1.0.0" @@ -73846,11 +73808,6 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-parse-1.0.7" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) sources."path-type-2.0.0" sources."pend-1.2.0" sources."picomatch-2.3.1" @@ -73867,6 +73824,7 @@ in }) sources."plist-3.1.0" sources."progress-2.0.3" + sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."pump-3.0.0" sources."queue-microtask-1.2.3" @@ -73886,11 +73844,7 @@ in sources."resolve-dir-1.0.1" sources."resolve-package-1.0.1" sources."responselike-2.0.1" - (sources."restore-cursor-3.1.0" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) + sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."reusify-1.0.4" sources."rfdc-1.3.0" @@ -73910,12 +73864,8 @@ in sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - (sources."slice-ansi-3.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) + sources."signal-exit-3.0.7" + sources."slice-ansi-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" sources."socks-proxy-agent-7.0.0" @@ -73926,25 +73876,10 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.16" sources."sprintf-js-1.1.3" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - 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."ssri-9.0.1" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) - sources."strip-ansi-cjs-6.0.1" + sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" sources."strip-outer-1.0.1" @@ -73954,11 +73889,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."tar-6.2.0" // { dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) + sources."minipass-5.0.0" ]; }) sources."through-2.3.8" @@ -73968,9 +73899,9 @@ in sources."tslib-2.6.2" sources."type-fest-0.13.1" sources."undici-types-5.26.5" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."universalify-2.0.0" + sources."unique-filename-2.0.1" + sources."unique-slug-3.0.0" + sources."universalify-2.0.1" sources."username-5.1.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -73978,33 +73909,13 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" - (sources."wide-align-1.1.5" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wide-align-1.1.5" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - (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-17.7.2" sources."yargs-parser-21.1.1" (sources."yarn-or-npm-3.0.1" // { dependencies = [ @@ -74032,10 +73943,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-5.5.0.tgz"; - sha512 = "vSbRcbvn+goaXzGkvHhKOUVAI8DdqaHqkcwdRcFR5OdQYA+LDpJqJgy7hqj5SvyaxVDqHqvhdFMyrakZESiceg=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-5.6.0.tgz"; + sha512 = "M1lBKzISUsUhXWmY+f08Nsn5sbKIKRYjymSMdEVh47C46r9sWqL6zqsIrN3Kfv/DXvXL4qo2YiWrAQLxuvWk4A=="; }; dependencies = [ sources."@0no-co/graphql.web-1.0.4" @@ -74112,7 +74023,7 @@ in dependencies = [ sources."fs-extra-9.1.0" sources."semver-7.5.3" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."@expo/results-1.0.0" @@ -74140,7 +74051,7 @@ in sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."which-2.0.2" ]; }) @@ -74163,14 +74074,14 @@ in sources."fs-extra-9.1.0" sources."has-flag-4.0.0" sources."supports-color-8.1.1" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."@oclif/linewrap-1.0.0" (sources."@oclif/plugin-autocomplete-1.3.10" // { dependencies = [ sources."fs-extra-9.1.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."@oclif/screen-3.0.8" @@ -74181,7 +74092,7 @@ in sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@types/bunyan-1.8.10" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@urql/core-4.0.11" sources."@urql/exchange-retry-1.2.0" sources."@xmldom/xmldom-0.8.10" @@ -74278,7 +74189,7 @@ in sources."commander-7.2.0" sources."fs-extra-9.1.0" sources."semver-7.5.3" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."fast-deep-equal-3.1.3" @@ -74293,7 +74204,7 @@ in sources."form-data-4.0.0" (sources."fs-extra-10.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) (sources."fs-minipass-2.1.0" // { @@ -74356,7 +74267,7 @@ in sources."json5-2.2.3" (sources."jsonfile-6.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."keychain-1.3.0" @@ -74454,7 +74365,7 @@ in sources."promise-limit-2.7.0" sources."promise-retry-2.0.1" sources."prompts-2.4.2" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qrcode-terminal-0.12.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -74594,7 +74505,7 @@ in dependencies = [ sources."@alcalzone/ansi-tokenize-0.1.3" sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.32" + sources."@types/react-18.2.34" sources."@types/scheduler-0.16.5" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -74677,7 +74588,7 @@ in sources."p-defer-1.0.0" sources."patch-console-2.0.0" sources."path-key-3.1.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."react-18.2.0" (sources."react-devtools-core-4.28.5" // { dependencies = [ @@ -74788,7 +74699,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@ungap/structured-clone-1.2.0" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -74857,7 +74768,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."prelude-ls-1.2.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."resolve-from-4.0.0" sources."reusify-1.0.4" @@ -75118,7 +75029,7 @@ in dependencies = [ sources."fs-extra-9.1.0" sources."semver-7.3.2" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."bplist-parser-0.3.2" @@ -75259,7 +75170,7 @@ in sources."@types/connect-history-api-fallback-1.5.2" sources."@types/eslint-8.44.6" sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.3" + sources."@types/estree-1.0.4" sources."@types/express-4.17.20" sources."@types/express-serve-static-core-4.17.39" sources."@types/glob-7.2.0" @@ -75274,7 +75185,8 @@ in sources."@types/keyv-3.1.4" sources."@types/mime-1.3.4" sources."@types/minimatch-5.1.2" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" + sources."@types/node-forge-1.3.8" sources."@types/qs-6.9.9" sources."@types/range-parser-1.2.6" sources."@types/responselike-1.0.2" @@ -75308,7 +75220,7 @@ in sources."@xtuc/long-4.2.2" sources."abab-2.0.6" sources."accepts-1.3.8" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-import-assertions-1.9.0" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" @@ -75404,7 +75316,7 @@ in sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -75480,7 +75392,7 @@ in sources."slash-4.0.0" ]; }) - sources."core-js-compat-3.33.1" + sources."core-js-compat-3.33.2" sources."core-util-is-1.0.3" sources."cross-fetch-3.1.8" (sources."cross-spawn-6.0.5" // { @@ -75547,7 +75459,7 @@ in sources."dot-case-3.0.4" sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -76105,7 +76017,7 @@ in sources."prompts-2.4.2" sources."proxy-addr-2.0.7" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qrcode-terminal-0.11.0" sources."qs-6.11.0" sources."querystringify-2.2.0" @@ -76173,7 +76085,7 @@ in ]; }) sources."select-hose-2.0.0" - (sources."selfsigned-2.1.1" // { + (sources."selfsigned-2.4.1" // { dependencies = [ sources."node-forge-1.3.1" ]; @@ -76314,7 +76226,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.22.0" // { + (sources."terser-5.24.0" // { dependencies = [ sources."commander-2.20.3" sources."source-map-support-0.5.21" @@ -76346,7 +76258,7 @@ in sources."type-fest-0.12.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."ua-parser-js-1.0.36" + sources."ua-parser-js-1.0.37" sources."undici-types-5.26.5" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" @@ -76355,7 +76267,7 @@ in sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-1.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."unpipe-1.0.0" sources."untildify-3.0.3" sources."update-browserslist-db-1.0.13" @@ -76521,10 +76433,10 @@ in sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" sources."@types/minimist-1.2.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/normalize-package-data-2.4.3" sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.32" + sources."@types/react-18.2.34" sources."@types/scheduler-0.16.5" sources."@types/yauzl-2.10.2" sources."@types/yoga-layout-1.9.2" @@ -76552,7 +76464,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -76578,7 +76490,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -76829,9 +76741,9 @@ in sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/cli-progress-3.11.4" - sources."@types/node-20.8.9" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."ajv-6.12.6" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" @@ -77132,7 +77044,7 @@ in sources."prettier-2.8.8" sources."process-nextick-args-2.0.1" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."query-string-5.1.1" sources."queue-microtask-1.2.3" @@ -77202,7 +77114,7 @@ in sources."type-fest-0.21.3" sources."typescript-5.2.2" sources."undici-types-5.26.5" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" @@ -77535,7 +77447,7 @@ in sources."@scure/bip39-1.2.1" sources."@types/atob-2.1.3" sources."@types/inquirer-6.5.0" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/through-0.0.32" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -77651,7 +77563,7 @@ in sources."path-exists-4.0.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."querystring-0.2.1" sources."randombytes-2.1.0" @@ -77685,7 +77597,7 @@ in sources."type-fest-0.21.3" sources."underscore-1.4.4" sources."undici-types-5.26.5" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."untildify-4.0.0" sources."uri-js-4.4.1" sources."utf8-3.0.0" @@ -77767,18 +77679,7 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."cliff-0.1.10" // { @@ -77824,19 +77725,8 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" ]; }) sources."extend-shallow-3.0.2" @@ -77895,7 +77785,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."internal-slot-1.0.6" - 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.3.2" @@ -77904,9 +77794,9 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.7" - sources."is-data-descriptor-1.0.0" + sources."is-data-descriptor-1.0.1" sources."is-date-object-1.0.5" - sources."is-descriptor-1.0.2" + sources."is-descriptor-1.0.3" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -77973,13 +77863,7 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) @@ -78048,19 +77932,8 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -78082,18 +77955,7 @@ in (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."stop-iteration-iterator-1.0.0" @@ -78198,9 +78060,9 @@ in sources."utf-8-validate-6.0.3" ]; }) - sources."@types/bn.js-5.1.3" + sources."@types/bn.js-5.1.4" sources."@types/lru-cache-5.1.1" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -78241,10 +78103,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "5.12.3"; + version = "5.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.12.3.tgz"; - sha512 = "pYrL5Qvjq21wa3gHkcVD8/j9aZ4EzZGe4qVM3qbHl3tAc4DJw+g10qstasvyaum3Fm5sj+uc0DneNlERU+Hucg=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.12.4.tgz"; + sha512 = "GD+otyd5LlgSbYK4ODrKyAise/k32G7Qy7H/k+gJ2P8DCG9sU+j//2zNwF7mY8C5dl0SpROqFTL+I0Y1DK4tmQ=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" @@ -78327,8 +78189,8 @@ in sources."@types/common-tags-1.8.3" sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.9" - sources."@types/node-fetch-2.6.7" + sources."@types/node-20.8.10" + sources."@types/node-fetch-2.6.8" sources."@types/responselike-1.0.2" sources."@types/yoga-layout-1.9.2" sources."ansi-align-3.0.1" @@ -78354,7 +78216,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -78391,7 +78253,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-2.0.0" - sources."create-gatsby-3.12.2" + sources."create-gatsby-3.12.3" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.2" @@ -78415,12 +78277,12 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."envinfo-7.10.0" + sources."envinfo-7.11.0" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" (sources."execa-5.1.1" // { @@ -78449,8 +78311,8 @@ in sources."fs-exists-cached-1.0.0" sources."fs-extra-11.1.1" sources."fs.realpath-1.0.0" - sources."gatsby-core-utils-4.12.0" - sources."gatsby-telemetry-4.12.0" + sources."gatsby-core-utils-4.12.1" + sources."gatsby-telemetry-4.12.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" @@ -78610,7 +78472,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."undici-types-5.26.5" sources."unique-string-2.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."update-browserslist-db-1.0.13" sources."util-deprecate-1.0.2" sources."utila-0.4.0" @@ -78744,15 +78606,15 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "39.21.1"; + version = "39.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-39.21.1.tgz"; - sha512 = "d+8IySB6/2anVe6WPEz7adWIEmPV19Cyz2C7E4Uy3FkLP+i2bmYlbaTLyn6lXy0OUMAcH5w/+B/ETM+CG0fyDw=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-39.21.2.tgz"; + sha512 = "/0gz7IXErq2rzqsx5rqPKopcJztkmf392R2abrTJXmsuIwBEJxCn3JOd3PvX4G79wXAtV1IIR0lDOTkAagX3mw=="; }; dependencies = [ - sources."@gitbeaker/core-39.21.1" - sources."@gitbeaker/requester-utils-39.21.1" - sources."@gitbeaker/rest-39.21.1" + sources."@gitbeaker/core-39.21.2" + sources."@gitbeaker/requester-utils-39.21.2" + sources."@gitbeaker/rest-39.21.2" sources."ansi-styles-4.3.0" sources."async-sema-3.1.1" sources."braces-3.0.2" @@ -79144,7 +79006,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/parse-json-4.0.1" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -79380,7 +79242,7 @@ in sources."json-stringify-safe-5.0.1" (sources."jsonfile-6.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."jsonpath-plus-4.0.0" @@ -79501,7 +79363,7 @@ in sources."prepend-http-2.0.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."queue-microtask-1.2.3" sources."rc-1.2.8" @@ -79658,7 +79520,7 @@ in sources."@graphql-tools/code-file-loader-8.0.1" sources."@graphql-tools/delegate-10.0.3" sources."@graphql-tools/executor-1.2.0" - sources."@graphql-tools/executor-graphql-ws-1.1.0" + sources."@graphql-tools/executor-graphql-ws-1.1.1" sources."@graphql-tools/executor-http-1.0.3" sources."@graphql-tools/executor-legacy-ws-1.0.4" sources."@graphql-tools/graphql-file-loader-8.0.0" @@ -79669,7 +79531,7 @@ in sources."@graphql-tools/merge-9.0.0" sources."@graphql-tools/schema-10.0.0" sources."@graphql-tools/url-loader-8.0.0" - sources."@graphql-tools/utils-10.0.7" + sources."@graphql-tools/utils-10.0.8" sources."@graphql-tools/wrap-10.0.1" sources."@graphql-typed-document-node/core-3.2.0" sources."@iarna/toml-2.2.5" @@ -79682,8 +79544,8 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@repeaterjs/repeater-3.0.4" - sources."@types/estree-1.0.3" - sources."@types/node-20.8.9" + sources."@types/estree-1.0.4" + sources."@types/node-20.8.10" sources."@types/ws-8.5.8" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.2" @@ -79696,7 +79558,7 @@ in sources."@whatwg-node/events-0.1.1" sources."@whatwg-node/fetch-0.9.14" sources."@whatwg-node/node-fetch-0.5.0" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."argparse-2.0.1" @@ -79710,7 +79572,7 @@ in sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."chalk-2.4.2" sources."cliui-7.0.4" (sources."code-red-1.0.4" // { @@ -79725,6 +79587,7 @@ in sources."core-js-2.6.12" sources."cosmiconfig-8.3.6" sources."cosmiconfig-toml-loader-1.0.0" + sources."cross-inspect-1.0.0" sources."css-tree-2.3.1" sources."dataloader-2.2.2" sources."debug-4.3.4" @@ -79733,7 +79596,7 @@ in sources."dir-glob-3.0.1" sources."dotenv-10.0.0" sources."dset-3.1.3" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."error-ex-1.3.2" @@ -79780,7 +79643,7 @@ in sources."is-number-7.0.0" sources."is-reference-3.0.2" sources."isomorphic-ws-5.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsesc-2.5.2" @@ -80150,18 +80013,7 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."cliui-3.2.0" @@ -80210,18 +80062,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."expand-tilde-2.0.2" @@ -80298,13 +80139,13 @@ in sources."interpret-1.4.0" sources."invert-kv-1.0.0" sources."is-absolute-1.0.0" - sources."is-accessor-descriptor-1.0.0" + sources."is-accessor-descriptor-1.0.1" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-core-module-2.13.1" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -80361,13 +80202,7 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) @@ -80436,18 +80271,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -80473,18 +80297,7 @@ in (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."stream-exhaust-1.0.2" @@ -80597,10 +80410,7 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - sources."is-descriptor-0.1.6" - sources."kind-of-3.2.2" + sources."is-descriptor-0.1.7" ]; }) sources."cliui-3.2.0" @@ -80634,10 +80444,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - sources."is-descriptor-0.1.6" - sources."kind-of-3.2.2" + sources."is-descriptor-0.1.7" ]; }) sources."expand-tilde-2.0.2" @@ -80703,24 +80510,12 @@ in sources."interpret-1.4.0" sources."invert-kv-1.0.0" sources."is-absolute-1.0.0" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-accessor-descriptor-1.0.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-core-module-2.13.1" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -80783,13 +80578,7 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) @@ -80847,10 +80636,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - sources."is-descriptor-0.1.6" - sources."kind-of-3.2.2" + sources."is-descriptor-0.1.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -80876,10 +80662,7 @@ in (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - sources."is-descriptor-0.1.6" - sources."kind-of-3.2.2" + sources."is-descriptor-0.1.7" ]; }) sources."string-width-1.0.2" @@ -81219,7 +81002,7 @@ in sources."process-nextick-args-2.0.1" sources."promise-7.3.1" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."q-1.5.1" sources."qs-6.5.3" sources."rc-1.2.8" @@ -81451,8 +81234,8 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.11.0" - sources."@types/node-20.8.9" - sources."@types/node-fetch-2.6.7" + sources."@types/node-20.8.10" + sources."@types/node-fetch-2.6.8" sources."@types/tunnel-0.0.3" sources."@vscode/l10n-0.0.16" sources."abbrev-1.1.1" @@ -81532,7 +81315,7 @@ in sources."form-data-4.0.0" (sources."fs-extra-11.1.1" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) (sources."fs-minipass-2.1.0" // { @@ -81570,7 +81353,7 @@ in sources."json-stringify-safe-5.0.1" (sources."jsonfile-6.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."jsprim-1.4.2" @@ -81613,7 +81396,7 @@ in sources."protobufjs-7.2.5" sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -81835,10 +81618,11 @@ in sources."@aws-sdk/service-error-classification-3.296.0" sources."@aws-sdk/shared-ini-file-loader-3.296.0" sources."@aws-sdk/signature-v4-3.296.0" - (sources."@aws-sdk/signature-v4-crt-3.433.0" // { + (sources."@aws-sdk/signature-v4-crt-3.438.0" // { dependencies = [ - sources."@aws-sdk/signature-v4-multi-region-3.433.0" + sources."@aws-sdk/signature-v4-multi-region-3.437.0" sources."@aws-sdk/types-3.433.0" + sources."@aws-sdk/util-user-agent-node-3.437.0" ]; }) sources."@aws-sdk/signature-v4-multi-region-3.296.0" @@ -81903,8 +81687,11 @@ in sources."@npmcli/move-file-1.1.2" sources."@smithy/eventstream-codec-2.0.12" sources."@smithy/is-array-buffer-2.0.0" + sources."@smithy/node-config-provider-2.1.3" + sources."@smithy/property-provider-2.0.13" sources."@smithy/protocol-http-3.0.8" sources."@smithy/querystring-parser-2.0.12" + sources."@smithy/shared-ini-file-loader-2.2.2" sources."@smithy/signature-v4-2.0.12" sources."@smithy/types-2.4.0" sources."@smithy/util-buffer-from-2.0.0" @@ -81914,7 +81701,7 @@ in sources."@smithy/util-utf8-2.0.0" sources."@tootallnate/once-2.0.0" sources."@types/nanoid-3.0.0" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/ws-8.5.8" sources."abab-2.0.6" sources."abbrev-1.1.1" @@ -81945,7 +81732,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-crt-1.18.2" + sources."aws-crt-1.18.3" (sources."aws-sdk-2.1340.0" // { dependencies = [ sources."buffer-4.9.2" @@ -82187,7 +81974,7 @@ in (sources."fs-extra-11.1.1" // { dependencies = [ sources."jsonfile-6.1.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) (sources."fs-minipass-2.1.0" // { @@ -82530,7 +82317,7 @@ in sources."proper-lockfile-4.1.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."query-string-7.1.3" sources."querystring-0.2.0" @@ -82626,7 +82413,7 @@ in }) sources."statuses-1.5.0" sources."stream-shift-1.0.1" - sources."streamx-2.15.1" + sources."streamx-2.15.2" sources."strict-uri-encode-2.0.0" sources."string-kit-0.17.10" sources."string-padding-1.0.2" @@ -83034,7 +82821,7 @@ in sources."object-inspect-1.13.1" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" @@ -83298,19 +83085,8 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."isobject-3.0.1" - sources."kind-of-5.1.0" ]; }) sources."cli-boxes-1.0.0" @@ -83442,25 +83218,13 @@ in sources."ini-1.3.8" sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-accessor-descriptor-1.0.1" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-core-module-2.13.1" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -83548,13 +83312,7 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" ]; }) sources."object-inspect-1.13.1" @@ -83596,7 +83354,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -83637,21 +83395,7 @@ in sources."extend-shallow-2.0.1" ]; }) - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -83706,18 +83450,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -83739,18 +83472,7 @@ in (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."statuses-2.0.1" @@ -83864,7 +83586,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.38.0" // { + (sources."@putdotio/api-client-8.39.0" // { dependencies = [ sources."axios-0.21.4" ]; @@ -84001,7 +83723,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pkg-up-3.1.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -84176,7 +83898,7 @@ in sources."abab-2.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-8.10.0" + sources."acorn-8.11.2" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -84225,7 +83947,7 @@ in sources."bufferutil-4.0.8" sources."bytes-3.1.2" sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."canvas-2.11.2" sources."chalk-2.4.2" sources."chardet-1.6.1" @@ -84246,7 +83968,7 @@ in sources."convert-source-map-2.0.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.33.1" + sources."core-js-3.33.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -84285,7 +84007,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -84340,7 +84062,7 @@ in sources."fs-constants-1.0.0" (sources."fs-extra-9.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) (sources."fs-minipass-2.1.0" // { @@ -84438,7 +84160,7 @@ in sources."json5-2.2.3" (sources."jsonfile-6.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."kind-of-6.0.3" @@ -84560,7 +84282,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."pvtsutils-1.3.5" sources."pvutils-1.1.3" sources."qs-6.11.0" @@ -84786,50 +84508,13 @@ in bypassCache = true; reconstructLock = true; }; - lean-language-server = nodeEnv.buildNodePackage { - name = "lean-language-server"; - packageName = "lean-language-server"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lean-language-server/-/lean-language-server-3.4.0.tgz"; - sha512 = "Qb4+jCU2V06LfQVApyyzXlzG8H0KlKUO9HqJmWq8BMxSvfXpnGxGRyKRoQEcBHNJl6Y2+UXQCo0/mEVy13DwnA=="; - }; - dependencies = [ - sources."@types/node-16.18.59" - (sources."lean-client-js-core-3.3.1" // { - dependencies = [ - sources."@types/node-9.6.61" - ]; - }) - (sources."lean-client-js-node-3.3.1" // { - dependencies = [ - sources."@types/node-9.6.61" - ]; - }) - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-7.0.0" - sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.16.0" - sources."vscode-uri-3.0.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Language Server Protocol server for Lean 3"; - homepage = "https://github.com/leanprover/lean-client-js#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "7.4.1"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-7.4.1.tgz"; - sha512 = "c6sOO0dlJU689vStIsko+zjRdn2fJOWH8aNjePLNv2AubAdABKqfrDCpE2H/Q7+O80Duo68ZQtWYkUUk7hRWDw=="; + url = "https://registry.npmjs.org/lerna/-/lerna-7.4.2.tgz"; + sha512 = "gxavfzHfJ4JL30OvMunmlm4Anw7d7Tq6tdVHzUukLdS9nWnxCN/QB21qR+VJYp5tcyXogHKbdUEGh6qmeyzxSA=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -84853,21 +84538,36 @@ in sources."supports-color-5.5.0" ]; }) + sources."@gar/promisify-1.1.3" sources."@hutson/parse-repository-url-3.0.2" - sources."@isaacs/cliui-8.0.2" + (sources."@isaacs/cliui-8.0.2" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.2.1" + sources."emoji-regex-9.2.2" + sources."string-width-5.1.2" + sources."strip-ansi-7.1.0" + sources."wrap-ansi-8.1.0" + ]; + }) sources."@jest/schemas-29.6.3" - sources."@lerna/child-process-7.4.1" - sources."@lerna/create-7.4.1" + sources."@lerna/child-process-7.4.2" + sources."@lerna/create-7.4.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-3.1.0" + sources."@npmcli/fs-2.1.2" sources."@npmcli/git-4.1.0" (sources."@npmcli/installed-package-contents-2.0.2" // { dependencies = [ sources."npm-bundled-3.0.0" ]; }) + (sources."@npmcli/move-file-2.0.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.2" @@ -84900,7 +84600,38 @@ in sources."@parcel/watcher-2.0.4" sources."@sigstore/bundle-1.1.0" sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" + (sources."@sigstore/sign-1.0.0" // { + dependencies = [ + sources."@npmcli/fs-3.1.0" + sources."brace-expansion-2.0.1" + (sources."cacache-17.1.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."glob-10.3.10" + sources."make-fetch-happen-11.1.1" + sources."minimatch-9.0.3" + sources."minipass-5.0.0" + (sources."minipass-fetch-3.0.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."ssri-10.0.5" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" + ]; + }) sources."@sigstore/tuf-1.0.3" sources."@sinclair/typebox-0.27.8" sources."@swc-node/core-1.10.6" @@ -84942,7 +84673,7 @@ in ]; }) sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" + sources."ansi-styles-4.3.0" sources."aproba-2.0.0" sources."are-we-there-yet-3.0.1" sources."argparse-2.0.1" @@ -84952,7 +84683,7 @@ in sources."arrify-1.0.1" sources."async-3.2.4" sources."asynckit-0.4.0" - sources."axios-1.5.1" + sources."axios-1.6.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."before-after-hook-2.2.3" @@ -84963,23 +84694,24 @@ in sources."buffer-from-1.1.2" sources."builtins-1.0.3" sources."byte-size-8.1.1" - (sources."cacache-17.1.4" // { + (sources."cacache-16.1.3" // { dependencies = [ sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" - sources."ssri-10.0.5" + sources."glob-8.1.0" + sources."minimatch-5.1.6" + (sources."rimraf-3.0.2" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."glob-7.2.3" + sources."minimatch-3.1.2" + ]; + }) ]; }) sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - (sources."chalk-4.1.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - ]; - }) + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."ci-info-3.9.0" @@ -84989,10 +84721,6 @@ in sources."cli-width-3.0.0" (sources."cliui-8.0.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" sources."wrap-ansi-7.0.0" ]; }) @@ -85007,17 +84735,13 @@ in sources."color-name-1.1.4" sources."color-support-1.1.3" sources."colorette-2.0.20" - (sources."columnify-1.6.0" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."columnify-1.6.0" sources."combined-stream-1.0.8" sources."compare-func-2.0.0" sources."concat-map-0.0.1" sources."concat-stream-2.0.0" sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-6.0.0" + sources."conventional-changelog-angular-7.0.0" sources."conventional-changelog-core-5.0.1" sources."conventional-changelog-preset-loader-3.0.0" sources."conventional-changelog-writer-6.0.1" @@ -85067,12 +84791,8 @@ in sources."duplexer-0.1.2" sources."eastasianwidth-0.2.0" sources."ejs-3.1.9" - sources."emoji-regex-9.2.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) + sources."emoji-regex-8.0.0" + sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."env-paths-2.2.1" @@ -85087,6 +84807,7 @@ in sources."exponential-backoff-3.1.1" (sources."external-editor-3.1.0" // { dependencies = [ + sources."iconv-lite-0.4.24" sources."tmp-0.0.33" ]; }) @@ -85111,20 +84832,10 @@ in sources."form-data-4.0.0" sources."fs-constants-1.0.0" sources."fs-extra-11.1.1" - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" - (sources."gauge-4.0.4" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."gauge-4.0.4" sources."get-caller-file-2.0.5" (sources."get-pkg-repo-4.2.1" // { dependencies = [ @@ -85163,7 +84874,7 @@ in sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."ignore-5.2.4" (sources."ignore-walk-5.0.1" // { @@ -85180,6 +84891,7 @@ in sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -85191,13 +84903,8 @@ in }) (sources."inquirer-8.2.6" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."chalk-4.1.2" - sources."emoji-regex-8.0.0" sources."mute-stream-0.0.8" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-6.2.0" ]; }) sources."ip-2.0.0" @@ -85268,15 +84975,7 @@ in sources."log-symbols-4.1.0" sources."lru-cache-7.18.3" sources."make-dir-4.0.0" - (sources."make-fetch-happen-11.1.1" // { - dependencies = [ - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - ]; - }) + sources."make-fetch-happen-10.2.1" sources."map-obj-4.3.0" (sources."meow-8.1.2" // { dependencies = [ @@ -85304,42 +85003,14 @@ in sources."minimatch-3.0.5" sources."minimist-1.2.8" sources."minimist-options-4.1.0" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) + sources."minipass-3.3.6" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-2.1.2" + sources."minipass-flush-1.0.5" + sources."minipass-json-stream-1.0.1" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."modify-values-1.0.1" sources."ms-2.1.3" @@ -85353,7 +85024,7 @@ in sources."neo-async-2.6.2" sources."node-addon-api-3.2.1" sources."node-fetch-2.6.7" - (sources."node-gyp-9.4.0" // { + (sources."node-gyp-9.4.1" // { dependencies = [ sources."rimraf-3.0.2" sources."which-2.0.2" @@ -85398,8 +85069,36 @@ in }) (sources."npm-registry-fetch-14.0.5" // { dependencies = [ + sources."@npmcli/fs-3.1.0" + sources."brace-expansion-2.0.1" + (sources."cacache-17.1.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."glob-10.3.10" sources."hosted-git-info-6.1.1" + sources."make-fetch-happen-11.1.1" + sources."minimatch-9.0.3" + sources."minipass-5.0.0" + (sources."minipass-fetch-3.0.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) sources."npm-package-arg-10.1.0" + (sources."ssri-10.0.5" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" ]; }) sources."npm-run-path-4.0.1" @@ -85407,13 +85106,10 @@ in (sources."nx-16.10.0" // { dependencies = [ sources."cli-spinners-2.6.1" - sources."emoji-regex-8.0.0" sources."glob-7.1.4" sources."lines-and-columns-2.0.3" sources."lru-cache-6.0.0" sources."semver-7.5.3" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" ]; @@ -85421,11 +85117,7 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.4.2" - (sources."ora-5.4.1" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."p-limit-2.3.0" @@ -85440,10 +85132,23 @@ in sources."p-waterfall-2.1.1" (sources."pacote-15.2.0" // { dependencies = [ + sources."@npmcli/fs-3.1.0" sources."brace-expansion-2.0.1" + (sources."cacache-17.1.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."glob-10.3.10" sources."hosted-git-info-6.1.1" sources."ignore-walk-6.0.3" sources."minimatch-9.0.3" + sources."minipass-5.0.0" sources."npm-package-arg-10.1.0" sources."npm-packlist-7.0.4" (sources."ssri-10.0.5" // { @@ -85451,6 +85156,8 @@ in sources."minipass-7.0.4" ]; }) + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" ]; }) sources."parent-module-1.0.1" @@ -85468,6 +85175,7 @@ in (sources."path-scurry-1.10.1" // { dependencies = [ sources."lru-cache-10.0.1" + sources."minipass-7.0.4" ]; }) (sources."path-type-3.0.0" // { @@ -85502,6 +85210,7 @@ in sources."glob-10.3.10" sources."hosted-git-info-6.1.1" sources."minimatch-9.0.3" + sources."minipass-7.0.4" sources."normalize-package-data-5.0.0" ]; }) @@ -85557,7 +85266,38 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."sigstore-1.9.0" + (sources."sigstore-1.9.0" // { + dependencies = [ + sources."@npmcli/fs-3.1.0" + sources."brace-expansion-2.0.1" + (sources."cacache-17.1.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."glob-10.3.10" + sources."make-fetch-happen-11.1.1" + sources."minimatch-9.0.3" + sources."minipass-5.0.0" + (sources."minipass-fetch-3.0.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."ssri-10.0.5" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" + ]; + }) sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" @@ -85572,24 +85312,11 @@ in sources."split-1.0.1" sources."split2-3.2.2" sources."sprintf-js-1.0.3" - (sources."ssri-9.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - 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."ssri-9.0.1" + sources."string-width-4.2.3" + sources."string-width-cjs-4.2.3" sources."string_decoder-1.3.0" - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) + sources."strip-ansi-6.0.1" sources."strip-ansi-cjs-6.0.1" sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" @@ -85597,12 +85324,7 @@ in sources."strong-log-transformer-2.1.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."tar-6.1.11" // { - dependencies = [ - sources."fs-minipass-2.1.0" - sources."minipass-3.3.6" - ]; - }) + sources."tar-6.1.11" sources."tar-stream-2.2.0" sources."temp-dir-1.0.0" sources."text-extensions-1.9.0" @@ -85624,15 +85346,46 @@ in sources."trim-newlines-3.0.1" sources."tsconfig-paths-4.2.0" sources."tslib-2.6.2" - sources."tuf-js-1.1.7" + (sources."tuf-js-1.1.7" // { + dependencies = [ + sources."@npmcli/fs-3.1.0" + sources."brace-expansion-2.0.1" + (sources."cacache-17.1.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."fs-minipass-3.0.3" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."glob-10.3.10" + sources."make-fetch-happen-11.1.1" + sources."minimatch-9.0.3" + sources."minipass-5.0.0" + (sources."minipass-fetch-3.0.4" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + (sources."ssri-10.0.5" // { + dependencies = [ + sources."minipass-7.0.4" + ]; + }) + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" + ]; + }) sources."type-fest-0.18.1" sources."typedarray-0.0.6" sources."typescript-5.2.2" sources."uglify-js-3.17.4" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" + sources."unique-filename-2.0.1" + sources."unique-slug-3.0.0" sources."universal-user-agent-6.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."upath-2.0.1" sources."util-deprecate-1.0.2" sources."uuid-9.0.1" @@ -85647,23 +85400,10 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-3.0.1" - (sources."wide-align-1.1.5" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wide-align-1.1.5" sources."wordwrap-1.0.0" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wrap-ansi-6.2.0" + sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" (sources."write-file-atomic-5.0.1" // { dependencies = [ @@ -85688,11 +85428,7 @@ in sources."yallist-4.0.0" (sources."yargs-16.2.0" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."cliui-7.0.4" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" sources."wrap-ansi-7.0.0" ]; }) @@ -85816,18 +85552,7 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."collection-visit-1.0.0" @@ -85852,19 +85577,8 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" ]; }) sources."extend-shallow-3.0.2" @@ -85889,6 +85603,7 @@ in sources."fresh-0.5.2" sources."from-0.1.7" sources."fsevents-1.2.13" + sources."function-bind-1.1.2" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { dependencies = [ @@ -85902,6 +85617,7 @@ in sources."kind-of-4.0.0" ]; }) + sources."hasown-2.0.0" sources."http-auth-3.1.3" (sources."http-errors-2.0.0" // { dependencies = [ @@ -85910,11 +85626,11 @@ in }) sources."http-parser-js-0.5.8" sources."inherits-2.0.4" - sources."is-accessor-descriptor-1.0.0" + sources."is-accessor-descriptor-1.0.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -85947,13 +85663,7 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) @@ -86007,19 +85717,8 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -86040,18 +85739,7 @@ in (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."statuses-1.5.0" @@ -86159,19 +85847,8 @@ in (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" + sources."is-descriptor-0.1.7" sources."isobject-3.0.1" - sources."kind-of-5.1.0" ]; }) sources."collection-visit-1.0.0" @@ -86295,23 +85972,11 @@ in sources."inherits-2.0.4" sources."innertext-1.0.3" sources."ipaddr.js-1.9.1" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-accessor-descriptor-1.0.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) + sources."is-data-descriptor-1.0.1" + sources."is-descriptor-1.0.3" sources."is-dotfile-1.0.3" sources."is-equal-shallow-0.1.3" sources."is-extendable-0.1.1" @@ -86375,13 +86040,7 @@ in (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" ]; }) sources."object-inspect-1.13.1" @@ -86411,7 +86070,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -86448,21 +86107,7 @@ in sources."extend-shallow-2.0.1" ]; }) - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) + sources."is-descriptor-0.1.7" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -86506,18 +86151,7 @@ in dependencies = [ sources."define-property-0.2.5" sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -86558,18 +86192,7 @@ in (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."is-descriptor-0.1.7" ]; }) sources."statuses-2.0.1" @@ -86699,7 +86322,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.7" sources."@types/get-stdin-5.0.1" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -86807,7 +86430,7 @@ in sources."parse5-7.1.2" sources."parse5-htmlparser2-tree-adapter-7.0.0" sources."progress-2.0.3" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."safer-buffer-2.1.2" sources."sax-1.3.0" ]; @@ -87040,7 +86663,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-1.1.8" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."readable-stream-2.3.8" sources."readline-1.3.0" @@ -87268,7 +86891,7 @@ in sources."prelude-ls-1.1.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."request-2.88.2" sources."request-promise-core-1.1.4" @@ -87544,7 +87167,7 @@ in sources."object-inspect-1.13.1" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" @@ -87648,97 +87271,62 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "9.4.0"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz"; - sha512 = "dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.0.tgz"; + sha512 = "LkaKUbjyacJGRHiuhUeUblzZNxTF1/XNooyAl6aiaJ6ZpeurR4Mk9sjxncGNSI7pETqyqM+hLAER0788oSxt0A=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" + sources."@npmcli/agent-2.2.0" sources."@npmcli/fs-3.1.0" - sources."@tootallnate/once-2.0.0" - sources."abbrev-1.1.1" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" + sources."abbrev-2.0.0" + sources."agent-base-7.1.0" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" sources."ansi-styles-6.2.1" - sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" - ]; - }) + sources."brace-expansion-2.0.1" + sources."cacache-18.0.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."cross-spawn-7.0.3" - (sources."debug-4.3.4" // { + (sources."cross-spawn-7.0.3" // { dependencies = [ - sources."ms-2.1.2" + sources."which-2.0.2" ]; }) - sources."delegates-1.0.0" + sources."debug-4.3.4" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."exponential-backoff-3.1.1" sources."foreground-child-3.1.1" - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - sources."fs.realpath-1.0.0" - (sources."gauge-4.0.4" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."signal-exit-3.0.7" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."glob-7.2.3" + sources."fs-minipass-3.0.3" + sources."glob-10.3.10" sources."graceful-fs-4.2.11" - sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" + sources."http-proxy-agent-7.0.0" + sources."https-proxy-agent-7.0.2" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."ip-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" sources."jackspeak-2.3.6" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."minimatch-3.1.2" - sources."minipass-5.0.0" + sources."lru-cache-10.0.1" + sources."make-fetch-happen-13.0.0" + sources."minimatch-9.0.3" + sources."minipass-7.0.4" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" ]; }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."minipass-fetch-3.0.4" (sources."minipass-flush-1.0.5" // { dependencies = [ sources."minipass-3.3.6" @@ -87760,41 +87348,27 @@ in ]; }) sources."mkdirp-1.0.4" - sources."ms-2.1.3" + sources."ms-2.1.2" sources."negotiator-0.6.3" - sources."nopt-6.0.0" - sources."npmlog-6.0.2" - sources."once-1.4.0" + sources."nopt-7.2.0" sources."p-map-4.0.0" - sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) + sources."path-scurry-1.10.1" + sources."proc-log-3.0.0" sources."promise-retry-2.0.1" - sources."readable-stream-3.6.2" sources."retry-0.12.0" - sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" (sources."semver-7.5.4" // { dependencies = [ sources."lru-cache-6.0.0" ]; }) - sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."socks-proxy-agent-8.0.2" + sources."ssri-10.0.5" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { dependencies = [ @@ -87802,7 +87376,6 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."string_decoder-1.3.0" (sources."strip-ansi-7.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -87816,17 +87389,14 @@ in sources."minipass-3.3.6" ]; }) + sources."minipass-5.0.0" ]; }) sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" - sources."util-deprecate-1.0.2" - sources."which-2.0.2" - (sources."wide-align-1.1.5" // { + (sources."which-4.0.0" // { dependencies = [ - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" + sources."isexe-3.1.1" ]; }) sources."wrap-ansi-8.1.0" @@ -87838,7 +87408,6 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."wrappy-1.0.2" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -88113,7 +87682,7 @@ in sources."fresh-0.5.2" (sources."fs-extra-11.1.1" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) (sources."fs-minipass-2.1.0" // { @@ -88170,7 +87739,7 @@ in sources."jsonata-1.8.6" (sources."jsonfile-6.1.0" // { dependencies = [ - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."keyv-4.5.4" @@ -88270,7 +87839,7 @@ in sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."querystringify-2.2.0" sources."quick-lru-5.1.1" @@ -88502,7 +88071,7 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" (sources."readable-stream-2.3.8" // { dependencies = [ @@ -88676,11 +88245,11 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/normalize-package-data-2.4.3" sources."@types/responselike-1.0.2" sources."aggregate-error-4.0.1" - sources."all-package-names-2.0.770" + sources."all-package-names-2.0.771" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -89256,10 +88825,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "10.2.1"; + version = "10.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-10.2.1.tgz"; - sha512 = "YVh8UDw5lR2bPS6rrS0aPG9ZXKDWeaeO/zMoZMp7g3Thrho9cqEnSrcvg4Pic2QhDAQptAynx5KgrPgCSRscqg=="; + url = "https://registry.npmjs.org/npm/-/npm-10.2.2.tgz"; + sha512 = "VSP/rh88wBQ+b7bz0NOdZQBQCuWLI/etpWfgUWDmNaMy0MuD1xJBMofEzuFojNpJANVaJCkN5U7KgfPdR2V1fg=="; }; buildInputs = globalBuildInputs; meta = { @@ -89402,11 +88971,11 @@ in sources."@types/es-aggregate-error-1.0.4" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/sarif-2.1.6" sources."@types/urijs-1.19.22" sources."abort-controller-3.0.0" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."ajv-8.12.0" sources."ajv-draft-04-1.0.0" sources."ajv-errors-3.0.0" @@ -89638,7 +89207,7 @@ in sources."picomatch-2.3.1" sources."pony-cause-1.1.1" sources."printable-characters-1.0.42" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."reftools-1.1.9" @@ -89696,7 +89265,7 @@ in sources."typescript-5.2.2" sources."unbox-primitive-1.0.2" sources."undici-types-5.26.5" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."urijs-1.19.11" sources."utility-types-3.10.0" @@ -89730,10 +89299,10 @@ in parcel = nodeEnv.buildNodePackage { name = "parcel"; packageName = "parcel"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/parcel/-/parcel-2.10.1.tgz"; - sha512 = "BvsKk8Fg9z1BBLny3IJmm7qM7ux+aD0iXVbzaBhurdbsj0UuWYsa6krLnK/+udwGiLPmicldqjtjDimSuLIwmQ=="; + url = "https://registry.npmjs.org/parcel/-/parcel-2.10.2.tgz"; + sha512 = "wRvsK9v12Nt2/EIjLp/uvxd3UeRSN9DRoSofDn21Ot+rEw4e98ODvbdSHi6dYr82s4oo6mF823ACmOp1hXd4wg=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -89762,73 +89331,73 @@ in sources."@lmdb/lmdb-linux-x64-2.8.5" sources."@lmdb/lmdb-win32-x64-2.8.5" sources."@mischnic/json-sourcemap-0.1.1" - sources."@parcel/bundler-default-2.10.1" - sources."@parcel/cache-2.10.1" - sources."@parcel/codeframe-2.10.1" - sources."@parcel/compressor-raw-2.10.1" - sources."@parcel/config-default-2.10.1" - sources."@parcel/core-2.10.1" - sources."@parcel/diagnostic-2.10.1" - sources."@parcel/events-2.10.1" - sources."@parcel/fs-2.10.1" - sources."@parcel/graph-3.0.1" - sources."@parcel/logger-2.10.1" - sources."@parcel/markdown-ansi-2.10.1" - sources."@parcel/namer-default-2.10.1" - sources."@parcel/node-resolver-core-3.1.1" - sources."@parcel/optimizer-css-2.10.1" - sources."@parcel/optimizer-htmlnano-2.10.1" - sources."@parcel/optimizer-image-2.10.1" - sources."@parcel/optimizer-svgo-2.10.1" - sources."@parcel/optimizer-swc-2.10.1" - sources."@parcel/package-manager-2.10.1" - sources."@parcel/packager-css-2.10.1" - sources."@parcel/packager-html-2.10.1" - sources."@parcel/packager-js-2.10.1" - sources."@parcel/packager-raw-2.10.1" - sources."@parcel/packager-svg-2.10.1" - sources."@parcel/packager-wasm-2.10.1" - sources."@parcel/plugin-2.10.1" - sources."@parcel/profiler-2.10.1" - sources."@parcel/reporter-cli-2.10.1" - sources."@parcel/reporter-dev-server-2.10.1" - sources."@parcel/reporter-tracer-2.10.1" - sources."@parcel/resolver-default-2.10.1" - sources."@parcel/runtime-browser-hmr-2.10.1" - sources."@parcel/runtime-js-2.10.1" - sources."@parcel/runtime-react-refresh-2.10.1" - sources."@parcel/runtime-service-worker-2.10.1" - sources."@parcel/rust-2.10.1" + sources."@parcel/bundler-default-2.10.2" + sources."@parcel/cache-2.10.2" + sources."@parcel/codeframe-2.10.2" + sources."@parcel/compressor-raw-2.10.2" + sources."@parcel/config-default-2.10.2" + sources."@parcel/core-2.10.2" + sources."@parcel/diagnostic-2.10.2" + sources."@parcel/events-2.10.2" + sources."@parcel/fs-2.10.2" + sources."@parcel/graph-3.0.2" + sources."@parcel/logger-2.10.2" + sources."@parcel/markdown-ansi-2.10.2" + sources."@parcel/namer-default-2.10.2" + sources."@parcel/node-resolver-core-3.1.2" + sources."@parcel/optimizer-css-2.10.2" + sources."@parcel/optimizer-htmlnano-2.10.2" + sources."@parcel/optimizer-image-2.10.2" + sources."@parcel/optimizer-svgo-2.10.2" + sources."@parcel/optimizer-swc-2.10.2" + sources."@parcel/package-manager-2.10.2" + sources."@parcel/packager-css-2.10.2" + sources."@parcel/packager-html-2.10.2" + sources."@parcel/packager-js-2.10.2" + sources."@parcel/packager-raw-2.10.2" + sources."@parcel/packager-svg-2.10.2" + sources."@parcel/packager-wasm-2.10.2" + sources."@parcel/plugin-2.10.2" + sources."@parcel/profiler-2.10.2" + sources."@parcel/reporter-cli-2.10.2" + sources."@parcel/reporter-dev-server-2.10.2" + sources."@parcel/reporter-tracer-2.10.2" + sources."@parcel/resolver-default-2.10.2" + sources."@parcel/runtime-browser-hmr-2.10.2" + sources."@parcel/runtime-js-2.10.2" + sources."@parcel/runtime-react-refresh-2.10.2" + sources."@parcel/runtime-service-worker-2.10.2" + sources."@parcel/rust-2.10.2" (sources."@parcel/source-map-2.1.1" // { dependencies = [ sources."detect-libc-1.0.3" ]; }) - sources."@parcel/transformer-babel-2.10.1" - sources."@parcel/transformer-css-2.10.1" - (sources."@parcel/transformer-html-2.10.1" // { + sources."@parcel/transformer-babel-2.10.2" + sources."@parcel/transformer-css-2.10.2" + (sources."@parcel/transformer-html-2.10.2" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-image-2.10.1" - sources."@parcel/transformer-js-2.10.1" - sources."@parcel/transformer-json-2.10.1" - sources."@parcel/transformer-postcss-2.10.1" - (sources."@parcel/transformer-posthtml-2.10.1" // { + sources."@parcel/transformer-image-2.10.2" + sources."@parcel/transformer-js-2.10.2" + sources."@parcel/transformer-json-2.10.2" + sources."@parcel/transformer-postcss-2.10.2" + (sources."@parcel/transformer-posthtml-2.10.2" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-raw-2.10.1" - sources."@parcel/transformer-react-refresh-wrap-2.10.1" - (sources."@parcel/transformer-svg-2.10.1" // { + sources."@parcel/transformer-raw-2.10.2" + sources."@parcel/transformer-react-refresh-wrap-2.10.2" + (sources."@parcel/transformer-svg-2.10.2" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/types-2.10.1" - sources."@parcel/utils-2.10.1" + sources."@parcel/types-2.10.2" + sources."@parcel/utils-2.10.2" (sources."@parcel/watcher-2.3.0" // { dependencies = [ sources."detect-libc-1.0.3" @@ -89847,7 +89416,7 @@ in sources."@parcel/watcher-win32-arm64-2.3.0" sources."@parcel/watcher-win32-ia32-2.3.0" sources."@parcel/watcher-win32-x64-2.3.0" - sources."@parcel/workers-2.10.1" + sources."@parcel/workers-2.10.2" sources."@swc/core-1.3.95" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" @@ -89855,7 +89424,7 @@ in sources."@trysound/sax-0.2.0" sources."abab-2.0.6" sources."abortcontroller-polyfill-1.7.5" - sources."acorn-8.10.0" + sources."acorn-8.11.2" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.2" @@ -89883,7 +89452,7 @@ in sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -89933,7 +89502,7 @@ in sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."entities-4.5.0" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -90094,7 +89663,7 @@ in sources."posthtml-render-3.0.0" sources."prelude-ls-1.1.2" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" (sources."purgecss-5.0.0" // { dependencies = [ sources."commander-9.5.0" @@ -90136,7 +89705,7 @@ in }) sources."symbol-tree-3.2.4" sources."term-size-2.2.1" - (sources."terser-5.22.0" // { + (sources."terser-5.24.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -90388,7 +89957,7 @@ in sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."range-parser-1.2.1" (sources."raw-body-2.5.1" // { @@ -90546,7 +90115,7 @@ in sources."supports-color-7.2.0" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."which-2.0.2" sources."wrappy-1.0.2" sources."yallist-4.0.0" @@ -91157,7 +90726,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.1" @@ -91434,7 +91003,7 @@ in sources."@types/node-20.5.9" sources."@types/normalize-package-data-2.4.3" sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.32" + sources."@types/react-18.2.34" sources."@types/react-dom-18.2.14" sources."@types/scheduler-0.16.5" sources."@types/semver-7.5.4" @@ -91453,9 +91022,9 @@ in sources."@vue/compiler-ssr-3.3.7" sources."@vue/reactivity-transform-3.3.7" sources."@vue/shared-3.3.7" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" - sources."acorn-walk-8.2.0" + sources."acorn-walk-8.3.0" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -91487,7 +91056,7 @@ in sources."call-bind-1.0.5" sources."callsites-3.1.0" sources."camelcase-css-2.0.1" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."chalk-2.4.2" sources."chokidar-3.5.3" sources."ci-info-3.9.0" @@ -91535,7 +91104,7 @@ in sources."dir-glob-3.0.1" sources."dlv-1.1.3" sources."doctrine-3.0.0" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."errno-0.1.8" sources."error-ex-1.3.2" sources."es-abstract-1.22.3" @@ -91587,7 +91156,7 @@ in ]; }) sources."eslint-plugin-react-hooks-4.6.0" - sources."eslint-plugin-react-refresh-0.4.3" + sources."eslint-plugin-react-refresh-0.4.4" (sources."eslint-plugin-unicorn-48.0.1" // { dependencies = [ sources."jsesc-3.0.2" @@ -91692,7 +91261,7 @@ in sources."isexe-2.0.0" sources."iterator.prototype-1.1.2" sources."javascript-natural-sort-0.7.1" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsesc-2.5.2" @@ -91807,7 +91376,7 @@ in sources."prop-types-15.8.1" sources."proxy-from-env-1.1.0" sources."prr-1.0.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."react-18.2.0" sources."react-dom-18.2.0" @@ -91848,7 +91417,7 @@ in sources."safe-array-concat-1.0.1" sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" - sources."sass-1.69.4" + sources."sass-1.69.5" sources."sax-1.3.0" sources."scheduler-0.23.0" sources."semver-7.5.4" @@ -91896,7 +91465,7 @@ in sources."glob-parent-6.0.2" ]; }) - (sources."terser-5.22.0" // { + (sources."terser-5.24.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -92144,7 +91713,7 @@ in sources."sprintf-js-1.1.2" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.21.13" + sources."systeminformation-5.21.15" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" sources."tv4-1.3.0" @@ -92175,10 +91744,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "8.9.2"; + version = "8.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-8.9.2.tgz"; - sha512 = "udNf6RsqWFTa3EMDSj57LmdfpLVuIOjgnvB4+lU8GPiu1EBR57Nui43UNfl+sMRMT/O0T8fG+n0h4frBe75mHg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-8.10.2.tgz"; + sha512 = "B4IJPVumx62UYggbwe8HdQFqS0EJ7KHh/tzqbxEBQ69fUJk9s2xCfU+oxivjkgoyJNsS2nGdJGyhndnxgEjDPA=="; }; buildInputs = globalBuildInputs; meta = { @@ -92266,9 +91835,9 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.9" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" @@ -92336,7 +91905,7 @@ in sources."tslib-2.6.2" sources."typescript-5.2.2" sources."undici-types-5.26.5" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."v8-compile-cache-lib-3.0.1" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" @@ -92535,7 +92104,7 @@ in sources."browserslist-4.22.1" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -92548,7 +92117,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -93049,10 +92618,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.17.2"; + version = "0.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.17.2.tgz"; - sha512 = "HGl62LzelDrfJBmtuUdxAFuEbvt/geEtL/Bzpl/vpJitmYXfbDgOf245wn8rX6h4YgC2AzfVt4wWW+5aNGIsuw=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.17.3.tgz"; + sha512 = "d/1bf7YTtOu7l1Vw5ST++VlS6F27BFVHEz4v5yfVoANlNrknOprWqdztNG95AENn+7KAutTuo07lRR9jGLCEgg=="; }; dependencies = [ sources."isexe-2.0.0" @@ -93137,10 +92706,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.333"; + version = "1.1.334"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.333.tgz"; - sha512 = "oFHXvzvg2cU1enatWqI76+sjSi+McsUBIJ9aR5W6p4kU9Rrgu+MYfXX5aHEPaZE64Vz3sNbG7IelXuAVEkyk/A=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.334.tgz"; + sha512 = "EJoW78gXPeAWd0e86P8kSIbY1pO3JJxNYu2BRlv/ZflcMvCY+zpyamuQC5EcXxXtr1WzBdcQwfo/NIBqtQPEow=="; }; buildInputs = globalBuildInputs; meta = { @@ -93162,7 +92731,7 @@ in }; dependencies = [ sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.32" + sources."@types/react-18.2.34" sources."@types/scheduler-0.16.5" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" @@ -93300,10 +92869,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "4.6.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.6.1.tgz"; - sha512 = "1CW0auaXNPmwmvQ7TwpszwVxMi2Xr5cTS3J3EBC/HHgbPF32Dn7aiu/LKWDOGjMbaDwKQiGmfqcoGQ74HUHCMw=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-5.0.1.tgz"; + sha512 = "cgbEasV/Yh8QIRyCCiOHRtio6uxAwmOAhyr80vegX2P69/iwE1FX77EXJ9NAPvcODxoIyYrgvxAaPxR5TKcsFw=="; }; buildInputs = globalBuildInputs; meta = { @@ -93384,10 +92953,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "4.1.4"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-4.1.4.tgz"; - sha512 = "U8Yk1lQRKqCkDBip/pMYT+IKaN7b7UesK3fLSTuHBoBJacCE+oBqo/dfG/gkUdQNNB2OBmRP98cn2C2bkYZkyw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-4.2.0.tgz"; + sha512 = "deaMa9Z+jPVeBD2dKXv+h7EbdKte9++V2potc/ADqvVgEr6DEJ3ia9u0joarjC2lX/ubaCRYz3QVx0TzuVqAJA=="; }; buildInputs = globalBuildInputs; meta = { @@ -93402,7 +92971,7 @@ in "rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.3.1607"; + version = "0.3.1697"; src = ../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" @@ -93412,10 +92981,11 @@ in dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" + sources."strip-json-comments-3.1.1" ]; }) sources."@eslint/js-8.52.0" - sources."@hpcc-js/wasm-2.13.1" + sources."@hpcc-js/wasm-2.14.1" (sources."@humanwhocodes/config-array-0.11.13" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -93428,21 +92998,29 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@tootallnate/once-1.1.2" + sources."@tsconfig/strictest-2.0.2" sources."@types/json-schema-7.0.14" sources."@types/node-16.11.68" sources."@types/semver-7.5.4" - sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.62.0" - sources."@typescript-eslint/parser-5.62.0" - sources."@typescript-eslint/scope-manager-5.62.0" - sources."@typescript-eslint/type-utils-5.62.0" - sources."@typescript-eslint/types-5.62.0" - sources."@typescript-eslint/typescript-estree-5.62.0" - sources."@typescript-eslint/utils-5.62.0" - sources."@typescript-eslint/visitor-keys-5.62.0" + sources."@types/vscode-1.75.1" + sources."@typescript-eslint/eslint-plugin-6.9.1" + sources."@typescript-eslint/parser-6.9.1" + sources."@typescript-eslint/scope-manager-6.9.1" + sources."@typescript-eslint/type-utils-6.9.1" + sources."@typescript-eslint/types-6.9.1" + sources."@typescript-eslint/typescript-estree-6.9.1" + sources."@typescript-eslint/utils-6.9.1" + sources."@typescript-eslint/visitor-keys-6.9.1" sources."@ungap/structured-clone-1.2.0" sources."@vscode/test-electron-2.3.6" - sources."acorn-8.10.0" + (sources."@vscode/vsce-2.22.0" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."commander-6.2.1" + sources."minimatch-3.1.2" + ]; + }) + sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -93466,7 +93044,13 @@ in sources."buffer-crc32-0.2.13" sources."call-bind-1.0.5" sources."callsites-3.1.0" - sources."chalk-4.1.2" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) sources."cheerio-1.0.0-rc.12" sources."cheerio-select-2.1.0" sources."chownr-1.1.4" @@ -93477,7 +93061,6 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.3" - sources."cross-env-7.0.3" sources."cross-spawn-7.0.3" sources."css-select-5.1.0" sources."css-what-6.1.0" @@ -93497,7 +93080,11 @@ in sources."d3-force-3.0.0" sources."d3-format-3.1.0" sources."d3-geo-3.1.0" - sources."d3-graphviz-5.1.0" + (sources."d3-graphviz-5.1.0" // { + dependencies = [ + sources."@hpcc-js/wasm-2.13.1" + ]; + }) sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" sources."d3-path-3.1.0" @@ -93530,31 +93117,25 @@ in sources."end-of-stream-1.4.4" sources."entities-4.5.0" sources."escalade-3.1.1" - sources."escape-string-regexp-4.0.0" + sources."escape-string-regexp-1.0.5" (sources."eslint-8.52.0" // { dependencies = [ sources."brace-expansion-1.1.11" - sources."eslint-scope-7.2.2" - sources."estraverse-5.3.0" + sources."chalk-4.1.2" + sources."escape-string-regexp-4.0.0" sources."glob-parent-6.0.2" + sources."has-flag-4.0.0" sources."minimatch-3.1.2" + sources."supports-color-7.2.0" ]; }) sources."eslint-config-prettier-8.10.0" - sources."eslint-scope-5.1.1" + sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" sources."espree-9.6.1" - (sources."esquery-1.5.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" + sources."esquery-1.5.0" + sources."esrecurse-4.3.0" + sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."expand-template-2.0.3" sources."fast-deep-equal-3.1.3" @@ -93586,7 +93167,7 @@ in sources."globby-11.1.0" sources."gopd-1.0.1" sources."graphemer-1.4.0" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."has-property-descriptors-1.0.1" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" @@ -93617,6 +93198,7 @@ in sources."json-buffer-3.0.1" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" + sources."jsonc-parser-3.2.0" sources."jszip-3.10.1" sources."keytar-7.9.0" sources."keyv-4.5.4" @@ -93644,14 +93226,13 @@ in sources."mute-stream-0.0.8" sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" - sources."natural-compare-lite-1.4.0" sources."node-abi-3.51.0" sources."node-addon-api-4.3.0" sources."nth-check-2.1.1" sources."object-inspect-1.13.1" sources."once-1.4.0" sources."optionator-0.9.3" - (sources."ovsx-0.5.2" // { + (sources."ovsx-0.8.3" // { dependencies = [ sources."commander-6.2.1" ]; @@ -93675,17 +93256,13 @@ in sources."picomatch-2.3.1" sources."prebuild-install-7.1.1" sources."prelude-ls-1.2.1" - sources."prettier-2.8.8" + sources."prettier-3.0.3" sources."process-nextick-args-2.0.1" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."queue-microtask-1.2.3" - (sources."rc-1.2.8" // { - dependencies = [ - sources."strip-json-comments-2.0.1" - ]; - }) + sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-2.3.8" sources."require-directory-2.1.1" @@ -93710,8 +93287,8 @@ in sources."string-width-4.2.3" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" - sources."strip-json-comments-3.1.1" - sources."supports-color-7.2.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { dependencies = [ @@ -93721,38 +93298,19 @@ in sources."text-table-0.2.0" sources."tmp-0.2.1" sources."to-regex-range-5.0.1" + sources."ts-api-utils-1.0.3" sources."tslib-2.6.2" - (sources."tsutils-3.21.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.11" - sources."typescript-4.9.5" + sources."typescript-5.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.6" sources."uri-js-4.4.1" sources."url-join-4.0.1" sources."util-deprecate-1.0.2" - (sources."vsce-2.15.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."brace-expansion-1.1.11" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-6.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."minimatch-3.1.2" - sources."semver-5.7.2" - sources."supports-color-5.5.0" - ]; - }) sources."vscode-jsonrpc-8.1.0" sources."vscode-languageclient-8.1.0" sources."vscode-languageserver-protocol-3.17.3" @@ -93760,7 +93318,7 @@ in sources."which-2.0.2" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."xml2js-0.4.23" + sources."xml2js-0.5.0" sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -93780,10 +93338,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.69.4"; + version = "1.69.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.69.4.tgz"; - sha512 = "+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz"; + sha512 = "qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -93914,7 +93472,7 @@ in sources."path-is-inside-1.0.2" sources."path-key-3.1.1" sources."path-to-regexp-2.2.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."registry-auth-token-3.3.2" @@ -94004,33 +93562,33 @@ in sources."tslib-1.14.1" ]; }) - (sources."@aws-sdk/client-cloudformation-3.436.0" // { + (sources."@aws-sdk/client-cloudformation-3.441.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/client-sso-3.436.0" - sources."@aws-sdk/client-sts-3.436.0" - sources."@aws-sdk/core-3.436.0" + sources."@aws-sdk/client-sso-3.441.0" + sources."@aws-sdk/client-sts-3.441.0" + sources."@aws-sdk/core-3.441.0" sources."@aws-sdk/credential-provider-env-3.433.0" - sources."@aws-sdk/credential-provider-ini-3.436.0" - sources."@aws-sdk/credential-provider-node-3.436.0" + sources."@aws-sdk/credential-provider-ini-3.441.0" + sources."@aws-sdk/credential-provider-node-3.441.0" sources."@aws-sdk/credential-provider-process-3.433.0" - sources."@aws-sdk/credential-provider-sso-3.436.0" + sources."@aws-sdk/credential-provider-sso-3.441.0" sources."@aws-sdk/credential-provider-web-identity-3.433.0" sources."@aws-sdk/middleware-host-header-3.433.0" sources."@aws-sdk/middleware-logger-3.433.0" sources."@aws-sdk/middleware-recursion-detection-3.433.0" sources."@aws-sdk/middleware-sdk-sts-3.433.0" sources."@aws-sdk/middleware-signing-3.433.0" - sources."@aws-sdk/middleware-user-agent-3.433.0" + sources."@aws-sdk/middleware-user-agent-3.438.0" sources."@aws-sdk/region-config-resolver-3.433.0" - sources."@aws-sdk/token-providers-3.435.0" + sources."@aws-sdk/token-providers-3.438.0" sources."@aws-sdk/types-3.433.0" - sources."@aws-sdk/util-endpoints-3.433.0" + sources."@aws-sdk/util-endpoints-3.438.0" sources."@aws-sdk/util-locate-window-3.310.0" sources."@aws-sdk/util-user-agent-browser-3.433.0" - sources."@aws-sdk/util-user-agent-node-3.433.0" + sources."@aws-sdk/util-user-agent-node-3.437.0" sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@httptoolkit/websocket-stream-6.0.1" sources."@kwsites/file-exists-1.1.1" @@ -94097,6 +93655,7 @@ in sources."@smithy/util-config-provider-2.0.0" sources."@smithy/util-defaults-mode-browser-2.0.16" sources."@smithy/util-defaults-mode-node-2.0.21" + sources."@smithy/util-endpoints-1.0.2" sources."@smithy/util-hex-encoding-2.0.0" sources."@smithy/util-middleware-2.0.5" sources."@smithy/util-retry-2.0.5" @@ -94110,7 +93669,7 @@ in sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" sources."@types/lodash-4.14.200" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/responselike-1.0.2" sources."@types/ws-8.5.8" sources."abort-controller-3.0.0" @@ -94140,8 +93699,8 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - sources."aws-crt-1.18.2" - (sources."aws-sdk-2.1481.0" // { + sources."aws-crt-1.18.3" + (sources."aws-sdk-2.1486.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -94515,7 +94074,7 @@ in sources."process-utils-4.0.0" sources."promise-queue-2.2.5" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" @@ -94621,7 +94180,7 @@ in }) sources."undici-types-5.26.5" sources."uni-global-1.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."untildify-4.0.0" sources."uri-js-4.4.1" (sources."url-0.10.3" // { @@ -94821,7 +94380,7 @@ in sources."performance-now-2.1.0" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" @@ -95103,7 +94662,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.15" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.8" @@ -95310,10 +94869,10 @@ in sql-formatter = nodeEnv.buildNodePackage { name = "sql-formatter"; packageName = "sql-formatter"; - version = "13.0.2"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-13.0.2.tgz"; - sha512 = "mAtkmAcrrgH5XQOpDLDq4fQ6QAN1XgUruOsvHUfMUpk7VBBEVHtKQhCL66OKnUusbpeyIISh6Zrldcyveufjww=="; + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-13.0.4.tgz"; + sha512 = "6pns27iQ5yT8jmle4cqvpfXNl29/AGOT4KtmzhtI2zgH1J0RbpZdduqTRzem7UCta+gvrj4HC1O9l6mTSUHoRg=="; }; dependencies = [ sources."argparse-2.0.1" @@ -95407,11 +94966,11 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/estree-1.0.3" - sources."@types/node-20.8.9" + sources."@types/estree-1.0.4" + sources."@types/node-20.8.10" sources."@types/pug-2.0.8" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.3" sources."arg-4.1.3" @@ -95429,7 +94988,7 @@ in sources."buffer-crc32-0.2.13" sources."call-bind-1.0.5" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -95451,7 +95010,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" @@ -95566,7 +95125,7 @@ in sources."sade-1.8.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.69.4" + sources."sass-1.69.5" sources."sax-1.3.0" sources."semver-6.3.1" sources."set-function-length-1.1.1" @@ -95675,7 +95234,7 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/pug-2.0.8" (sources."@vscode/emmet-helper-2.8.4" // { dependencies = [ @@ -95683,8 +95242,8 @@ in ]; }) sources."@vscode/l10n-0.0.16" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.3" sources."arg-4.1.3" @@ -95699,7 +95258,7 @@ in sources."browserslist-4.22.1" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -95719,7 +95278,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."emmet-2.4.6" sources."errno-0.1.8" sources."es6-promise-3.3.1" @@ -95833,7 +95392,7 @@ in sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.69.4" + sources."sass-1.69.5" sources."sax-1.3.0" sources."semver-6.3.1" sources."set-function-length-1.1.1" @@ -95969,9 +95528,9 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.9" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."arg-5.0.2" @@ -96012,7 +95571,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."jiti-1.20.0" + sources."jiti-1.21.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."make-error-1.3.6" @@ -96293,7 +95852,7 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" (sources."rc-config-loader-4.1.3" // { dependencies = [ sources."argparse-2.0.1" @@ -96888,7 +96447,7 @@ in sources."parse5-5.1.1" sources."property-information-5.6.0" sources."rehype-parse-6.0.2" - sources."sentence-splitter-4.2.1" + sources."sentence-splitter-4.3.0" sources."space-separated-tokens-1.1.5" sources."structured-source-4.0.0" sources."textlint-util-to-string-3.3.2" @@ -96934,7 +96493,7 @@ in sources."parse5-5.1.1" sources."property-information-5.6.0" sources."rehype-parse-6.0.2" - sources."sentence-splitter-4.2.1" + sources."sentence-splitter-4.3.0" sources."space-separated-tokens-1.1.5" sources."structured-source-4.0.0" sources."textlint-util-to-string-3.3.2" @@ -97222,7 +96781,7 @@ in sources."@types/cors-2.8.15" sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/responselike-1.0.2" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -97281,7 +96840,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.33.1" + sources."core-js-3.33.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -97713,7 +97272,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.33.1" + sources."core-js-3.33.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -97934,7 +97493,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.2" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -98312,7 +97871,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/responselike-1.0.2" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -98393,7 +97952,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.33.1" + sources."core-js-3.33.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -98632,7 +98191,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -98781,7 +98340,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/responselike-1.0.2" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -98862,7 +98421,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.33.1" + sources."core-js-3.33.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -99101,7 +98660,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -99721,9 +99280,9 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.9" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."arg-4.1.3" sources."create-require-1.1.1" sources."diff-4.0.2" @@ -99838,7 +99397,7 @@ in sources."@types/debug-4.1.10" sources."@types/is-empty-1.2.2" sources."@types/ms-0.7.33" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/supports-color-8.1.2" sources."@types/unist-3.0.1" sources."@ungap/structured-clone-1.2.0" @@ -99892,7 +99451,7 @@ in sources."npm-normalize-package-bin-3.0.1" sources."p-limit-4.0.0" sources."p-locate-6.0.0" - sources."parse-json-7.1.0" + sources."parse-json-7.1.1" sources."path-exists-5.0.0" sources."path-key-3.1.1" sources."path-scurry-1.10.1" @@ -99983,7 +99542,7 @@ in }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.11" - sources."@types/estree-1.0.3" + sources."@types/estree-1.0.4" sources."@types/geojson-7946.0.4" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -100153,7 +99712,7 @@ in sha512 = "3iXmzdAVZCGHrvdh6hIM8OY55auXA1EIDzFLaYdq27e99Dr+WXTEa00ilqQUPdrpS0sE1ZqK4Ikhgg5x8SOtLw=="; }; dependencies = [ - sources."@types/estree-1.0.3" + sources."@types/estree-1.0.4" sources."@types/geojson-7946.0.4" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -100319,7 +99878,7 @@ in dependencies = [ sources."fs-extra-11.1.0" sources."jsonfile-6.1.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."@vercel/go-3.0.3" @@ -100351,8 +99910,8 @@ in sources."@vercel/static-build-2.0.9" sources."@vercel/static-config-3.0.0" sources."abbrev-1.1.1" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."agent-base-6.0.2" sources."ajv-8.6.3" sources."ansi-regex-5.0.1" @@ -100512,7 +100071,7 @@ in sources."pretty-ms-7.0.1" sources."promisepipe-3.0.0" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."raw-body-2.4.1" sources."readable-stream-3.6.2" @@ -100653,7 +100212,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@ungap/structured-clone-1.2.0" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -100680,7 +100239,7 @@ in sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" sources."eslint-8.52.0" - sources."eslint-plugin-vue-9.18.0" + sources."eslint-plugin-vue-9.18.1" sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" sources."espree-9.6.1" @@ -100759,7 +100318,7 @@ in sources."prettier-2.8.8" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."resolve-1.22.8" sources."resolve-from-4.0.0" @@ -101105,7 +100664,7 @@ in sources."tinycolor2-1.6.0" sources."token-types-4.2.1" sources."tspan-0.4.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."utif-2.0.1" sources."util-deprecate-1.0.2" sources."wavedrom-3.3.0" @@ -101146,9 +100705,9 @@ in sources."@jridgewell/trace-mapping-0.3.20" sources."@types/eslint-8.44.6" sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.3" + sources."@types/estree-1.0.4" sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -101166,16 +100725,16 @@ in sources."@webassemblyjs/wast-printer-1.11.6" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-import-assertions-1.9.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" @@ -101202,7 +100761,7 @@ in sources."neo-async-2.6.2" sources."node-releases-2.0.13" sources."picocolors-1.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.3.0" @@ -101211,7 +100770,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.22.0" + sources."terser-5.24.0" sources."terser-webpack-plugin-5.3.9" sources."undici-types-5.26.5" sources."update-browserslist-db-1.0.13" @@ -101248,9 +100807,9 @@ in sources."@jridgewell/trace-mapping-0.3.20" sources."@types/eslint-8.44.6" sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.3" + sources."@types/estree-1.0.4" sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -101271,21 +100830,21 @@ in sources."@webpack-cli/serve-2.0.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-import-assertions-1.9.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.20" sources."commander-10.0.1" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."enhanced-resolve-5.15.0" - sources."envinfo-7.10.0" + sources."envinfo-7.11.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -101331,7 +100890,7 @@ in sources."path-parse-1.0.7" sources."picocolors-1.0.0" sources."pkg-dir-4.2.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."randombytes-2.1.0" sources."rechoir-0.8.0" sources."resolve-1.22.8" @@ -101348,7 +100907,7 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.22.0" // { + (sources."terser-5.24.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -101397,14 +100956,15 @@ in sources."@types/connect-history-api-fallback-1.5.2" sources."@types/eslint-8.44.6" sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.3" + sources."@types/estree-1.0.4" sources."@types/express-4.17.20" sources."@types/express-serve-static-core-4.17.39" sources."@types/http-errors-2.0.3" sources."@types/http-proxy-1.17.13" sources."@types/json-schema-7.0.14" sources."@types/mime-1.3.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" + sources."@types/node-forge-1.3.8" sources."@types/qs-6.9.9" sources."@types/range-parser-1.2.6" sources."@types/retry-0.12.0" @@ -101431,7 +100991,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."accepts-1.3.8" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-import-assertions-1.9.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -101455,7 +101015,7 @@ in sources."bufferutil-4.0.8" sources."bytes-3.0.0" sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.20" @@ -101484,7 +101044,7 @@ in sources."dns-equal-1.0.0" sources."dns-packet-5.6.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" @@ -101604,7 +101164,7 @@ in sources."ipaddr.js-1.9.1" ]; }) - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -101623,7 +101183,7 @@ in sources."safer-buffer-2.1.2" sources."schema-utils-4.2.0" sources."select-hose-2.0.0" - sources."selfsigned-2.1.1" + sources."selfsigned-2.4.1" (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" @@ -101667,7 +101227,7 @@ in sources."strip-final-newline-2.0.0" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.22.0" + sources."terser-5.24.0" (sources."terser-webpack-plugin-5.3.9" // { dependencies = [ sources."ajv-6.12.6" @@ -101737,9 +101297,9 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/eslint-8.44.6" sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.3" + sources."@types/estree-1.0.4" sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -101757,7 +101317,7 @@ in sources."@webassemblyjs/wast-printer-1.11.6" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.10.0" + sources."acorn-8.11.2" sources."acorn-import-assertions-1.9.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -101765,11 +101325,11 @@ in sources."braces-3.0.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001559" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.574" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" @@ -101814,7 +101374,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."require-from-string-2.0.2" @@ -101828,7 +101388,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.22.0" + sources."terser-5.24.0" (sources."terser-webpack-plugin-5.3.9" // { dependencies = [ sources."ajv-6.12.6" @@ -101883,7 +101443,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -102194,7 +101754,7 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.15.1" + sources."streamx-2.15.2" sources."string-width-4.2.3" sources."string2compact-1.3.2" sources."string_decoder-1.1.1" @@ -102316,10 +101876,10 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "3.14.0"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-3.14.0.tgz"; - sha512 = "4vzw11yG1/KXpYKbumvRJ61Iyhm/yKXb/ayOw/2xiIRdKdpsfN9/796d2l525+CDaGwZWswpLENe6ZMS0p/Ghg=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-3.15.0.tgz"; + sha512 = "kxzK62rD+LRrDeZZzw8cP6FBub71vJCbfAAb594XobXajgXYh3pFjv18Vm8YLxHzoGMhmAOJPA5b4DHq4HEUCw=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.2.0" @@ -102348,8 +101908,10 @@ in sources."@esbuild/win32-ia32-0.17.19" sources."@esbuild/win32-x64-0.17.19" sources."@fastify/busboy-2.0.0" - sources."acorn-8.10.0" - sources."acorn-walk-8.2.0" + sources."@types/node-20.8.10" + sources."@types/node-forge-1.3.8" + sources."acorn-8.11.2" + sources."acorn-walk-8.3.0" sources."anymatch-3.1.3" sources."as-table-1.0.55" sources."binary-extensions-2.2.0" @@ -102377,7 +101939,7 @@ in sources."is-number-7.0.0" sources."magic-string-0.25.9" sources."mime-3.0.0" - sources."miniflare-3.20231016.0" + sources."miniflare-3.20231025.0" sources."ms-2.1.2" sources."mustache-4.2.0" sources."nanoid-3.3.6" @@ -102388,10 +101950,11 @@ in sources."picomatch-2.3.1" sources."printable-characters-1.0.42" sources."readdirp-3.6.0" + sources."resolve.exports-2.0.2" sources."rollup-plugin-inject-3.0.2" sources."rollup-plugin-node-polyfills-0.2.1" sources."rollup-pluginutils-2.8.2" - sources."selfsigned-2.1.1" + sources."selfsigned-2.4.1" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."sourcemap-codec-1.4.8" @@ -102399,9 +101962,10 @@ in sources."stoppable-1.1.0" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" - sources."undici-5.26.5" + sources."undici-5.27.0" + sources."undici-types-5.26.5" sources."utf-8-validate-6.0.3" - sources."workerd-1.20231016.0" + sources."workerd-1.20231025.0" sources."ws-8.14.2" sources."xxhash-wasm-1.0.2" sources."youch-3.3.2" @@ -102580,14 +102144,14 @@ in sources."@szmarczak/http-timer-5.0.1" sources."@types/http-cache-semantics-4.0.3" sources."@types/triple-beam-1.3.4" - sources."@zwave-js/cc-12.2.3" - sources."@zwave-js/config-12.2.3" - sources."@zwave-js/core-12.2.3" - sources."@zwave-js/host-12.2.3" - sources."@zwave-js/nvmedit-12.2.3" - sources."@zwave-js/serial-12.2.3" + sources."@zwave-js/cc-12.3.0" + sources."@zwave-js/config-12.3.0" + sources."@zwave-js/core-12.3.0" + sources."@zwave-js/host-12.3.0" + sources."@zwave-js/nvmedit-12.3.0" + sources."@zwave-js/serial-12.3.0" sources."@zwave-js/shared-12.2.3" - sources."@zwave-js/testing-12.2.3" + sources."@zwave-js/testing-12.3.0" sources."alcalzone-shared-4.0.8" sources."ansi-colors-4.1.3" sources."ansi-regex-5.0.1" @@ -102706,7 +102270,7 @@ in sources."tiny-glob-0.2.9" sources."triple-beam-1.4.1" sources."tslib-2.6.2" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."utf-8-validate-6.0.3" sources."util-deprecate-1.0.2" sources."which-2.0.2" @@ -102720,7 +102284,7 @@ in sources."yallist-4.0.0" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" - sources."zwave-js-12.2.3" + sources."zwave-js-12.3.0" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix index 215c0268562..ca5c78bca7d 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, version, astring, base, camlp-streams, cmdliner_1_0 +{ lib, fetchurl, version ? "0.26.1", astring, base, camlp-streams, cmdliner_1_0 , cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk -, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf }: +, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf, ... }: # The ocamlformat package have been split into two in version 0.25.1: # one for the library and one for the executable. @@ -23,9 +23,12 @@ rec { "0.24.1" = "sha256-AjQl6YGPgOpQU3sjcaSnZsFJqZV9BYB+iKAE0tX0Qc4="; "0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0="; "0.26.0" = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30="; + "0.26.1" = "sha256-2gBuQn8VuexhL7gI1EZZm9m3w+4lq+s9VVdHpw10xtc="; }."${version}"; }; + inherit version; + odoc-parser_v = odoc-parser.override { version = if lib.versionAtLeast version "0.24.0" then "2.0.0" diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix index cefae4af027..9e271fe186b 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix @@ -1,6 +1,7 @@ -{ lib, callPackage, buildDunePackage, menhir, version ? "0.25.1" }: +# Version can be selected with the 'version' argument, see generic.nix. +{ lib, callPackage, buildDunePackage, menhir, ... }@args: -let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; +let inherit (callPackage ./generic.nix args) src version library_deps; in assert (lib.versionAtLeast version "0.25.1"); diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix index a4492b2ead3..e1f5f29aa2f 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix @@ -1,25 +1,16 @@ -{ lib, fetchurl, buildDunePackage, ocaml, csexp, sexplib0 }: +# Version can be selected with the 'version' argument, see generic.nix. +{ lib, fetchurl, buildDunePackage, ocaml, csexp, sexplib0, callPackage, ... }@args: -# for compat with ocaml-lsp -let source = - if lib.versionAtLeast ocaml.version "4.13" - then { - version = "0.26.0"; - sha256 = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30="; - } else { - version = "0.20.0"; - sha256 = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk="; - }; -in +let + # for compat with ocaml-lsp + version_arg = + if lib.versionAtLeast ocaml.version "4.13" then {} else { version = "0.20.0"; }; -buildDunePackage rec { - pname = "ocamlformat-rpc-lib"; - inherit (source) version; + inherit (callPackage ./generic.nix (args // version_arg)) src version; - src = fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; - inherit (source) sha256; - }; +in buildDunePackage rec { + pname = "ocamlformat-rpc-lib"; + inherit src version; minimalOCamlVersion = "4.08"; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix index a2456dbef3b..4c3b6607737 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix @@ -1,3 +1,4 @@ +# Version can be selected with the 'version' argument, see generic.nix. { lib , callPackage , buildDunePackage @@ -5,10 +6,10 @@ , re , ocamlformat-lib , menhir -, version ? "0.26.0" -}: +, ... +}@args: -let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; +let inherit (callPackage ./generic.nix args) src version library_deps; in lib.throwIf (lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23") diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix index 9dea4a64a50..6c60458f966 100644 --- a/pkgs/development/ocaml-modules/wayland/default.nix +++ b/pkgs/development/ocaml-modules/wayland/default.nix @@ -2,28 +2,28 @@ , buildDunePackage , fetchurl , xmlm -, lwt +, eio , logs , fmt , cstruct , cmdliner -, alcotest-lwt +, alcotest +, eio_main }: buildDunePackage rec { pname = "wayland"; - version = "1.1"; + version = "2.0"; - minimalOCamlVersion = "4.08"; - duneVersion = "3"; + minimalOCamlVersion = "5.0"; src = fetchurl { url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz"; - sha256 = "0b7czgh08i6xcx3fsz6vd19sfyngwi0i27jdzg8cnjgrgwnagv6d"; + hash = "sha256-iCG1zk1tA7gdGGt78c3sQi0NN9Fh3HsCP4cy7Y3pg0s="; }; propagatedBuildInputs = [ - lwt + eio logs fmt cstruct @@ -35,7 +35,8 @@ buildDunePackage rec { ]; checkInputs = [ - alcotest-lwt + alcotest + eio_main ]; doCheck = true; diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index 947f6d3d121..b238f184f0c 100644 --- a/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/pkgs/development/python-modules/aemet-opendata/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.4.5"; + version = "0.4.6"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-rjHiDn8//zjFR27RTGGWZCxKI6pDXu47DFINV8Tq7ZM="; + hash = "sha256-eAHj37d0akxSz4rnf9f0tDknJQe//cMg0Korp1rtxfQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index a3e962ea6cd..80ff09aa25e 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -1,26 +1,46 @@ -{ lib, fetchPypi, buildPythonPackage -, agate, openpyxl, xlrd, olefile, pytestCheckHook +{ lib +, fetchPypi +, buildPythonPackage +, agate +, openpyxl +, xlrd +, olefile +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "agate-excel"; - version = "0.2.5"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "62315708433108772f7f610ca769996b468a4ead380076dbaf6ffe262831b153"; + hash = "sha256-IfrbPmQnGh4OMEiWJl16UUfI6X/UWj/p6J2+3Y2DzuM="; }; - propagatedBuildInputs = [ agate openpyxl xlrd olefile ]; + propagatedBuildInputs = [ + agate + openpyxl + xlrd + olefile + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "agate" ]; + pythonImportsCheck = [ + "agate" + ]; meta = with lib; { description = "Adds read support for excel files to agate"; - homepage = "https://github.com/wireservice/agate-excel"; - license = licenses.mit; + homepage = "https://github.com/wireservice/agate-excel"; + changelog = "https://github.com/wireservice/agate-excel/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; maintainers = with maintainers; [ vrthra ]; }; } diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index a62031c079d..4b301548b43 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.74"; + version = "9.2.75"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lZJLYIZ44FXGavDCrO90DYSl4yaNDpAYeIIihk5Bk14="; + hash = "sha256-k3CX0ntqbKBL9xLTPifwjTqwYEDLlNdEHlIPiokkkPA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 11ba9a20323..2325bf4ff0f 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -4,13 +4,12 @@ , fetchFromGitHub , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.3.0"; - format = "pyproject"; + version = "0.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,12 +17,11 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-tsx98DG/TvTrVwUy9fscErf+3zUC5XVs50lHKW/9pdQ="; + hash = "sha256-PWdyyzdPXDOfZgyLasT9TW+g+So2wOkcf9Fy77Oydl4="; }; nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index f20d38b7266..e413aca8476 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, pint , poetry-core , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.0.9"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-xVSxXiHSyUa31X+eOK5ZXH/+Uwm8lfStY0nZ2mKWFpI="; + hash = "sha256-o8i1H4MsK21kJVbLD22PAUqj5Q9k31JfdZQYARPQICc="; }; postPatch = '' @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + pint ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix index 502363de13c..8aca66a80b4 100644 --- a/pkgs/development/python-modules/aioelectricitymaps/default.nix +++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aioelectricitymaps"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jpbede"; repo = "aioelectricitymaps"; rev = "refs/tags/v${version}"; - hash = "sha256-2Ou3obpGRJ/iUPuaoBGlmDTJLx6+S8ivK9PbrbSvYyg="; + hash = "sha256-Whg3F4Oyfqn2Lod44e15Pxc3m0dEB2F+MK0bvEM7c7w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index de5d1184b2b..ca577acc283 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "18.2.0"; + version = "18.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uOF9VSASzGA4pVW3puQtGrr2dy7sRESa1a6DPUsMmL4="; + hash = "sha256-PW3/V4PTm+UxTsfSSvOEX+FGcuF4m+mDOz6Z/AzB2qk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 644c3cda080..86c186f4220 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.0.6"; + version = "3.0.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-e7KSgUOEA3iAR4QdUhjYcHsPdtCJRxu6u+uxuDMaghQ="; + hash = "sha256-YaLSpWSaiEP7X+IujrQgXgWl3aPc1WDMq2yaMUTu328="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiopegelonline/default.nix b/pkgs/development/python-modules/aiopegelonline/default.nix index 3e78733ce44..a596791e74c 100644 --- a/pkgs/development/python-modules/aiopegelonline/default.nix +++ b/pkgs/development/python-modules/aiopegelonline/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiopegelonline"; - version = "0.0.6"; + version = "0.0.7"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "aiopegelonline"; rev = "refs/tags/v${version}"; - hash = "sha256-UbH5S+BfXMAurEvPx0sOzNoV/yypbMCPN3Y3cSherfQ="; + hash = "sha256-r+5b52N/vliKHx6qOLJ4lWcQt1TPEcn5Dz7cZNhRbNg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioquic-mitmproxy/default.nix b/pkgs/development/python-modules/aioquic-mitmproxy/default.nix index 7fab497b260..75ccd607274 100644 --- a/pkgs/development/python-modules/aioquic-mitmproxy/default.nix +++ b/pkgs/development/python-modules/aioquic-mitmproxy/default.nix @@ -6,20 +6,24 @@ , pylsqpack , pyopenssl , pytestCheckHook +, pythonOlder +, service-identity , setuptools , wheel }: buildPythonPackage rec { pname = "aioquic-mitmproxy"; - version = "0.9.20.3"; - format = "pyproject"; + version = "0.9.21.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "meitinger"; repo = "aioquic_mitmproxy"; rev = "refs/tags/${version}"; - hash = "sha256-VcIbtrcA0dBEE52ZD90IbXoh6L3wDUbr2kFJikts6+w="; + hash = "sha256-eD3eICE9jS1jyqMgWwcv6w3gkR0EyGcKwgSXhasXNeA="; }; nativeBuildInputs = [ @@ -32,6 +36,7 @@ buildPythonPackage rec { cryptography pylsqpack pyopenssl + service-identity ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index a1dd1b3fa5c..873eb8d24ac 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.4.9"; + version = "0.4.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ELB0VeowRbd8yZ0m28KeRY3IcCEL+wmOxiqaZhYXHdk="; + hash = "sha256-uN5lbhuPt9axp2ZTTxDgHuDRwlQjXANEkGPgQJL1o90="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 02e84b8f7e0..d07fbf7329e 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "63"; + version = "64"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-am11pFgYMRccUNaK/iKdp6mfk5NQ4QnU41xbFiGCMPs="; + hash = "sha256-A6IfUUaXv/Dm8yncgC0SFBrabCFx0Y24pOul0bqxBLc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index ac9b87fb4ed..af193fa8dc6 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.3.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-Zitssjoe88T7gphfAQXyv2el7jbMLKTnr1GSe5LTWnI="; + hash = "sha256-sWONjWchXu5pRFXY/ZhOXvF0z/qUc1LjqcaSiVPA1MU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiowaqi/default.nix b/pkgs/development/python-modules/aiowaqi/default.nix index 63e22513039..9d99977249b 100644 --- a/pkgs/development/python-modules/aiowaqi/default.nix +++ b/pkgs/development/python-modules/aiowaqi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiowaqi"; - version = "2.1.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-waqi"; rev = "refs/tags/v${version}"; - hash = "sha256-wwpktevEh/ukb9ByV660BePyqYU49/W+lIcgXuEBcuQ="; + hash = "sha256-FHpZVY7TFjk+2YNBejEwSdYWK41V9bti1JxpWivemw4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index 19d9997ed8d..acb6d6bf1e6 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/pkgs/development/python-modules/aiowithings/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiowithings"; - version = "1.0.0"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-withings"; rev = "refs/tags/v${version}"; - hash = "sha256-3necwO/EpjWD1fAItqsZJKgv0CIBklxcM1jNRPxhSVY="; + hash = "sha256-6yfhAMQIwhjKXlnN58bL9It8q6CXH9RxKBkB8BfSY1o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 8ea691eb485..0516388b3f8 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.72"; + version = "0.0.73"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-oDC5NWmdo6Ijxz2ER9CjtCZxWkancUNyxVe2ofH4c+Q="; + hash = "sha256-FJUTJfS9jiC7KDf6XcGVRNXf75bVUOBPZe8y9M39Uak="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index a4bd117d8e6..5b142f2be1e 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.74"; + version = "9.2.75"; pyproject = true; disabled = pythonOlder "3.11"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-8t7S+VR9AqYpaAP772Wn1foVy/XN9MiEUZb5+u47G+k="; + hash = "sha256-tDOO0wn5gYxK1CuMWhu/i4Xk3CfcuhPvxsG0LI7BlA4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 1e059d7c82b..14fea5e4835 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.74"; + version = "9.2.75"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-n/51N1D5UI2FTKv7GBN/iPYE/+/o/2JnFTRee+1FVWg="; + hash = "sha256-t8kxGwLEVVp1WMFA+yFLMAPJBT46m0ZFG2lhWMxoolw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index 1c82445f0e4..0497c542fe2 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -1,27 +1,37 @@ { lib -, absl-py , buildPythonPackage -, etils +, pythonOlder +, python , fetchPypi +, absl-py +, etils , importlib-resources -, python , typing-extensions , zipp }: buildPythonPackage rec { pname = "array-record"; - version = "0.4.1"; + version = "0.5.0"; format = "wheel"; - disabled = python.pythonVersion != "3.10"; + # As of 2023-10-31, PyPI includes wheels for Python 3.9, 3.10, and 3.11. + disabled = pythonOlder "3.9"; - src = fetchPypi { + src = let + pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; + in fetchPypi { inherit version format; pname = "array_record"; - dist = "py310"; - python = "py310"; - hash = "sha256-agyO1v36ryzs09XGucE+EWrTKZZJYRyP0YTWRVf7q6g="; + dist = pyShortVersion; + python = pyShortVersion; + abi = pyShortVersion; + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + hash = { + cp39 = "sha256-BzMOVue7E1S1+5+XTcPELko81ujc9MbmqLhNsU7pqO0="; + cp310 = "sha256-eUD9pQu9GsbV8MPD1MiF3Ihr+zYioSOo6P15hYIwPYo="; + cp311 = "sha256-rAmkI3EIZPYiXrxFowfDC0Gf3kRw0uX0i6Kx6Zu+hNM="; + }.${pyShortVersion}; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index f3b6787dd66..87a996a4552 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -6,6 +6,7 @@ , requests , requests-oauthlib , responses +, six }: buildPythonPackage rec { @@ -25,6 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests requests-oauthlib + six ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aw-core/default.nix b/pkgs/development/python-modules/aw-core/default.nix index 7b928767f25..9707e797860 100644 --- a/pkgs/development/python-modules/aw-core/default.nix +++ b/pkgs/development/python-modules/aw-core/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aw-core"; - version = "0.5.15"; + version = "0.5.16"; format = "pyproject"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ActivityWatch"; repo = "aw-core"; rev = "v${version}"; - sha256 = "sha256-3cz79gSkmbGtCKnLGA4HGG5dLu7QB4ZtMnNGrSYB17U="; + sha256 = "sha256-7xT7bOGzH5G4WpgNo8pDyiQqX0dWNLNHpgssozUa9kQ="; }; disabled = pythonOlder "3.8"; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index b6384fce40b..d10e3a96634 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.19.3"; + version = "0.19.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UMIzuGZBff/7szG3CuO3oHZOfY4WcYqW9mUAGFBWLvA="; + hash = "sha256-t/LwioUTZ0fNrJUlx83HG1ytmLW64gH6W17Gd2UXets="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/azure-mgmt-search/default.nix b/pkgs/development/python-modules/azure-mgmt-search/default.nix index 4683d1e2941..5ba74007734 100644 --- a/pkgs/development/python-modules/azure-mgmt-search/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -1,30 +1,29 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest , azure-common , azure-mgmt-core +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder , typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-search"; - version = "9.0.0"; + version = "9.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0="; + hash = "sha256-U7xu6tsJdNIfEguyG7Xmgn321lDhc0dGD9g+LWiINZk="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest + isodate ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -39,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure Search Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-search_${version}/sdk/search/azure-mgmt-search/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/bip32/default.nix b/pkgs/development/python-modules/bip32/default.nix new file mode 100644 index 00000000000..96f37498c93 --- /dev/null +++ b/pkgs/development/python-modules/bip32/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pythonOlder +, setuptools +, base58 +, coincurve +}: + +buildPythonPackage rec { + pname = "bip32"; + version = "3.4"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + # the PyPi source distribution ships a broken setup.py, so use github instead + src = fetchFromGitHub { + owner = "darosior"; + repo = "python-bip32"; + rev = version; + hash = "sha256-o8UKR17XDWp1wTWYeDL0DJY+D11YI4mg0UuGEAPkHxE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + base58 + coincurve + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "bip32" + ]; + + meta = with lib; { + description = "Minimalistic implementation of the BIP32 key derivation scheme"; + homepage = "https://github.com/darosior/python-bip32"; + changelog = "https://github.com/darosior/python-bip32/blob/${version}/CHANGELOG.md"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ arcnmx ]; + }; +} diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 8ee08646d1e..041fd9d84cf 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.2.1"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3dftk/C6g6Hclc/N8LlsYcZfxA1I6bMiXkzRcUg69Oc="; + hash = "sha256-5yhr+W2ZSy/uSgmz23pyIKcoJ34h/eDsoyv+N9Hi36w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index f40eb9b0b44..951acb313d1 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.22.0"; + version = "0.22.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,9 +23,14 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-r8kf5L6bvtivqd9dSi8om1wIi8IHmipKFckNMPT515I="; + hash = "sha256-T6ryiWVpraaXzwHYBXjuIO8PUqUcQBcLi1+O+iNBaoc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace ', "wheel~=0.40.0"' "" + ''; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 9beb8e9239f..89bb744eb78 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ pierron yurrriq ]; + maintainers = with maintainers; [ pierron ]; }; } diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 91f8b98a191..3583f0e5544 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -3,24 +3,29 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools , simpleeval , wcmatch }: buildPythonPackage rec { pname = "casbin"; - version = "1.32.0"; - format = "setuptools"; + version = "1.33.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = pname; + owner = "casbin"; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-voabnGdtYci6rV5aLSdEAD3sWEva1tjJSm0EwpjdTj8="; + hash = "sha256-/0yYU33zMtC6Pjm4yyQNavMDoI+5uC2zZci5IL/EY7Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ simpleeval wcmatch diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 14e6cbd811f..8907b8b8ac2 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.74"; + version = "9.2.75"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-TNnv2V8QtSA5oiCHVqIuvbgGNTjfIw4WS1K2MxXfJIw="; + hash = "sha256-ErPk93hDKV1QyGOjxYNaLzNuq6Od374G8qOxWiJwpuo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 6dbaac73b6b..3f4e7addb77 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.74"; + version = "9.2.75"; # 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-KaHAgGPspFGFPNULfXcVwXpl5RdkKHAQV/coJeMSGLQ="; + hash = "sha256-xiYkXC3/JPgXJ23ISl0LVrdm368hDPCG5NqQM6lDXf4="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-e13tsrLAZu67eyUvBYtfkBASEsxdcVwJmKCHBiU78Dg="; + hash = "sha256-F2kgEffFWK7i1BgU5ulsNJitGcGcEziYRU+y86wKgXU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 0966ba8ae28..36e7a274468 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -9,18 +9,19 @@ , fastavro , importlib-metadata , requests +, urllib3 }: buildPythonPackage rec { pname = "cohere"; - version = "4.26.1"; + version = "4.32"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kiU5VooOWhqnjdhSHAIGV+D4pm9Qupz2oo0TZz9ASY8="; + hash = "sha256-OAd0e+mE8hHc6RHBM1vXE68qwrcPcpZ4OB5v9uRQ5oE="; }; patches = [ @@ -42,6 +43,7 @@ buildPythonPackage rec { fastavro importlib-metadata requests + urllib3 ]; # tests require CO_API_KEY diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index d3fc32ab01d..a7fbfd1b378 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , numpy , packaging , pandas @@ -23,6 +24,21 @@ buildPythonPackage rec { hash = "sha256-OAVHx/a4uupVGXSWN2/3uem9/4i+TUkzTX4kp0uLY44="; }; + patches = [ + # on master branch, to be released as 1.1.2 + (fetchpatch { + name = "xfail-tests-that-are-known-to-fail.patch"; + url = "https://github.com/googleapis/python-db-dtypes-pandas/commit/4a56b766b0ccba900a555167863f1081a76c4c0d.patch"; + hash = "sha256-ra1d8Vewvwhkr7PBHc3KM6IUCWsHxE+B7UP2duTgjew="; + }) + # on master branch, to be released as 1.1.2 + (fetchpatch { + name = "add-import-and-object-reference-due-to-upstream-changes.patch"; + url = "https://github.com/googleapis/python-db-dtypes-pandas/commit/8a7b25f3e708df5cd32afcb702fe16130846b165.patch"; + hash = "sha256-JVbhiOIr5gKMSQpIQ+DgIRqq8V5x5ClQhkQzAmIYqEU="; + }) + ]; + propagatedBuildInputs = [ numpy packaging diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 6990105b757..bab6cd3f6c7 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -3,7 +3,7 @@ , chardet , fetchPypi , jinja2 -, jinja2_pluralize +, jinja2-pluralize , pluggy , pycodestyle , pyflakes @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet jinja2 - jinja2_pluralize + jinja2-pluralize pluggy pygments tomli diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 4645293981b..4290d581d10 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.19.0"; + version = "2.20.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8VjKuYI4/IyQSMM/He5dQv5edoWChfB5+LLkLsjVSm0="; + hash = "sha256-CtTagSfAYrEOkEZaeeQ71Dn0RvFpHwH552RpAy+kjlg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index fb7fed4858d..fa1718ea57e 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mpYSlddzYIUZctF3kGWQWT+kxshIdAckVvaXWuyJnlw="; + hash = "sha256-D0GNigdphMArcpU6eI4roiiarIop3qW1tW2KIvJhlWU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index b577179abc7..ccaf67aadd2 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.27.0"; + version = "3.28.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-yaZCx9NPdr2136Z8ig+5Db8+wUbZpSgzMSyILOQZCR8="; + hash = "sha256-oCNszhLGNXNGiQtp91wT4GfuNzDhbZrVR55K41Ykhdg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 76ff49c6a4c..af24162ada3 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.12.0"; + version = "1.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a4r20HG13gUBOjjoDhaHJtxv+yhY3oF/d+QV+Fss6Bk="; + hash = "sha256-jAn2VxEZdGzuZ3bL9OfASkjoiPTMrm2zd6WHZ0HwiZ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix index c9ad0cc36d5..e270343c2d0 100644 --- a/pkgs/development/python-modules/evohome-async/default.nix +++ b/pkgs/development/python-modules/evohome-async/default.nix @@ -2,28 +2,40 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, hatchling , pythonOlder +, voluptuous }: buildPythonPackage rec { pname = "evohome-async"; - version = "0.3.15"; - disabled = pythonOlder "3.7"; + version = "0.4.3"; + pyproject = true; + + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "zxdavb"; - repo = pname; - rev = version; - hash = "sha256-/dZRlcTcea26FEpw/XDItKh4ncr/eEFQcdfIE2KIMo8="; + repo = "evohome-async"; + rev = "refs/tags/${version}"; + hash = "sha256-GDrDOwB/cgry3eRNx8IMiBoLu5xLTnG5ByuuwnWA7DY="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ aiohttp + voluptuous ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "evohomeasync2" ]; + + pythonImportsCheck = [ + "evohomeasync2" + ]; meta = with lib; { description = "Python client for connecting to Honeywell's TCC RESTful API"; diff --git a/pkgs/development/python-modules/geniushub-client/default.nix b/pkgs/development/python-modules/geniushub-client/default.nix index 7ba15e92347..54b36c7de60 100644 --- a/pkgs/development/python-modules/geniushub-client/default.nix +++ b/pkgs/development/python-modules/geniushub-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "geniushub-client"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "manzanotti"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-amsMZjCsPI8CUfSct4uumn8nVZDESlQFh19LXu3yb7o="; + hash = "sha256-Gq2scYos7E8me1a4x7NanHRq2eYWuU2uSUwM+O1TPb8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 0dcee5eea4e..bc5ab67b018 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.12.0"; + version = "3.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-l0I8HDv2FBAvHUJ4F1oDxSPltKzWSLAKNAfQIwKqzNk="; + hash = "sha256-Zhy4h5qjxjovclo+po+QGZvTVMlcoWnMLoOlEFmH0p4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 7a2f0de78b2..31564a0536d 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "3.0.2"; + version = "3.0.3"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-NNHkcOCoG5Xagc0jTR50uHMA5mMgsh3BIzVJ77OEEjk="; + hash = "sha256-VO/TY/QBzVFxqIumVJjw+Ic0hrqkRBS+7wQKBhcN9Jw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index aaf2886d81b..bfdc1b0aecb 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.3.2"; + version = "2.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "refs/tags/v${version}"; - hash = "sha256-Z5dM/PzIA8qtw0RepTKmHpqBwYMRwNLhWuEC0aBGL3U="; + hash = "sha256-M/RbNw5SJb1R78MDTqBHNWE0I/9PlqikrrJAy1r02f8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 77d57a0a500..653bf6a4b1e 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.13"; + version = "2023.11.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7zJhdFgEP/QSX78XMt+dxt0x7gUj011LHGi/+grPux0="; + hash = "sha256-QslmtmS7zrc0Vbq4XEzbx1XaeL0SuhNjyT3OPlCCf04="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index b93ddbaf1df..e27ef7ffce6 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -4,12 +4,15 @@ , atomicwrites-homeassistant , attrs , buildPythonPackage +, ciso8601 +, cryptography , fetchFromGitHub , pycognito , pytest-aiohttp , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools , snitun , syrupy , xmltodict @@ -17,16 +20,16 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.71.0"; - format = "setuptools"; + version = "0.74.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2v8LEVYY7PEzcIMaXcy9h+8O2KrU0zTKyZb2IrO35JQ="; + hash = "sha256-r4Huvn9mBqnASpUd+drwORE+fApLV/l6Y3aO/UIiEC8="; }; postPatch = '' @@ -36,11 +39,17 @@ buildPythonPackage rec { --replace "snitun==" "snitun>=" \ ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ acme aiohttp atomicwrites-homeassistant attrs + ciso8601 + cryptography pycognito snitun ]; diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index ed9ea595a1a..1a71c5d1793 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "heatzypy"; - version = "2.1.7"; + version = "2.1.9"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = "heatzypy"; rev = "refs/tags/${version}"; - hash = "sha256-bMhxxVZs6fTKlUWtSO0jfzYCHa1WPf2faEjfrmfUg8E="; + hash = "sha256-O2HtCaNtBvjhjlSXLRhEuilI8z7nGgzFa8USYiHfZ+E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 0fd19ff2490..c1237dc5882 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -6,11 +6,11 @@ , python-dateutil , pytz , hypothesis -, pytest +, pytestCheckHook }: buildPythonPackage rec { - version = "5.0.7"; + version = "5.0.10"; pname = "icalendar"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "collective"; repo = "icalendar"; rev = "refs/tags/v${version}"; - hash = "sha256-fblcbyctnvd7DOc+tMWzg+90NHzZvH5xiY6BfJakQVo="; + hash = "sha256-sRsUjNClJ58kmCRiwSe7oq20eamj95Vwy/o0xPU8qPw="; }; propagatedBuildInputs = [ @@ -30,9 +30,11 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - pytest + pytestCheckHook ]; + pytestFlagsArray = [ "src/icalendar" ]; + meta = with lib; { changelog = "https://github.com/collective/icalendar/blob/v${version}/CHANGES.rst"; description = "A parser/generator of iCalendar files"; diff --git a/pkgs/development/python-modules/img2pdf/default-icc-profile.patch b/pkgs/development/python-modules/img2pdf/default-icc-profile.patch new file mode 100644 index 00000000000..bf5e1e40861 --- /dev/null +++ b/pkgs/development/python-modules/img2pdf/default-icc-profile.patch @@ -0,0 +1,20 @@ +diff --git a/src/img2pdf.py b/src/img2pdf.py +index 036232b..d2e7829 100755 +--- a/src/img2pdf.py ++++ b/src/img2pdf.py +@@ -3815,14 +3815,7 @@ def gui(): + + + def get_default_icc_profile(): +- for profile in [ +- "/usr/share/color/icc/sRGB.icc", +- "/usr/share/color/icc/OpenICC/sRGB.icc", +- "/usr/share/color/icc/colord/sRGB.icc", +- ]: +- if os.path.exists(profile): +- return profile +- return "/usr/share/color/icc/sRGB.icc" ++ return "@colord@/share/color/icc/colord/sRGB.icc" + + + def get_main_parser(): diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 0450dee30b4..06183b3d534 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage , isPy27 -, fetchPypi +, fetchFromGitea +, substituteAll , fetchpatch +, colord +, setuptools , pikepdf , pillow , stdenv @@ -19,20 +22,34 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.4.4"; + version = "0.5.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c"; + pyproject = true; + + src = fetchFromGitea { + domain = "gitlab.mister-muffin.de"; + owner = "josch"; + repo = "img2pdf"; + rev = version; + hash = "sha256-k0GqBTS8PvYDmjzyLCSdQB7oBakrEQYJcQykDNrzgcA="; }; patches = [ + (substituteAll { + src = ./default-icc-profile.patch; + inherit colord; + }) (fetchpatch { - # https://gitlab.mister-muffin.de/josch/img2pdf/issues/148 - url = "https://gitlab.mister-muffin.de/josch/img2pdf/commit/57d7e07e6badb252c12015388b58fcb5285d3158.patch"; - hash = "sha256-H/g55spe/oVJRxO2Vh+F+ZgR6aLoRUrNeu5WnuU7k/k="; + # https://gitlab.mister-muffin.de/josch/img2pdf/issues/178 + url = "https://salsa.debian.org/debian/img2pdf/-/raw/4a7dbda0f473f7c5ffcaaf68ea4ad3f435e0920d/debian/patches/fix_tests.patch"; + hash = "sha256-A1zK6yINhS+dvyckZjqoSO1XJRTaf4OXFdq5ufUrBs8="; }) + + ]; + + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -40,9 +57,6 @@ buildPythonPackage rec { pillow ]; - # https://gitlab.mister-muffin.de/josch/img2pdf/issues/128 - doCheck = !stdenv.isAarch64; - nativeCheckInputs = [ exiftool ghostscript @@ -60,16 +74,18 @@ buildPythonPackage rec { ''; disabledTests = [ - "test_tiff_rgb" - "test_png_gray1" # https://gitlab.mister-muffin.de/josch/img2pdf/issues/154 + # https://gitlab.mister-muffin.de/josch/img2pdf/issues/178 + "test_miff_cmyk16" ]; pythonImportsCheck = [ "img2pdf" ]; meta = with lib; { + changelog = "https://gitlab.mister-muffin.de/josch/img2pdf/src/tag/${src.rev}/CHANGES.rst"; description = "Convert images to PDF via direct JPEG inclusion"; homepage = "https://gitlab.mister-muffin.de/josch/img2pdf"; - license = licenses.lgpl2; + license = licenses.lgpl3Plus; + mainProgram = "img2pdf"; maintainers = with maintainers; [ veprbl dotlambda ]; }; } diff --git a/pkgs/development/python-modules/jinja2_pluralize/default.nix b/pkgs/development/python-modules/jinja2-pluralize/default.nix index db196403822..2187c1a2414 100644 --- a/pkgs/development/python-modules/jinja2_pluralize/default.nix +++ b/pkgs/development/python-modules/jinja2-pluralize/default.nix @@ -1,12 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, jinja2, inflect }: +{ lib +, buildPythonPackage +, fetchPypi +, jinja2 +, inflect +, pytestCheckHook +}: buildPythonPackage rec { - pname = "jinja2_pluralize"; + pname = "jinja2-pluralize"; version = "0.3.0"; src = fetchPypi { - inherit pname version; - sha256 = "071wnzzz20wjb0iw7grxgj1lb2f0kz50qyfbcq54rddr2x82sp6z"; + pname = "jinja2_pluralize"; + inherit version; + hash = "sha256-31wtUBe5tUwKZst5DMqfwIlFg3w9v8MjWJID8f+3PBw="; }; propagatedBuildInputs = [ @@ -14,6 +21,14 @@ buildPythonPackage rec { inflect ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jinja2_pluralize" + ]; + meta = with lib; { description = "Jinja2 pluralize filters"; homepage = "https://github.com/audreyr/jinja2_pluralize"; diff --git a/pkgs/development/python-modules/junit2html/default.nix b/pkgs/development/python-modules/junit2html/default.nix new file mode 100644 index 00000000000..74445695035 --- /dev/null +++ b/pkgs/development/python-modules/junit2html/default.nix @@ -0,0 +1,42 @@ +{ lib +, fetchPypi +, buildPythonPackage +, nix-update-script + +, setuptools +, wheel + +, jinja2 +}: + +buildPythonPackage rec { + pname = "junit2html"; + version = "30.1.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-1q6KpKdrZvp8XvxGCkoorlZDDgvGg/imTX8+NEOBbWs="; + }; + + passthru.updateScript = nix-update-script { }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + jinja2 + ]; + + pythonImportsCheck = [ "junit2htmlreport" ]; + + meta = with lib; { + description = "Generate HTML reports from Junit results"; + homepage = "https://pypi.org/project/junit2html/"; + license = licenses.mit; + maintainers = with maintainers; [ otavio ]; + mainProgram = "junit2html"; + }; +} diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index a2d00f4ba83..e14f008d0cb 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -11,16 +11,13 @@ , dataclasses-json , jsonpatch , langsmith -, numexpr , numpy -, openapi-schema-pydantic , pydantic , pyyaml , requests , sqlalchemy , tenacity # optional dependencies -, anthropic , atlassian-python-api , azure-core , azure-cosmos @@ -56,6 +53,7 @@ , pgvector , pinecone-client , psycopg2 +, pymongo , pyowm , pypdf , pytesseract @@ -65,11 +63,10 @@ , redis , requests-toolbelt , sentence-transformers -, spacy -, steamship , tiktoken , torch , transformers +, typer , weaviate-client , wikipedia # test dependencies @@ -88,8 +85,8 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.320"; - format = "pyproject"; + version = "0.0.325"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -97,7 +94,7 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-Yw3gGt/OvrQ4IYauFUt6pBWOecy+PaWiGXoo5dWev5M="; + hash = "sha256-/bk4RafDDL4nozyFOiikyU4auBSftej21m5/FnEtDog="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -117,11 +114,9 @@ buildPythonPackage rec { requests pyyaml numpy - openapi-schema-pydantic dataclasses-json tenacity aiohttp - numexpr langsmith anyio jsonpatch @@ -131,18 +126,15 @@ buildPythonPackage rec { passthru.optional-dependencies = { llms = [ - anthropic clarifai cohere openai - # openllm # openlm nlpcloud huggingface-hub manifest-ml torch transformers - # xinference ]; qdrant = [ qdrant-client @@ -180,13 +172,11 @@ buildPythonPackage rec { # azure-search-documents ]; all = [ - anthropic clarifai cohere openai nlpcloud huggingface-hub - # jina manifest-ml elasticsearch opensearch-py @@ -194,7 +184,6 @@ buildPythonPackage rec { faiss sentence-transformers transformers - spacy nltk wikipedia beautifulsoup4 @@ -203,6 +192,8 @@ buildPythonPackage rec { jinja2 pinecone-client # pinecone-text + # marqo + pymongo weaviate-client redis google-api-python-client @@ -236,7 +227,6 @@ buildPythonPackage rec { # O365 jq # docarray - steamship pdfminer-six lxml requests-toolbelt @@ -250,14 +240,15 @@ buildPythonPackage rec { # tigrisdb # nebula3-python # awadb - # esprima - # octoai-sdk + esprima rdflib # amadeus - # xinference librosa python-arango ]; + cli = [ + typer + ]; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 5d85b5d6950..bf3230c910b 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.0.49"; + version = "0.0.53"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-vOa9FNzeJB8QgJ6FW+4vxNfDnBbrKtByIwW3sGP8/ho="; + hash = "sha256-5w6bCNYoZAIrFkruw7E3Tw0G0no05x/g2hHESC3T2lw="; }; sourceRoot = "${src.name}/python"; @@ -44,6 +44,11 @@ buildPythonPackage rec { disabledTests = [ # These tests require network access "integration_tests" + # due to circular import + "test_as_runnable" + "test_as_runnable_batch" + "test_as_runnable_async" + "test_as_runnable_async_batch" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/ledger-bitcoin/default.nix b/pkgs/development/python-modules/ledger-bitcoin/default.nix index afffe79b26b..c2ad7b47f6c 100644 --- a/pkgs/development/python-modules/ledger-bitcoin/default.nix +++ b/pkgs/development/python-modules/ledger-bitcoin/default.nix @@ -4,6 +4,8 @@ , setuptools , ledgercomm , packaging +, bip32 +, coincurve , typing-extensions }: @@ -25,6 +27,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ ledgercomm packaging + bip32 + coincurve typing-extensions ]; diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index e44f6e609d2..03af7530a26 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "localstack"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-Sdyl/ccyhKRP5eb866ly1ZJrrFSQMLdX22R7UNRfDCA="; + hash = "sha256-8HrPnMmzoxgAhu3Qm18FBJ3kNoGOD7bGmI1t7tcETwM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index b41e21c83e0..63a5a15e259 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.3.6"; + version = "0.3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-s5+hfn/NfuL7B5c1LElZ10B+O5xr98D0eBYfLhPt6uU="; + hash = "sha256-iiGxAIHZcq3VaSSmGrB16IutJf8JEAeFkvZsEuIbR3g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index 64f7ac67fa0..5034346b9cf 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -7,20 +7,19 @@ , http-ece , python-dateutil , python-magic -, pytz , requests , six , pytestCheckHook , pytest-mock , pytest-vcr , requests-mock +, setuptools }: buildPythonPackage rec { pname = "mastodon-py"; version = "1.8.1"; - - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "halcy"; @@ -30,26 +29,45 @@ buildPythonPackage rec { }; postPatch = '' - sed -i '/^addopts/d' setup.cfg + sed -i '/addopts/d' setup.cfg ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ blurhash - cryptography decorator - http-ece python-dateutil python-magic - pytz requests six ]; + passthru.optional-dependencies = { + blurhash = [ + blurhash + ]; + webpush = [ + http-ece + cryptography + ]; + }; + nativeCheckInputs = [ pytestCheckHook pytest-mock pytest-vcr requests-mock + setuptools + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + disabledTests = [ + "test_notifications_dismiss_pre_2_9_2" + "test_status_card_pre_2_9_2" + "test_stream_user_direct" + "test_stream_user_local" ]; pythonImportsCheck = [ "mastodon" ]; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 77f47543c52..db6b13b0fcc 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.21.2"; + version = "0.22.1"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - hash = "sha256-eK5DPmPZ/hv3i3lzoIuS9sJXKpUNhmBv4+Nw2u/RZi0="; + hash = "sha256-hFSS2Nys95YJgBNED8SBan24iRo2q/UOr6pqUPAF5Ms="; }; postPatch = '' diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 5de72c96f16..7947ca1f602 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.5.9"; + version = "0.4.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - hash = "sha256-Wyg9Y4THnjNTWQsiOanoyEEBqVgsG5MeyoGE69/n8sM="; + hash = "sha256-8DnzTwW4fQQIGAHZJbu2aKkqOUU6a6IGgif5tIZCing="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mpris-server/default.nix b/pkgs/development/python-modules/mpris-server/default.nix new file mode 100644 index 00000000000..783fc6aab95 --- /dev/null +++ b/pkgs/development/python-modules/mpris-server/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, emoji +, pydbus +, pygobject3 +, unidecode +, setuptools +}: +buildPythonPackage rec { + pname = "mpris-server"; + version = "0.4.2"; + pyproject = true; + + src = fetchPypi { + pname = "mpris_server"; + inherit version; + hash = "sha256-p3nM80fOMtRmeKvOXuX40Fu9xH8gPgYyneXbUS678fE="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + emoji + pydbus + pygobject3 + unidecode + ]; + + pythonImportsCheck = [ "mpris_server" ]; + + # upstream has no tests + doCheck = false; + + meta = with lib; { + description = "Publish a MediaPlayer2 MPRIS device to D-Bus"; + homepage = "https://pypi.org/project/mpris-server/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ quadradical ]; + }; +} diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index b0870c98491..cba5f0da29d 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "nitime"; - version = "0.10.1"; + version = "0.10.2"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NnoVrSt6MTTcNup1e+/1v5JoHCYcycuQH4rHLzXJt+Y="; + hash = "sha256-NCaWr7ZqL1XV0QfUD+4+Yn33N1cCP33ib5oJ91OtJLU="; }; # Upstream wants to build against the oldest version of numpy possible, but diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 62af8da7eb6..150b323d0f2 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-xXVur2ibctRCfQ1zKnPeLrNoukTmFT8exTbm2ukByYY="; + hash = "sha256-+UWHYhPX54Jc9gnrb2Az5Nc3/kt42/wa+zhUnCWdVU4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nuitka/darwin-lto.patch b/pkgs/development/python-modules/nuitka/darwin-lto.patch new file mode 100644 index 00000000000..bd3a6590549 --- /dev/null +++ b/pkgs/development/python-modules/nuitka/darwin-lto.patch @@ -0,0 +1,15 @@ +diff --git a/nuitka/build/SconsCompilerSettings.py b/nuitka/build/SconsCompilerSettings.py +index 319b72c4e..89d40f2a2 100644 +--- a/nuitka/build/SconsCompilerSettings.py ++++ b/nuitka/build/SconsCompilerSettings.py +@@ -173,8 +173,8 @@ def _enableLtoSettings( + lto_mode = False + reason = "known to be not supported (CondaCC)" + elif isMacOS() and env.gcc_mode and env.clang_mode: +- lto_mode = True +- reason = "known to be supported (macOS clang)" ++ lto_mode = False ++ reason = "known to not be supported (macOS nix clang)" + elif env.mingw_mode and env.clang_mode: + lto_mode = False + reason = "known to not be supported (new MinGW64 Clang)" diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index f10cbb74930..fee04a0e40f 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , ccache , fetchFromGitHub @@ -22,6 +21,9 @@ buildPythonPackage rec { hash = "sha256-spa3V9KEjqmwnHSuxLLIu9hJk5PrRwNyOw72sfxBVKo="; }; + # default lto off for darwin + patches = [ ./darwin-lto.patch ]; + nativeBuildInputs = [ setuptools ]; nativeCheckInputs = [ ccache ]; @@ -44,8 +46,6 @@ buildPythonPackage rec { 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/objsize/default.nix b/pkgs/development/python-modules/objsize/default.nix index 18efa2b3494..a002597da50 100644 --- a/pkgs/development/python-modules/objsize/default.nix +++ b/pkgs/development/python-modules/objsize/default.nix @@ -1,20 +1,43 @@ { lib -, python , buildPythonPackage , fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "objsize"; - version = "0.6.1"; + version = "0.7.0"; + pyproject= true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "liran-funaro"; - repo = pname; - rev = version; - hash = "sha256-FgRB7EENwNOlC7ynIRxcwucoywNjko494s75kOp5O+w="; + repo = "objsize"; + rev = "refs/tags/${version}"; + hash = "sha256-wy4Tj+Q+4zymRdoN8Z7wcazJTb2lQ+XHY1Kta02R3R0="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "objsize" + ]; + + pytestFlagsArray = [ + "test_objsize.py" + ]; + meta = with lib; { description = "Traversal over objects subtree and calculate the total size"; homepage = "https://github.com/liran-funaro/objsize"; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index fc6aeb04012..05b71d2b452 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "15.2.0"; + version = "15.3.1"; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-XeO/obDP2tv/HKZLa0Absv26m+oUIup/IBMFZP8/1VQ="; + hash = "sha256-Yngx9hH/4yftClNqM/yyrOCPH0+4Bl9GIEGjawLdy0s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/openapi-schema-pydantic/default.nix b/pkgs/development/python-modules/openapi-schema-pydantic/default.nix deleted file mode 100644 index 1930dc237f0..00000000000 --- a/pkgs/development/python-modules/openapi-schema-pydantic/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, pydantic -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "openapi-schema-pydantic"; - version = "1.2.4"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-PiLPWLdKafdSzH5fFTf25EFkKC2ycAy7zTu5nd0GUZY="; - }; - - propagatedBuildInputs = [ - pydantic - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - # these tests are broken with `pydantic >= 1.10` - # but this library seems to work fine. - # e.g. https://github.com/hwchase17/langchain/blob/d86ed15d8884d5a3f120a433b9dda065647e4534/poetry.lock#L6011-L6012 - "test_pydantic_discriminator_schema_generation" - "test_pydantic_discriminator_openapi_generation" - ]; - - meta = with lib; { - description = "OpenAPI (v3) specification schema as pydantic class"; - homepage = "https://github.com/kuimono/openapi-schema-pydantic"; - changelog = "https://github.com/kuimono/openapi-schema-pydantic/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; - }; -} diff --git a/pkgs/development/python-modules/opencensus-ext-azure/default.nix b/pkgs/development/python-modules/opencensus-ext-azure/default.nix index 132ce33264e..7250a0841f2 100644 --- a/pkgs/development/python-modules/opencensus-ext-azure/default.nix +++ b/pkgs/development/python-modules/opencensus-ext-azure/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "opencensus-ext-azure"; - version = "1.1.9"; + version = "1.1.11"; format = "setuptools"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - hash = "sha256-UHYIt36djqq2/9X/EbfOuH9U5KapQMS4FDMbTRsDQVE="; + hash = "sha256-IdTU0FGdSCOdBBQskLalH17MBDaE64DPoKcBqiM0YHM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index c221f942a2b..3a9b516c2da 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.37"; + version = "0.0.38"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-hfHKn3A1Uo0GAHOwzCuOM2FlIyyGBUefQAKX9TJZzHw="; + hash = "sha256-NX4w5id/XJfleHJd1fa1XcvekwhtWMaEyhbY253SMOo="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/oss2/default.nix b/pkgs/development/python-modules/oss2/default.nix index 62a98425a9d..a62410ecdc4 100644 --- a/pkgs/development/python-modules/oss2/default.nix +++ b/pkgs/development/python-modules/oss2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "oss2"; - version = "2.18.2"; + version = "2.18.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "aliyun"; repo = "aliyun-oss-python-sdk"; rev = "refs/tags/${version}"; - hash = "sha256-xbbdzuaUvFnXA5glGr/1/s1Bm28d4XbtuvCKaj8Js68="; + hash = "sha256-jDSXPVyy8XvPgsGZXsdfavFPptq28pCwr9C63OZvNrY="; }; nativeBuildInputs = [ @@ -108,6 +108,8 @@ buildPythonPackage rec { "test_crypto_get_compact_deprecated_kms" # RuntimeError "test_crypto_put" + # Tests require network access + "test_write_get_object_response" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 147366a2c51..d044c76ae8d 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -227,6 +227,9 @@ buildPythonPackage rec { "test_binops" # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921. "test_rolling" + ] ++ lib.optional stdenv.is32bit [ + # https://github.com/pandas-dev/pandas/issues/37398 + "test_rolling_var_numerical_issues" ]; # Tests have relative paths, and need to reference compiled C extensions @@ -251,9 +254,8 @@ buildPythonPackage rec { ]; meta = with lib; { - # https://github.com/pandas-dev/pandas/issues/14866 - # pandas devs are no longer testing i686 so safer to assume it's broken - broken = stdenv.isi686; + # pandas devs no longer test i686, it's commonly broken + # broken = stdenv.isi686; changelog = "https://pandas.pydata.org/docs/whatsnew/index.html"; description = "Powerful data structures for data analysis, time series, and statistics"; downloadPage = "https://github.com/pandas-dev/pandas"; diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 912768621d1..5f168690279 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -1,36 +1,33 @@ -{ buildPythonPackage -, fetchPypi -, fetchurl -, lib -, nixosTests -, python -, pythonOlder - -# pythonPackages -, hatchling -, dnspython -, expiringdict -, publicsuffix2 -, xmltodict -, geoip2 -, urllib3 -, requests -, imapclient +{ lib +, azure-identity +, boto3 +, buildPythonPackage , dateparser -, mailsuite +, dnspython , elasticsearch , elasticsearch-dsl -, kafka-python -, tqdm -, lxml -, boto3 -, msgraph-core -, azure-identity +, expiringdict +, fetchPypi +, fetchurl +, geoip2 , google-api-core , google-api-python-client , google-auth , google-auth-httplib2 , google-auth-oauthlib +, hatchling +, imapclient +, kafka-python +, lxml +, mailsuite +, msgraph-core +, nixosTests +, publicsuffixlist +, pythonOlder +, requests +, tqdm +, urllib3 +, xmltodict }: let @@ -42,11 +39,10 @@ in buildPythonPackage rec { pname = "parsedmarc"; version = "8.6.1"; + pyproject = true; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchPypi { inherit pname version; hash = "sha256-lnIhXkBodvLWVeqiwFcnU4M53zwWDmtFz+9TThQY63I="; @@ -62,32 +58,33 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - dnspython - expiringdict - publicsuffix2 - xmltodict - geoip2 - urllib3 - requests - imapclient + azure-identity + boto3 dateparser - mailsuite + dnspython elasticsearch elasticsearch-dsl - kafka-python - tqdm - lxml - boto3 - msgraph-core - azure-identity + expiringdict + geoip2 google-api-core google-api-python-client google-auth google-auth-httplib2 google-auth-oauthlib + imapclient + kafka-python + lxml + mailsuite + msgraph-core + publicsuffixlist + requests + tqdm + urllib3 + xmltodict ]; # no tests on PyPI, no tags on GitHub + # https://github.com/domainaware/parsedmarc/issues/426 doCheck = false; pythonImportsCheck = [ "parsedmarc" ]; @@ -97,11 +94,11 @@ buildPythonPackage rec { tests = nixosTests.parsedmarc; }; - meta = { + meta = with lib; { changelog = "https://github.com/domainaware/parsedmarc/blob/master/CHANGELOG.md#${lib.replaceStrings [ "." ] [ "" ] version}"; description = "Python module and CLI utility for parsing DMARC reports"; homepage = "https://domainaware.github.io/parsedmarc/"; - maintainers = with lib.maintainers; [ talyz ]; - license = lib.licenses.asl20; + maintainers = with maintainers; [ talyz ]; + license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index cc2d71914dc..32b8701daa2 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.12"; + version = "19.5.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NsQrfJQ1+WZ4wNBH8ZGGo9IMJ+yvWrVQmesDBQrfRKg="; + hash = "sha256-0WixwsBvfRgHxKrs/eAhzDNgFIpPdUbfEdJxnlaGmCA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 22e0a628276..5ca8bf74a56 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.33.2"; + version = "0.34.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-WTgv0bEkhLMoRCw6Xh5SlYLxnlQCv603lKTajjCETT4="; + hash = "sha256-lyQE3+ZRZgKTZiv6p+cLZRe26M9BnM59fvLjWwFiE8E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/polars/Cargo.lock b/pkgs/development/python-modules/polars/Cargo.lock index 0ea668d6b7c..b9ba1326cf6 100644 --- a/pkgs/development/python-modules/polars/Cargo.lock +++ b/pkgs/development/python-modules/polars/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -25,21 +25,22 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -106,40 +107,6 @@ dependencies = [ ] [[package]] -name = "arrow2" -version = "0.17.3" -source = "git+https://github.com/jorgecarleitao/arrow2?rev=2ecd3e823f63884ca77b146a8cd8fcdea9f328fd#2ecd3e823f63884ca77b146a8cd8fcdea9f328fd" -dependencies = [ - "ahash", - "arrow-format", - "avro-schema", - "base64", - "bytemuck", - "chrono", - "chrono-tz", - "dyn-clone", - "either", - "ethnum", - "fallible-streaming-iterator", - "foreign_vec", - "futures", - "getrandom", - "hash_hasher", - "lexical-core", - "lz4", - "multiversion", - "num-traits", - "parquet2", - "regex", - "regex-syntax 0.6.29", - "rustc_version", - "simdutf8", - "streaming-iterator", - "strength_reduce", - "zstd", -] - -[[package]] name = "async-stream" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -158,18 +125,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] @@ -203,9 +170,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -218,9 +185,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bitflags" @@ -229,6 +196,15 @@ 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" +dependencies = [ + "serde", +] + +[[package]] name = "brotli" version = "3.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -262,35 +238,35 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[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" [[package]] name = "cargo-lock" @@ -306,11 +282,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -321,18 +298,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", "serde", - "time", - "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -385,6 +359,15 @@ dependencies = [ ] [[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] name = "comfy-table" version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -485,7 +468,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", @@ -505,10 +488,16 @@ dependencies = [ ] [[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] name = "dyn-clone" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" +checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" [[package]] name = "either" @@ -517,6 +506,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] name = "enum_dispatch" version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -525,7 +523,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] @@ -536,9 +534,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "ethnum" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0198b9d0078e0f30dedc7acbb21c974e838fc8fae3ee170128658a98cb2c1c04" +checksum = "6c8ff382b2fa527fb7fb06eeebfc5bbb3f17e3cc6b9d70b006c41daa8824adac" [[package]] name = "fallible-streaming-iterator" @@ -554,11 +552,12 @@ checksum = "95765f67b4b18863968b4a1bd5bb576f732b29a4a28c7cd84c09fa3e2875f33c" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", + "libz-ng-sys", "miniz_oxide", ] @@ -572,6 +571,12 @@ dependencies = [ ] [[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] name = "foreign_vec" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -642,7 +647,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] @@ -684,15 +689,15 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git2" @@ -700,7 +705,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -714,6 +719,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] +name = "h2" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] name = "half" version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -730,10 +754,10 @@ dependencies = [ ] [[package]] -name = "hash_hasher" -version = "2.0.3" +name = "hashbrown" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" @@ -763,9 +787,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -783,6 +807,84 @@ dependencies = [ ] [[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 = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +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-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 = "iana-time-zone" version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -817,6 +919,16 @@ dependencies = [ [[package]] name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" @@ -828,15 +940,30 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.9" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "inventory" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53088c87cf71c9d4f3372a2cb9eea1e7b8a0b1bf8b7f7d23fe5b76dbb07e63b" +checksum = "e1be380c410bf0595e94992a648ea89db4dd3f3354ba54af206fd2a68cf5ac8e" + +[[package]] +name = "ipnet" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] [[package]] name = "itoa" @@ -852,9 +979,9 @@ checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" [[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", @@ -862,9 +989,9 @@ 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", @@ -973,9 +1100,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libflate" @@ -1010,6 +1137,16 @@ dependencies = [ ] [[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if", + "windows-sys", +] + +[[package]] name = "libm" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1017,15 +1154,25 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" -version = "0.1.33" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" dependencies = [ "cc", "libc", ] [[package]] +name = "libz-ng-sys" +version = "1.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63" +dependencies = [ + "cmake", + "libc", +] + +[[package]] name = "libz-sys" version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1049,9 +1196,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lz4" @@ -1085,15 +1232,15 @@ dependencies = [ [[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 = "memmap2" -version = "0.5.10" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" dependencies = [ "libc", ] @@ -1109,14 +1256,20 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" dependencies = [ "libmimalloc-sys", ] [[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1133,15 +1286,15 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] [[package]] name = "multiversion" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cda45dade5144c2c929bf2ed6c24bebbba784e9198df049ec87d722b9462bd1" +checksum = "b2c7b9d7fe61760ce5ea19532ead98541f6b4c495d87247aff9826445cf6872a" dependencies = [ "multiversion-macros", "target-features", @@ -1149,9 +1302,9 @@ dependencies = [ [[package]] name = "multiversion-macros" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04bffdccbd4798b61dce08c97ce8c66a68976f95541aaf284a6e90c1d1c306e1" +checksum = "26a83d8500ed06d68877e9de1dde76c1dbb83885dcdbda4ef44ccbc3fbda2ac8" dependencies = [ "proc-macro2", "quote", @@ -1192,9 +1345,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -1231,9 +1384,9 @@ dependencies = [ [[package]] name = "numpy" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437213adf41bbccf4aeae535fbfcdad0f6fed241e1ae182ebe97fa1f3ce19389" +checksum = "bef41cbb417ea83b30525259e30ccef6af39b31c240bda578889494c5392d331" dependencies = [ "libc", "ndarray", @@ -1246,14 +1399,44 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] +name = "object_store" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d359e231e5451f4f9fa889d56e3ce34f8724f1a61db2107739359717cf2bbf08" +dependencies = [ + "async-trait", + "base64", + "bytes", + "chrono", + "futures", + "humantime", + "hyper", + "itertools", + "parking_lot", + "percent-encoding", + "quick-xml", + "rand", + "reqwest", + "ring", + "rustls-pemfile", + "serde", + "serde_json", + "snafu", + "tokio", + "tracing", + "url", + "walkdir", +] + +[[package]] name = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1293,24 +1476,6 @@ dependencies = [ ] [[package]] -name = "parquet2" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579fe5745f02cef3d5f236bfed216fd4693e49e4e920a13475c6132233283bce" -dependencies = [ - "async-stream", - "brotli", - "flate2", - "futures", - "lz4", - "parquet-format-safe", - "seq-macro", - "snap", - "streaming-decompression", - "zstd", -] - -[[package]] name = "parse-zoneinfo" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1365,9 +1530,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1392,7 +1557,7 @@ dependencies = [ [[package]] name = "polars" -version = "0.31.1" +version = "0.34.2" dependencies = [ "getrandom", "polars-core", @@ -1406,7 +1571,7 @@ dependencies = [ [[package]] name = "polars-algo" -version = "0.31.1" +version = "0.34.2" dependencies = [ "polars-core", "polars-lazy", @@ -1415,35 +1580,48 @@ dependencies = [ [[package]] name = "polars-arrow" -version = "0.31.1" +version = "0.34.2" dependencies = [ - "arrow2", + "ahash", + "arrow-format", "atoi", + "avro-schema", + "bytemuck", "chrono", "chrono-tz", + "dyn-clone", + "either", "ethnum", + "foreign_vec", + "futures", + "getrandom", "hashbrown 0.14.0", + "lexical-core", + "lz4", "multiversion", "num-traits", "polars-error", + "rustc_version", "serde", - "thiserror", - "version_check", + "simdutf8", + "streaming-iterator", + "strength_reduce", + "zstd", ] [[package]] name = "polars-core" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", - "arrow2", - "bitflags", + "bitflags 2.4.0", + "bytemuck", "chrono", "chrono-tz", "comfy-table", "either", "hashbrown 0.14.0", - "indexmap", + "indexmap 2.0.0", "itoap", "ndarray", "num-traits", @@ -1466,19 +1644,29 @@ dependencies = [ [[package]] name = "polars-error" -version = "0.31.1" +version = "0.34.2" dependencies = [ - "arrow2", + "arrow-format", + "avro-schema", + "object_store", "regex", + "simdutf8", "thiserror", ] [[package]] +name = "polars-ffi" +version = "0.34.2" +dependencies = [ + "polars-arrow", + "polars-core", +] + +[[package]] name = "polars-io" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", - "arrow2", "async-trait", "bytes", "chrono", @@ -1487,49 +1675,62 @@ dependencies = [ "flate2", "futures", "home", + "itoa", "lexical", "lexical-core", "memchr", "memmap2", "num-traits", + "object_store", "once_cell", + "percent-encoding", "polars-arrow", "polars-core", "polars-error", "polars-json", + "polars-parquet", "polars-time", "polars-utils", "rayon", "regex", + "reqwest", + "ryu", "serde", "serde_json", "simd-json", "simdutf8", + "smartstring", "tokio", + "tokio-util", + "url", ] [[package]] name = "polars-json" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", - "arrow2", + "chrono", "fallible-streaming-iterator", "hashbrown 0.14.0", - "indexmap", + "indexmap 2.0.0", + "itoa", "num-traits", "polars-arrow", "polars-error", "polars-utils", + "ryu", "simd-json", + "streaming-iterator", ] [[package]] name = "polars-lazy" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", - "bitflags", + "bitflags 2.4.0", + "futures", "glob", "once_cell", "polars-arrow", @@ -1544,27 +1745,36 @@ dependencies = [ "pyo3", "rayon", "smartstring", + "tokio", "version_check", ] [[package]] name = "polars-ops" -version = "0.31.1" +version = "0.34.2" dependencies = [ + "ahash", "argminmax", - "arrow2", "base64", + "bytemuck", "chrono", "chrono-tz", "either", + "hashbrown 0.14.0", "hex", - "indexmap", + "indexmap 2.0.0", "jsonpath_lib", "memchr", + "num-traits", "polars-arrow", "polars-core", + "polars-error", "polars-json", "polars-utils", + "rand", + "rand_distr", + "rayon", + "regex", "serde", "serde_json", "smartstring", @@ -1572,8 +1782,32 @@ dependencies = [ ] [[package]] +name = "polars-parquet" +version = "0.34.2" +dependencies = [ + "ahash", + "async-stream", + "base64", + "brotli", + "ethnum", + "flate2", + "futures", + "lz4", + "num-traits", + "parquet-format-safe", + "polars-arrow", + "polars-error", + "polars-utils", + "seq-macro", + "simdutf8", + "snap", + "streaming-decompression", + "zstd", +] + +[[package]] name = "polars-pipe" -version = "0.31.1" +version = "0.34.2" dependencies = [ "crossbeam-channel", "crossbeam-queue", @@ -1589,23 +1823,28 @@ dependencies = [ "polars-utils", "rayon", "smartstring", + "tokio", "version_check", ] [[package]] name = "polars-plan" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", - "arrow2", + "bytemuck", "chrono", "chrono-tz", "ciborium", + "libloading", "once_cell", + "percent-encoding", "polars-arrow", "polars-core", + "polars-ffi", "polars-io", "polars-ops", + "polars-parquet", "polars-time", "polars-utils", "pyo3", @@ -1613,27 +1852,29 @@ dependencies = [ "regex", "serde", "smartstring", - "strum_macros 0.25.1", + "strum_macros 0.25.2", "version_check", ] [[package]] name = "polars-row" -version = "0.31.1" +version = "0.34.2" dependencies = [ - "arrow2", + "polars-arrow", "polars-error", "polars-utils", ] [[package]] name = "polars-sql" -version = "0.31.1" +version = "0.34.2" dependencies = [ "polars-arrow", "polars-core", + "polars-error", "polars-lazy", "polars-plan", + "rand", "serde", "serde_json", "sqlparser", @@ -1641,9 +1882,8 @@ dependencies = [ [[package]] name = "polars-time" -version = "0.31.1" +version = "0.34.2" dependencies = [ - "arrow2", "atoi", "chrono", "chrono-tz", @@ -1651,6 +1891,7 @@ dependencies = [ "once_cell", "polars-arrow", "polars-core", + "polars-error", "polars-ops", "polars-utils", "regex", @@ -1660,10 +1901,12 @@ dependencies = [ [[package]] name = "polars-utils" -version = "0.31.1" +version = "0.34.2" dependencies = [ "ahash", + "bytemuck", "hashbrown 0.14.0", + "indexmap 2.0.0", "num-traits", "once_cell", "polars-error", @@ -1681,16 +1924,16 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] [[package]] name = "py-polars" -version = "0.18.13" +version = "0.19.12" dependencies = [ "ahash", "built", @@ -1708,6 +1951,9 @@ dependencies = [ "polars-core", "polars-error", "polars-lazy", + "polars-ops", + "polars-parquet", + "polars-plan", "pyo3", "pyo3-built", "serde_json", @@ -1717,9 +1963,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59" +checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" dependencies = [ "cfg-if", "indoc", @@ -1735,9 +1981,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" +checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" dependencies = [ "once_cell", "target-lexicon", @@ -1751,9 +1997,9 @@ checksum = "be6d574e0f8cab2cdd1eeeb640cbf845c974519fa9e9b62fa9c08ecece0ca5de" [[package]] name = "pyo3-ffi" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4" +checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" dependencies = [ "libc", "pyo3-build-config", @@ -1761,32 +2007,43 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2" +checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 1.0.109", + "syn 2.0.36", ] [[package]] name = "pyo3-macros-backend" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b" +checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" dependencies = [ + "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.36", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", + "serde", ] [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1839,9 +2096,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1849,14 +2106,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1865,43 +2120,93 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.4", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] -name = "regex-syntax" -version = "0.7.4" +name = "reqwest" +version = "0.11.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "ring" +version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] [[package]] name = "rle-decode-fast" @@ -1931,6 +2236,37 @@ dependencies = [ ] [[package]] +name = "rustls" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64", +] + +[[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.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1943,12 +2279,31 @@ 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" +dependencies = [ + "winapi-util", +] + +[[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 = "semver" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1965,31 +2320,31 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.176" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.176" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -2005,6 +2360,18 @@ dependencies = [ ] [[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 = "signal-hook" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2036,10 +2403,12 @@ dependencies = [ [[package]] name = "simd-json" -version = "0.10.0" -source = "git+https://github.com/ritchie46/simd-json?branch=initialize#946b316f686c6ad3050f694ea434248c38aa321d" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f07a84c7456b901b8dd2c1d44caca8b0fd2c2616206ee5acc9d9da61e8d9ec" dependencies = [ "ahash", + "getrandom", "halfbrown", "lexical-core", "once_cell", @@ -2057,15 +2426,15 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[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", ] @@ -2089,6 +2458,28 @@ dependencies = [ ] [[package]] +name = "snafu" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +dependencies = [ + "doc-comment", + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "snap" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2105,10 +2496,26 @@ 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" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] name = "sqlparser" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3706eefb17039056234df6b566b0014f303f867f2656108334a55b8096f59" +checksum = "0272b7bb0a225320170c99901b4b5fb3a4384e255a7f2cc228f61e2ba3893e75" dependencies = [ "log", ] @@ -2161,15 +2568,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" +checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.27", + "syn 2.0.36", ] [[package]] @@ -2185,9 +2592,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "91e02e55d62894af2a08aca894c6577281f76769ba47c94d5756bec8ac6e7373" dependencies = [ "proc-macro2", "quote", @@ -2196,9 +2603,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.7" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165d6d8539689e3d3bc8b98ac59541e1f21c7de7c85d60dc80e43ae0ed2113db" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" dependencies = [ "cfg-if", "core-foundation-sys", @@ -2216,39 +2623,28 @@ checksum = "06f6b473c37f9add4cf1df5b4d66a8ef58ab6c895f1a3b3f949cf3e21230140e" [[package]] name = "target-lexicon" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", -] - -[[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", + "syn 2.0.36", ] [[package]] @@ -2268,24 +2664,61 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", + "bytes", "libc", "mio", + "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.4", + "tokio-macros", "windows-sys", ] [[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.36", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.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" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -2304,11 +2737,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -2316,6 +2749,50 @@ dependencies = [ ] [[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.36", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] name = "unicode-bidi" version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2323,9 +2800,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -2344,15 +2821,21 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unindent" -version = "0.1.11" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -2384,10 +2867,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +name = "walkdir" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] [[package]] name = "wasi" @@ -2416,11 +2912,23 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", "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" @@ -2438,7 +2946,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.36", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2450,6 +2958,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] +name = "wasm-streams" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[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-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2466,6 +3003,15 @@ 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" @@ -2491,9 +3037,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -2506,77 +3052,106 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.1" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys", +] + +[[package]] name = "xxhash-rust" -version = "0.8.6" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" + +[[package]] +name = "zerocopy" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "735a71d46c4d68d71d4b24d03fdc2b98e38cea81730595801db779c04fe80d70" +checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.36", +] [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] diff --git a/pkgs/development/python-modules/polars/all_horizontal.patch b/pkgs/development/python-modules/polars/all_horizontal.patch new file mode 100644 index 00000000000..3caf548d4ac --- /dev/null +++ b/pkgs/development/python-modules/polars/all_horizontal.patch @@ -0,0 +1,13 @@ +diff --git a/crates/polars-lazy/src/frame/mod.rs b/crates/polars-lazy/src/frame/mod.rs +index 2d2ede651..be24b8809 100644 +--- a/crates/polars-lazy/src/frame/mod.rs ++++ b/crates/polars-lazy/src/frame/mod.rs +@@ -25,7 +25,7 @@ pub use parquet::*; + use polars_core::frame::explode::MeltArgs; + use polars_core::prelude::*; + use polars_io::RowCount; +-use polars_plan::dsl::all_horizontal; ++use polars_plan::dsl::functions::all_horizontal; + pub use polars_plan::frame::{AllowedOptimizations, OptState}; + use polars_plan::global::FETCH_ROWS; + #[cfg(any(feature = "ipc", feature = "parquet", feature = "csv"))] diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index ccd6f2b79ba..fc82d863856 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -3,20 +3,27 @@ , buildPythonPackage , pythonOlder , rustPlatform +, cmake , libiconv , fetchFromGitHub , typing-extensions +, jemalloc , rust-jemalloc-sys , darwin }: let pname = "polars"; - version = "0.18.13"; + version = "0.19.12"; rootSource = fetchFromGitHub { owner = "pola-rs"; repo = "polars"; rev = "refs/tags/py-${version}"; - hash = "sha256-kV30r2wmswpCUmMRaFsCOeRrlTN5/PU0ogaU2JIHq0E="; + hash = "sha256-6tn3Q6oZfMjgQ5l5xCFnGimLSDLOjTWCW5uEbi6yFZY="; + }; + rust-jemalloc-sys' = rust-jemalloc-sys.override { + jemalloc = jemalloc.override { + disableInitExecTls = true; + }; }; in buildPythonPackage { @@ -25,6 +32,13 @@ buildPythonPackage { disabled = pythonOlder "3.6"; src = rootSource; + patches = [ + # workaround for apparent rustc bug + # remove when we're at Rust 1.73 + # https://github.com/pola-rs/polars/issues/12050 + ./all_horizontal.patch + ]; + # Cargo.lock file is sometimes behind actual release which throws an error, # thus the `sed` command # Make sure to check that the right substitutions are made when updating the package @@ -36,9 +50,7 @@ buildPythonPackage { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "arrow2-0.17.3" = "sha256-pM6lNjMCpUzC98IABY+M23lbLj0KMXDefgBMjUPjDlg="; "jsonpath_lib-0.3.0" = "sha256-NKszYpDGG8VxfZSMbsTlzcMGFHBOUeFojNw4P2wM3qk="; - "simd-json-0.10.0" = "sha256-0q/GhL7PG5SLgL0EETPqe8kn6dcaqtyL+kLU9LL+iQs="; }; }; cargoRoot = "py-polars"; @@ -48,10 +60,19 @@ buildPythonPackage { propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ + # needed for libz-ng-sys + # TODO: use pkgs.zlib-ng + cmake + ] ++ (with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]); buildInputs = [ - rust-jemalloc-sys + rust-jemalloc-sys' ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 0ce6027c1bf..0243ef1bd1b 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -42,6 +42,11 @@ buildPythonPackage rec { requests-toolbelt ]; + disabledTestPaths = [ + # tests requiring network + "tests/integration" + ]; + pythonImportsCheck = [ "praw" ]; diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 9a8ecea7b3c..6231ff2b812 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -45,6 +45,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # tests requiring network + "tests/integration" + ]; + pythonImportsCheck = [ "prawcore" ]; diff --git a/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix b/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix deleted file mode 100644 index 0b2a85f7e94..00000000000 --- a/pkgs/development/python-modules/privacyidea-ldap-proxy/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj, fetchpatch }: - -buildPythonPackage rec { - pname = "privacyidea-ldap-proxy"; - version = "0.7"; - - src = fetchFromGitHub { - owner = "privacyidea"; - repo = pname; - rev = "v${version}"; - sha256 = "1i2kgxqd38xvb42qj0a4a35w4vk0fyp3n7w48kqmvrxc77p6r6i8"; - }; - - patches = [ - # support for LDAPCompareRequest. - (fetchpatch { - url = "https://github.com/mayflower/privacyidea-ldap-proxy/commit/a13356717379b174f1a6abf767faa0dbd459f5dd.patch"; - hash = "sha256-SBTj9ayQ8JFD8BoYIl77nxWVV3PXnHZ8JMlJnxd/nEk="; - }) - ]; - - propagatedBuildInputs = [ twisted ldaptor configobj ]; - - pythonImportsCheck = [ "pi_ldapproxy" ]; - - meta = with lib; { - description = "LDAP Proxy to intercept LDAP binds and authenticate against privacyIDEA"; - homepage = "https://github.com/privacyidea/privacyidea-ldap-proxy"; - license = licenses.agpl3Only; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix index 889f835861e..5a8e2dfc1fc 100644 --- a/pkgs/development/python-modules/prophet/default.nix +++ b/pkgs/development/python-modules/prophet/default.nix @@ -2,71 +2,58 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch - , setuptools , cmdstanpy , numpy , matplotlib , pandas -, lunarcalendar -, convertdate , holidays -, python-dateutil , tqdm , importlib-resources +, dask +, distributed + , pytestCheckHook }: buildPythonPackage rec { pname = "prophet"; - version = "1.1.4"; - format = "pyproject"; + version = "1.1.5"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "facebook"; repo = "prophet"; - rev = "refs/tags/v${version}"; - hash = "sha256-pbJ0xL5wDZ+rKgtQQTJPsB1Mu2QXo3S9MMpiYkURsz0="; + rev = version; + hash = "sha256-liTg5Hm+FPpRQajBnnJKBh3JPGyu0Hflntf0isj1FiQ="; }; - patches = [ - # TODO: remove when bumping version from 1.1.4 - (fetchpatch { - name = "fix-stan-file-temp-dest.patch"; - url = "https://github.com/facebook/prophet/commit/374676500795aec9d5cbc7fe5f7a96bf00489809.patch"; - hash = "sha256-sfiQ2V3ZEF0WM9oM1FkL/fhZesQJ1i2EUPYJMdDA2UM="; - relative = "python"; - }) - ]; - - sourceRoot = "${src.name}/python"; + sourceRoot = "source/python"; env.PROPHET_REPACKAGE_CMDSTAN = "false"; nativeBuildInputs = [ setuptools ]; - # TODO: update when bumping version from 1.1.4 propagatedBuildInputs = [ cmdstanpy numpy matplotlib pandas - lunarcalendar - convertdate holidays - python-dateutil tqdm importlib-resources ]; + passthru.optional-dependencies.parallel = [ dask distributed ] ++ dask.optional-dependencies.dataframe; + preCheck = '' - # the generated stan_model directory only exists in build/lib* - cd build/lib* + # use the generated files from $out for testing + mv prophet/tests . + rm -r prophet ''; nativeCheckInputs = [ pytestCheckHook ]; @@ -74,11 +61,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "prophet" ]; meta = { - homepage = "https://facebook.github.io/prophet/"; + changelog = "https://github.com/facebook/prophet/releases/tag/${src.rev}"; description = "A tool for producing high quality forecasts for time series data that has multiple seasonality with linear or non-linear growth"; - changelog = "https://github.com/facebook/prophet/releases/tag/v${version}"; + homepage = "https://facebook.github.io/prophet/"; license = lib.licenses.mit; - platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; # cmdstanpy doesn't currently build on darwin }; } diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 2e58df25f2f..626f0913dfe 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.3.0"; + version = "7.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-KZC6a0ZrTPn033tQxn7HeCRhZUAgO2I5rGDzLJITtpI="; + hash = "sha256-V6yw/OscTGwrFcjHEhwtaT7txWLqbVj0uYjuoSAtP2E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix index 2d01e0cf8ff..2ef7b55d0d3 100644 --- a/pkgs/development/python-modules/py-nextbusnext/default.nix +++ b/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "py-nextbusnext"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ViViDboarder"; repo = "py_nextbus"; rev = "refs/tags/v${version}"; - hash = "sha256-044VDg7bQNNnRGiPZW9gwo3Bzq0LPYKTrd3EgmBOcGA="; + hash = "sha256-iJPbRhXgA1AIkyf3zGZ9tuFAw8h6oyBbh7Ln/y72fyQ="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 7401af8e47d..b5785dfd3f2 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -1,15 +1,17 @@ { lib , buildPythonPackage , aiohttp -, bitarray +, async-timeout , chacha20poly1305-reuseable , cryptography , deepdiff , fetchFromGitHub +, ifaddr , mediafile , miniaudio -, netifaces , protobuf +, pydantic +, pyfakefs , pytest-aiohttp , pytest-asyncio , pytest-httpserver @@ -18,23 +20,25 @@ , pythonRelaxDepsHook , pythonOlder , requests +, setuptools , srptools , stdenv +, tabulate , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.13.4"; - format = "setuptools"; + version = "0.14.4"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "postlund"; - repo = pname; + repo = "pyatv"; rev = "refs/tags/v${version}"; - hash = "sha256-rZnL18vO8eYn70GzeKSY528iTc0r/seGv0dYDYGHNzw="; + hash = "sha256-w3WOlZFfuCmekUsr8msi2LXTm6j8/Bk49L3MiYF7lOM="; }; postPatch = '' @@ -59,24 +63,28 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ aiohttp - bitarray + async-timeout chacha20poly1305-reuseable cryptography + ifaddr mediafile miniaudio - netifaces protobuf + pydantic requests srptools + tabulate zeroconf ]; nativeCheckInputs = [ deepdiff + pyfakefs pytest-aiohttp pytest-asyncio pytest-httpserver @@ -84,10 +92,6 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "--asyncio-mode=legacy" - ]; - disabledTests = lib.optionals (stdenv.isDarwin) [ # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False "test_stream_retransmission" diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index 4147e01668a..e8d33c93901 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pycfmodel"; - version = "0.20.3"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dHgd6vnmlg+VXMp7QUZoT2aic1X05lJGm8hDrowALvk="; + hash = "sha256-5KgZnph9BAE2w3Y93abDHQWmxnFdyVOuW/NdzN66hgA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycomposefile/default.nix b/pkgs/development/python-modules/pycomposefile/default.nix new file mode 100644 index 00000000000..e7707c763a2 --- /dev/null +++ b/pkgs/development/python-modules/pycomposefile/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pyyaml +, twine +}: + +buildPythonPackage rec { + pname = "pycomposefile"; + version = "0.0.30"; + + src = fetchPypi { + inherit pname version; + extension = "tar.gz"; + hash = "sha256-GQopIO8F+G5iDz4NF2GTHCpXo4uqKHdHIzffacihylM="; + }; + + nativeBuildInput = [ + setuptools + ]; + + propagatedBuildInputs = [ + pyyaml + twine + ]; + + doCheck = false; # tests are broken + + meta = with lib; { + description = "Python library for structured deserialization of Docker Compose files"; + homepage = "https://github.com/smurawski/pycomposefile"; + license = licenses.mit; + maintainers = with maintainers; [ mdarocha ]; + }; +} diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index c9a3f9a409c..5cfd38ff37d 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.2"; + version = "0.14.3"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-CYGEyTLDcQZzfhixUnt0GlPhkyfsBLXLxWQlml6ydlA="; + hash = "sha256-t+QM11ogRJrf4tdSW+N5uf6S9tMeUjPkSfo03c1DmNk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix index 64dafa97db7..fc8965fd353 100644 --- a/pkgs/development/python-modules/pydbus/default.nix +++ b/pkgs/development/python-modules/pydbus/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pygobject3 }: buildPythonPackage rec { pname = "pydbus"; version = "0.6.0"; - pyproejct = true; + pyproject = true; src = fetchFromGitHub { owner = "LEW21"; @@ -21,6 +22,10 @@ buildPythonPackage rec { --replace "getargspec" "getfullargspec" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pygobject3 ]; diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index f40dc187124..2ada48a2be0 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyftpdlib"; - version = "1.5.8"; + version = "1.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v22rtn3/MrP/BA4oJf/7xrjecDc7ydm1U0gMxNdQTWw="; + hash = "sha256-Mj1MQvFAau203xj69oD2TzLAgP9m9sJgkLpZL1v8Sg8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix index 886747e3161..ed2659fad6c 100644 --- a/pkgs/development/python-modules/pyschlage/default.nix +++ b/pkgs/development/python-modules/pyschlage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2023.9.1"; + version = "2023.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-HFgQXMUmjWW5syBwtCunQ/TeulPwtF48Nesy9iZ3hlU="; + hash = "sha256-9RXk3wDDX0sGNsci8EClfj17VCYwtUiMyNJj1FLLJKk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 603800f9a16..43d19bbc386 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.35"; + version = "1.0.36"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E3XUQ7Ltu9zhjWVvl1LN+UUz8B2dAjLa0CZI9ca35nc="; + hash = "sha256-lsHKwFzfkGWuUiZGkt9zwjNDDU7i6gcqcEsi5SQqsSQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index a4309ea0fe5..57d2794b7a4 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.10.5"; + version = "0.10.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-iiE6XHj5632sBlivUHz7HiNRjNpEh+OMqcJ65o2km6I="; + hash = "sha256-CmIhNZraDawiiKg6WuHUVRMwXSVEizg1KEv7o2ZP1Hc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pysignalclirestapi/default.nix b/pkgs/development/python-modules/pysignalclirestapi/default.nix index 023b6dde3eb..0e033ad99ff 100644 --- a/pkgs/development/python-modules/pysignalclirestapi/default.nix +++ b/pkgs/development/python-modules/pysignalclirestapi/default.nix @@ -1,23 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , requests , future }: buildPythonPackage rec { pname = "pysignalclirestapi"; - version = "0.3.18"; + version = "0.3.21"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "bbernhard"; repo = "pysignalclirestapi"; rev = version; - hash = "sha256-BF4BmnQVfrj7f0N+TN/d7GNuDTbDQfwsCkUn2pVmMWo="; + hash = "sha256-CAZ6UgGz7ZDXlQlngi+hEhczOphvAT/Yl9vLqnrS1Qc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests future diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index e63ecdc6669..f4121a53e79 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -7,13 +7,13 @@ , pyyaml , requests , responses -, setuptools-scm +, poetry-core }: buildPythonPackage rec { pname = "pysolcast"; - version = "1.0.15"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -21,13 +21,11 @@ buildPythonPackage rec { owner = "mcaulifn"; repo = "solcast"; rev = "refs/tags/v${version}"; - hash = "sha256-CvijYl6zSwQ6BrGZPJWp75jAApc2y/7cPdZxMq5AjmI="; + hash = "sha256-jLhM47o6LvkPux0kusOrRk4TDS6VLWE0QMEiQxlBCwo="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ - setuptools-scm + poetry-core ]; propagatedBuildInputs = [ @@ -41,11 +39,6 @@ buildPythonPackage rec { responses ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" - ''; - pythonImportsCheck = [ "pysolcast" ]; diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index fedf919c7ea..a7e27ac64aa 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.10.0"; + version = "0.11.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bHnCa7laDYi424czCGCPZuomqEOAeihjDTTW35ZTiac="; + hash = "sha256-8d/cjD7dcA4/bKZtQUjgUPVgfZdjl+ibOFRpC9dyybA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 78f97117f89..dd2b6417379 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7GJnkT7FOYzytQyOCP8zU5hUk4SbeC7gc1qkhl5eXGo="; + hash = "sha256-wGPMrYaTtKkkNW88eyiiciFcBSTRqqChYi6e15WUCHo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-opensky/default.nix b/pkgs/development/python-modules/python-opensky/default.nix index 40974345dcf..0f23163d9af 100644 --- a/pkgs/development/python-modules/python-opensky/default.nix +++ b/pkgs/development/python-modules/python-opensky/default.nix @@ -8,12 +8,13 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, syrupy , yarl }: buildPythonPackage rec { pname = "python-opensky"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-opensky"; rev = "refs/tags/v${version}"; - hash = "sha256-62ncinv6XUGB1dYle/yqSCyJNbGD9BLaOqrF/zjL2fA="; + hash = "sha256-xNXFvCUZ/x5ox3KxmG3eA73wpX4fwhvAVmlfcKiT1V8="; }; postPatch = '' @@ -47,6 +48,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 167331e05f1..3fa39b27fba 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.35.0"; + version = "0.35.3"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-tZUsDBEvcLGTw/CqcxVWlrXwxlGsGdDeQzSym9BurxM="; + hash = "sha256-3XTVHs+mLePudLnr+bAN4pHvHtUcE0D5Hw+50Vxhlzw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix index d8365a034eb..20b08ebd443 100644 --- a/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/pkgs/development/python-modules/pytrafikverket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytrafikverket"; - version = "0.3.7"; + version = "0.3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9s4KbYFhQVf+16GT4hbGkmwxQhtMu60SwrLWHbdJXAY="; + hash = "sha256-3p2tKFuzgl+VFRRXV66MRgcL1XS8xxDqMOUZw+Ql/5E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index db2d65450f8..c19e16cae96 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.74"; + version = "9.2.75"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-49Vcm6JkIpOm+U1Q/BrTi8jiEWZdaNs77TaCMjOLpyw="; + hash = "sha256-8P8xOb4P1JsbPZya8s1Bl16VsYtHQdAD05sc8EAcEpM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qcodes-loop/default.nix b/pkgs/development/python-modules/qcodes-loop/default.nix index 80355c1b534..93f45278651 100644 --- a/pkgs/development/python-modules/qcodes-loop/default.nix +++ b/pkgs/development/python-modules/qcodes-loop/default.nix @@ -1,34 +1,33 @@ { lib , stdenv -, fetchpatch -, fetchPypi -, pythonOlder , buildPythonPackage -, qcodes +, fetchPypi , h5py +, hickle +, hypothesis +, ipython , lazy-loader , matplotlib , numpy , pandas +, pyqt5 +, pyqtgraph +, pytest-mock +, pytest-xdist +, pytestCheckHook +, pythonOlder +, qcodes , setuptools +, slack-sdk , versioningit , wheel , xarray -, hickle -, ipython -, slack-sdk -, hypothesis -, pytest-xdist -, pytest-mock -, pyqtgraph -, pyqt5 -, pytestCheckHook }: buildPythonPackage rec { pname = "qcodes-loop"; version = "0.1.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -38,15 +37,6 @@ buildPythonPackage rec { hash = "sha256-TizNSC49n4Xc2BmJNziARlVXYQxp/LtwmKpgqQkQ3a8="; }; - patches = [ - # https://github.com/QCoDeS/Qcodes_loop/pull/39 - (fetchpatch { - name = "relax-versioningit-dependency.patch"; - url = "https://github.com/QCoDeS/Qcodes_loop/commit/58006d3fb57344ae24dd44bceca98004617b5b57.patch"; - hash = "sha256-mSlm/Ql8e5xPL73ifxSoVc9+U58AAcAmBkdW5P6zEsg="; - }) - ]; - nativeBuildInputs = [ setuptools versioningit @@ -82,11 +72,8 @@ buildPythonPackage rec { pyqt5 ]; - pythonImportsCheck = [ "qcodes_loop" ]; - - disabledTestPaths = [ - # test broken in 0.1.1, see https://github.com/QCoDeS/Qcodes_loop/pull/25 - "src/qcodes_loop/tests/test_hdf5formatter.py" + pythonImportsCheck = [ + "qcodes_loop" ]; postInstall = '' @@ -96,6 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "Features previously in QCoDeS"; homepage = "https://github.com/QCoDeS/Qcodes_loop"; + changelog = "https://github.com/QCoDeS/Qcodes_loop/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ evilmav ]; # Some tests fail on this platform diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index 76d5b34d724..a09e6492348 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,11 +1,11 @@ { cp39 = { - sha256 = "7708cedbeed8e37e468740b75aa941b2a3c80d2cb8791081e0b0ea159617a912"; + sha256 = "0e0f7dbeb4444940c72b64fdecd6f331593466914b2dffeed03ce97225acec14"; }; cp310 = { - sha256 = "c9b5aabf5f41fe05028e4f3a271dc89ca7cd9c210f48a4ed815b852210ebb5a8"; + sha256 = "b83621f5d2d4079e6ae624c3bf30046a4fefa0ea7ea5e4a4dfe4b50c580b3768"; }; cp311 = { - sha256 = "7b0286cd05d9107a2d978c716a7447c09ffd382971e5b2b388602d56f6b1c662"; + sha256 = "8384b3f30bc1446ef810e9e894afa03238c5ac40d3c40c0740d82f347112015d"; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 3893ad842fd..6edff484798 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -52,7 +52,7 @@ let pname = "ray"; - version = "2.6.1"; + version = "2.7.0"; in buildPythonPackage rec { inherit pname version; diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index ff57846c20c..8fcb212c702 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "recurring-ical-events"; - version = "2.0.2"; + version = "2.1.0"; format = "setuptools"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "niccokunzmann"; repo = "python-recurring-ical-events"; rev = "v${version}"; - hash = "sha256-aM7c/HE8xLqT5wCLaCrfFn6c7FIkCJA6TTICZprAgNM="; + hash = "sha256-HNImooD6+hsMIfJX8LuHw1YyFIQNbY7dAjqdupPbhEE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 93492852d02..f773c33307a 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.7.11"; + version = "0.7.12"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-SPmLzTJQNDaQ6AofIET7eZkxJxxfJ00/wNpInXo0u2I="; + hash = "sha256-molHdZ51irWEE3OHywP5n0bCClK8z67JGiYRwvHAOxs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 031c44ebb2e..83980ecdcd0 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-Z3vFQB6/z3dWtYikN02QviG+0aDRzt8kk6IOpl/VmF0="; + hash = "sha256-3pcQsSUBHlgHKuZt5kb4ozvIujP6dsaYMab/+fri4a4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 4b608dfed3b..fb650d2d95a 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "1.4.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3fU4BT0AwyFTg15Oca95JgDrHxIqKJOpJolDRvo7hxc="; + hash = "sha256-ZK3M689vv3Kr2OoNdxaCs9Spo6h6xJmhTsPajKHYtkA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix b/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix new file mode 100644 index 00000000000..6f35e2b59e3 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools-scm +, sphinx +, wavedrom +, xcffib +, cairosvg +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-wavedrom"; + version = "3.0.4"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-0zTHVBr9kXwMEo4VRTFsxdX2HI31DxdHfLUHCQmw1Ko="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ + sphinx + wavedrom + xcffib + cairosvg + ]; + + # No tests included + doCheck = false; + + pythonImportsCheck = [ "sphinxcontrib.wavedrom" ]; + + pythonNamespaces = [ "sphinxcontrib" ]; + + meta = with lib; { + description = "A sphinx extension that allows including wavedrom diagrams by using its text-based representation"; + homepage = "https://github.com/bavovanachte/sphinx-wavedrom"; + license = licenses.mit; + maintainers = with maintainers; [ fsagbuya ]; + }; +} diff --git a/pkgs/development/python-modules/sqlite-migrate/default.nix b/pkgs/development/python-modules/sqlite-migrate/default.nix new file mode 100644 index 00000000000..b19d3e590f5 --- /dev/null +++ b/pkgs/development/python-modules/sqlite-migrate/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +, sqlite-utils +}: + +buildPythonPackage rec { + pname = "sqlite-migrate"; + version = "0.1a2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wztAqe3TW0SQ4JX1XPWeA4KNJci5c3fNih97cmlPwRE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + sqlite-utils + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sqlite_migrate" + ]; + + meta = with lib; { + description = "A simple database migration system for SQLite, based on sqlite-utils"; + homepage = "https://github.com/simonw/sqlite-migrate"; + changelog = "https://github.com/simonw/sqlite-migrate/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ aldoborrero ]; + }; +} diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index b764d957345..c770cce0fdf 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -18,7 +18,7 @@ , pympler , python-dateutil , pythonOlder -, pythonRelaxDepsHook +, setuptools , requests , rich , tenacity @@ -32,21 +32,18 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.27.2"; - format = "setuptools"; + version = "1.28.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version format; - hash = "sha256-M/muDeW31ZzX2rqHdUxU7IN6dsJKz8QdH45RSPIJA+4="; + inherit pname version; + hash = "sha256-vm/SQOKQvip5hXsa14IrU6PJDxXPbOl9iev02ALX7bE="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; - - pythonRelaxDeps = [ - "pillow" - "pydeck" + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index d08fe36473a..92fe9124bf7 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.7"; + version = "0.7.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SrOFKXh/wG2+HKaLvyNP6/Le9R3Ri7+/xsUBAazo7js="; + hash = "sha256-lBAel9ueuyr6AFNCYk1nHRvf8KvtiszESzRIOqjBjHQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index ab6d341b264..568c2dc6780 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "sybil"; - version = "4.0.1"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "simplistix"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NvgmAFRuiBbyPnJykQlYNyQYALx1bFubMrakw671fDY="; + hash = "sha256-FeyamQDm/EqOWrRlxA8iIQniHI5xag+zUVfRGRHmslE="; }; # Circular dependency with testfixtures diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 158948d7dd5..77f1acb8687 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.6"; + version = "0.19.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-GdSGfysTK7NPLdruHz/rp8xCqGivXgVcxqWAtC+heTM="; + hash = "sha256-OkqKWCnwpNgGR2vZTEp+IxpWGHn6xP4ERwWsxEshKmQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index 2352416014d..7af5740fe31 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.11.2"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DrWogA/aBhDglf73aLSNR8hYybhBenha9kcEbC317Ss="; + hash = "sha256-TKrZQbYPUeUP3BCYZiNNQHkQrvd/EjOqG2tdFox0J+4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/x-wr-timezone/default.nix b/pkgs/development/python-modules/x-wr-timezone/default.nix index 8944078f70a..3fe03d99356 100644 --- a/pkgs/development/python-modules/x-wr-timezone/default.nix +++ b/pkgs/development/python-modules/x-wr-timezone/default.nix @@ -36,6 +36,9 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; + # https://github.com/niccokunzmann/x-wr-timezone/issues/8 + doCheck = false; + pythonImportsCheck = [ "x_wr_timezone" ]; meta = { diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 9fd5e993ec9..c66f85cc158 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.15.1"; + version = "1.15.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lg+lS+EinZb0MXgTPgsZXAAzkf3Ens22tptzdNtr5BY="; + hash = "sha256-qtn1QL0i3FA+W1UGzEeFb6zwgapx/TX3JzcbY+HkAr8="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index a26d45415ea..7c2cf10e5da 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.115.2"; + version = "0.119.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-qLJWOZyWyLx5orDbvVSluA+zFvHN2393hyVC3ty87ug="; + hash = "sha256-VaqKk2WrRLZM2tfx3+y9GngEc6rMcw0b12ExFVfDYf4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index b7e0608428f..a8959a9e863 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, pytest-asyncio , pytestCheckHook , pythonOlder , zigpy @@ -27,6 +28,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index dde789fd289..1f6560377ea 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.57.2"; + version = "0.58.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-v4H8syWbXqmfvOznRECgSjYi246+socPJTffb79MXK4="; + hash = "sha256-i2P9QyhT/UQ8Xu0IfQ2OzAxIiMF4H04Jkz3/6e2FCpY="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index bd56eb539e0..a43520ecb4b 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { preConfigure = lib.optionalString stdenv.isFreeBSD '' substituteInPlace configure --replace '`uname -r`' \ - ${toString stdenv.hostPlatform.parsed.kernel.version}.0 + ${toString stdenv.hostPlatform.parsed.kernel.version}.0- '' + lib.optionalString stdenv.isDarwin ( let OSRELEASE = '' $(awk -F '"' '/#define OSRELEASE/{ print $2 }' \ diff --git a/pkgs/development/tools/bbin/default.nix b/pkgs/development/tools/bbin/default.nix index 3bbece578ab..ab8638e5033 100644 --- a/pkgs/development/tools/bbin/default.nix +++ b/pkgs/development/tools/bbin/default.nix @@ -1,19 +1,20 @@ { lib , stdenvNoCC , fetchFromGitHub +, gitUpdater , makeWrapper , babashka-unwrapped }: stdenvNoCC.mkDerivation rec { pname = "bbin"; - version = "0.1.5"; + version = "0.2.1"; src = fetchFromGitHub { owner = "babashka"; repo = "bbin"; rev = "v${version}"; - sha256 = "sha256-5hohAr6a8C9jPwhQi3E66onSa6+P9plS939fQM/fl9Q="; + sha256 = "sha256-mF8+Fm1vwLUw5l2PqV+vFFlr6y2JpKBwc+J3PdKQ6Fo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -33,6 +34,10 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + meta = with lib; { homepage = "https://github.com/babashka/bbin"; description = "Install any Babashka script or project with one command"; diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix index d92dee556c6..c96e5a71948 100644 --- a/pkgs/development/tools/biome/default.nix +++ b/pkgs/development/tools/biome/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.2.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-WiyORFXS1kpOaMCbnPdr5ewa6D4ozFTIRSArVlA2FvY="; + hash = "sha256-1yVXzPbLqLiqn3RN3mZNULOabydYtjXam+BB3aKwhTs="; }; - cargoHash = "sha256-s2CVEGYRzJgsg4soETStpaJ7GDNdJCBJ+Qbn88sFlDQ="; + cargoHash = "sha256-3EkYxq80fkRJ1U4nLtp7dYEEFaqDhgptnNsNghFQAZI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 66a25550cd1..e45c5acd713 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-qFfCYgnCSePbE/YSMP3Ib1X/wTZQvTI0k7A+KNL6q0g="; + hash = "sha256-FPhUGFumbO28rPWNDTrUNqMx0ppbotp9z6u8cCEHu/g="; }; - cargoHash = "sha256-DpNaAuorbpguSPneuWw0DVZQF+QbXOCW6VWwtfYVqkw="; + cargoHash = "sha256-hak0xMV6MSqM88bNY+2C5B5YlRWlZ+dDYu50pYEDsmI="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index a14fd890526..b8ab1367ab1 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.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-jMpOSAmjJKDG8uvjjwZ03cu+5JmFzYMuNieotjvgnME="; + hash = "sha256-pjeqaLCxWq2maz+C4jCNNRhYhclvcABi6zC+Qxy2GPw="; }; - vendorHash = "sha256-UAMhQK2Sw7W6RfkSPD2P0dGc0bimAL8jD/gEc/hRaD0="; + vendorHash = "sha256-pBRU/eWuI14uDmTPo593hW0YAye5Y1Fm1axd/+X7nS8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index 71b5864fdb6..f9601066291 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "circup"; - version = "1.2.3"; + version = "1.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "adafruit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6RjZHMZBL8p72+JeZOzyD/x1qiZay2ApJEmp9IXXpDA="; + hash = "sha256-kax4gnvRkHSqj0Y6Rk8eyPpT7Wia2QngCQtxpqWSl9s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index cc6d2a70f21..55df9269f92 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.10.0"; + version = "7.11.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - hash = "sha256-KmKIr7Y3CQmv1rXdju6xwUHABqj/dkXpgWc/yNrAza8="; + hash = "sha256-lp6EXdwmgmjhFxRQXn2P4iRrtJS1QTvg4225V/6E7MI="; }; - vendorHash = "sha256-lc0okniezfTNLsnCBIABQxSgakRUidsprrEnkH8il2g="; + vendorHash = "sha256-p3EhXrRjAFG7Ayfj/ArAWO7KL3S/iR/nwFwXcDc+DSs="; subPackages = [ "fly" ]; diff --git a/pkgs/development/tools/cosmocc/default.nix b/pkgs/development/tools/cosmocc/default.nix deleted file mode 100644 index c3db97dfdc6..00000000000 --- a/pkgs/development/tools/cosmocc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ runCommand, cosmopolitan }: - -let - inherit (cosmopolitan) version; - - cosmocc = - runCommand "cosmocc-${version}" - { - pname = "cosmocc"; - inherit version; - - meta = cosmopolitan.meta // { - description = "compilers for Cosmopolitan C/C++ programs"; - }; - passthru.tests = { - cc = runCommand "c-test" { } '' - cat > hello.c << END - #include <stdio.h> - int main() { - printf("Hello world!\n"); - return 0; - } - END - ${cosmocc}/bin/cosmocc hello.c - ./a.out > $out - ''; - }; - } '' - mkdir -p $out/bin - install ${cosmopolitan.dist}/tool/scripts/{cosmocc,cosmoc++} $out/bin - sed 's|/opt/cosmo\([ /]\)|${cosmopolitan.dist}\1|g' -i $out/bin/* - ''; -in -cosmocc diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/development/tools/database/pgweb/default.nix index a60ad380ce7..affda7ff49e 100644 --- a/pkgs/development/tools/database/pgweb/default.nix +++ b/pkgs/development/tools/database/pgweb/default.nix @@ -1,14 +1,19 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, pgweb +}: buildGoModule rec { pname = "pgweb"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "sosedoff"; repo = pname; rev = "v${version}"; - hash = "sha256-0wwDye7Iku9+brYoVqlCpnm+A3xsr8tL2dyWaBVvres="; + hash = "sha256-gM7hqFriXkcwNO+I3d138kfp1F4YsO/Qbq0NzMszkwM="; }; postPatch = '' @@ -29,7 +34,14 @@ buildGoModule rec { in [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ]; + passthru.tests.version = testers.testVersion { + version = "v${version}"; + package = pgweb; + command = "pgweb --version"; + }; + meta = with lib; { + changelog = "https://github.com/sosedoff/pgweb/releases/tag/v${version}"; description = "A web-based database browser for PostgreSQL"; longDescription = '' A simple postgres browser that runs as a web server. You can view data, @@ -37,6 +49,7 @@ buildGoModule rec { ''; homepage = "https://sosedoff.github.io/pgweb/"; license = licenses.mit; + mainProgram = "pgweb"; maintainers = with maintainers; [ zupo luisnquin ]; }; } diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix index fe3df4ee9a2..128f00c0eb3 100644 --- a/pkgs/development/tools/database/prqlc/default.nix +++ b/pkgs/development/tools/database/prqlc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prqlc"; - version = "0.9.5"; + version = "0.10.0"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; rev = version; - hash = "sha256-t/l1fMZpGCLtxjCtOMv4eaj6oNyFX9BFgfc3OwYrxs0="; + hash = "sha256-McJ3V3kndawheWo/xsBU8Xi8K47vHMpQHTpDbR4vkWk="; }; - cargoHash = "sha256-bdPjLOHh5qC1/LNfsUC26h4v3EuwiM9HqoQxeeNCOIw="; + cargoHash = "sha256-Q1PSpGpd5QRT6QKQOd6hVdZrlDBawfsqqp/CTJfnl7E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock b/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock index af36a997a68..3fe77e67741 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock +++ b/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock @@ -12,15 +12,58 @@ 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" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", +] + +[[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] [[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -31,30 +74,29 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -65,17 +107,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -86,9 +128,9 @@ checksum = "ea50b14b7a4b9343f8c627a7a53c52076482bd4bdad0a24fd3ec533ed616cc2c" [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "approx" @@ -101,20 +143,36 @@ dependencies = [ [[package]] name = "argon2" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95c2fcf79ad1932ac6269a738109997a83c227c09b75842ae564dc8ede6a861c" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" dependencies = [ "base64ct", "blake2", + "cpufeatures", "password-hash", ] [[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + +[[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", @@ -126,10 +184,25 @@ dependencies = [ ] [[package]] +name = "assert_fs" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" +dependencies = [ + "anstyle", + "doc-comment", + "globwalk", + "predicates", + "predicates-core", + "predicates-tree", + "tempfile", +] + +[[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -145,29 +218,29 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] [[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-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -189,7 +262,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -242,6 +315,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -249,9 +337,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.1" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1e31e207a6b8fb791a38ea3105e6cb541f55e4d029902d3039a4ad07cc4105" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -265,7 +353,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9df288bec72232f78c1ec5fe4e8f1d108aa0265476e93097593c803c8c02062a" dependencies = [ - "base64 0.21.1", + "base64 0.21.4", "blowfish", "getrandom", "subtle", @@ -273,24 +361,42 @@ dependencies = [ ] [[package]] -name = "bigdecimal" -version = "0.3.1" +name = "bincode" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ - "num-bigint", - "num-integer", - "num-traits", "serde", ] [[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -331,13 +437,57 @@ dependencies = [ ] [[package]] +name = "borsh" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +dependencies = [ + "borsh-derive", + "hashbrown 0.13.2", +] + +[[package]] +name = "borsh-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +dependencies = [ + "borsh-derive-internal", + "borsh-schema-derive-internal", + "proc-macro-crate", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "borsh-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "borsh-schema-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "bstr" -version = "1.5.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] @@ -349,17 +499,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] -name = "bung" -version = "0.1.0" +name = "bytecheck" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da8bcf29331f126c3b4f20a6698909d58004290723aac75e3eafab41ae3c2953" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" dependencies = [ - "byteorder", - "rmp", - "serde", + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] name = "byteorder" version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -367,15 +534,74 @@ 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" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cedar-policy" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740e9c6999327357726ab9170defa1229c9a91f000c40cb02b343385cd7d8cf9" +dependencies = [ + "cedar-policy-core", + "cedar-policy-validator", + "itertools 0.10.5", + "lalrpop-util", + "ref-cast", + "serde", + "serde_json", + "smol_str", + "thiserror", +] + +[[package]] +name = "cedar-policy-core" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c43c92ddadc29024643ef24ff0aeb665bb665750d401f6b5f4a9a44eae898ae" +dependencies = [ + "either", + "ipnet", + "itertools 0.10.5", + "lalrpop", + "lalrpop-util", + "lazy_static", + "regex", + "rustc_lexer", + "serde", + "serde_json", + "serde_with", + "smol_str", + "stacker", + "thiserror", +] + +[[package]] +name = "cedar-policy-validator" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf263ac64b18d94d9cd8ae4d05b65100fc21647e20eb42f7735fb54ec887afa3" +dependencies = [ + "cedar-policy-core", + "itertools 0.10.5", + "serde", + "serde_json", + "serde_with", + "smol_str", + "stacker", + "thiserror", + "unicode-security", +] [[package]] name = "cfg-if" @@ -385,18 +611,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -425,10 +650,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_derive 3.2.25", "clap_lex 0.2.4", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim", "termcolor", @@ -437,25 +662,23 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.0" +version = "4.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" dependencies = [ "clap_builder", - "clap_derive 4.3.0", - "once_cell", + "clap_derive 4.4.2", ] [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream", "anstyle", - "bitflags", - "clap_lex 0.5.0", + "clap_lex 0.5.1", "strsim", ] @@ -474,14 +697,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -495,9 +718,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "cli-table" @@ -538,6 +761,12 @@ dependencies = [ ] [[package]] +name = "const-oid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + +[[package]] name = "const-random" version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -576,24 +805,24 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] name = "critical-section" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[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", ] @@ -616,9 +845,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", @@ -636,29 +865,80 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.1.26" +name = "darling" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", "quote", - "syn 1.0.109", + "strsim", + "syn 2.0.32", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.32", ] [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.12.3", + "hashbrown 0.14.0", "lock_api", "once_cell", "parking_lot_core", ] [[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", +] + +[[package]] +name = "deunicode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1bba4f227a4a53d12b653f50ca7bf10c9119ae2aba56aff9e0338b5c98f36a" + +[[package]] name = "diff" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -686,6 +966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] @@ -700,21 +981,41 @@ dependencies = [ ] [[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] name = "dlv-list" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" +checksum = "8aead04dc46b5f263c25721cf25c9e595951d15055f8063f92392fa0d7f64cf4" dependencies = [ "const-random", ] [[package]] name = "dmp" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1796e147190351ab441586c68b74494b18a70b0e39fb9bf8e84e38635bf4c92a" +checksum = "bfaa1135a34d26e5cc5b4927a8935af887d4f30a5653a797c33b9a4222beb6d9" dependencies = [ - "regex", "urlencoding", ] @@ -725,29 +1026,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] +name = "earcutr" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0812b44697951d35fde8fcb0da81c9de7e809e825a66bbf1ecb79d9829d4ca3d" +dependencies = [ + "itertools 0.10.5", + "num-traits", +] + +[[package]] name = "either" -version = "1.8.1" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "ena" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +dependencies = [ + "log", +] [[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", ] [[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[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" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -776,6 +1108,27 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] name = "float_next_after" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -802,9 +1155,9 @@ 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", ] @@ -816,6 +1169,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] +name = "fst" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" + +[[package]] name = "funty" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -848,13 +1207,15 @@ dependencies = [ [[package]] name = "futures-concurrency" -version = "7.2.1" +version = "7.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f9eed2df6a47eb0338716fcf2a3bcd0f0e84b81dcd54ada4bb64e23b7f3f70" +checksum = "d7cf7759a91582f72d30e68a2507feecac3dbcf6314ae91fa7046d6173d502e7" dependencies = [ "bitvec", "futures-core", "pin-project", + "slab", + "smallvec", ] [[package]] @@ -886,7 +1247,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -903,7 +1264,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -957,29 +1318,48 @@ dependencies = [ [[package]] name = "geo" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d640a4dd1d1c98b45f4653c841a8ec15f461a71b86bc30533ae64c6f20f268" +checksum = "a5d07d2288645058f3c78bc64eadd615335791cd5adb632e9865840afbc13dad" dependencies = [ + "earcutr", "float_next_after", "geo-types", "geographiclib-rs", "log", "num-traits", - "robust", - "rstar", + "robust 0.2.3", + "rstar 0.10.0", + "serde", +] + +[[package]] +name = "geo" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" +dependencies = [ + "earcutr", + "float_next_after", + "geo-types", + "geographiclib-rs", + "log", + "num-traits", + "robust 1.1.0", + "rstar 0.11.0", "serde", ] [[package]] name = "geo-types" -version = "0.7.9" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f0b3068e1537a4b861ec3734f4aa9c317d537cf0845bf6fb6221973499d26c" +checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" dependencies = [ "approx", "num-traits", - "rstar", + "rstar 0.10.0", + "rstar 0.11.0", "serde", ] @@ -994,22 +1374,52 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "globset" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "globwalk" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" +dependencies = [ + "bitflags 1.3.2", + "ignore", + "walkdir", +] + +[[package]] name = "h2" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1017,7 +1427,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1038,12 +1448,24 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "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" [[package]] name = "heapless" @@ -1075,18 +1497,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] -name = "hermit-abi" -version = "0.3.1" +name = "hex" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hmac" @@ -1127,15 +1546,15 @@ 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 = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1148,7 +1567,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1157,22 +1576,23 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", - "rustls 0.21.1", + "rustls 0.21.7", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", ] [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1192,16 +1612,39 @@ dependencies = [ ] [[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] name = "idna" -version = "0.3.0" +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 = "ignore" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +dependencies = [ + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] name = "include_dir" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1232,6 +1675,17 @@ dependencies = [ ] [[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", + "serde", +] + +[[package]] name = "inout" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1250,32 +1704,20 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[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 = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi 0.3.2", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1288,25 +1730,69 @@ 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.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[package]] +name = "lalrpop" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools 0.10.5", + "lalrpop-util", + "petgraph", + "pico-args", + "regex", + "regex-syntax", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + +[[package]] +name = "lalrpop-util" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" +dependencies = [ + "regex", +] + +[[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 = "lexicmp" @@ -1319,9 +1805,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.144" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libm" @@ -1331,15 +1817,15 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[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", "scopeguard", @@ -1347,11 +1833,17 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ - "cfg-if", + "hashbrown 0.13.2", ] [[package]] @@ -1365,9 +1857,9 @@ dependencies = [ [[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 = "mime" @@ -1376,21 +1868,39 @@ 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.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", + "wasi", + "windows-sys", ] [[package]] @@ -1422,6 +1932,21 @@ dependencies = [ ] [[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1432,6 +1957,12 @@ dependencies = [ ] [[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] name = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1443,9 +1974,9 @@ 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", "num-integer", @@ -1453,6 +1984,23 @@ dependencies = [ ] [[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-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1463,10 +2011,21 @@ dependencies = [ ] [[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-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", "libm", @@ -1474,19 +2033,28 @@ dependencies = [ [[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", ] [[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "ordered-multimap" @@ -1500,18 +2068,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.0" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] +checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] name = "overload" @@ -1537,15 +2096,15 @@ dependencies = [ [[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", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets", ] [[package]] @@ -1560,16 +2119,16 @@ dependencies = [ ] [[package]] -name = "paste" -version = "1.0.12" +name = "path-clean" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" [[package]] name = "pbkdf2" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", @@ -1578,10 +2137,39 @@ dependencies = [ ] [[package]] +name = "pem" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" +dependencies = [ + "base64 0.21.4", + "serde", +] + +[[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.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.0.0", +] [[package]] name = "pharos" @@ -1594,30 +2182,45 @@ dependencies = [ ] [[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[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" @@ -1626,21 +2229,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] name = "predicates" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" dependencies = [ "anstyle", "difflib", - "itertools", + "float-cmp", + "itertools 0.11.0", + "normalize-line-endings", "predicates-core", + "regex", ] [[package]] @@ -1661,17 +2294,24 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] [[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml", +] + +[[package]] name = "proc-macro-error" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1703,9 +2343,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1717,10 +2357,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" [[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "quote" -version = "1.0.27" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1732,6 +2401,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", + "serde", +] + +[[package]] name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1767,39 +2447,94 @@ 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_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "ref-cast" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] name = "regex" -version = "1.8.2" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", + "regex-automata", "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "rend" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +dependencies = [ + "bytecheck", +] [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.1", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -1813,16 +2548,17 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.1", + "rustls 0.21.7", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls 0.24.0", + "tokio-rustls 0.24.1", "tokio-util", "tower-service", "url", @@ -1830,11 +2566,48 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", + "webpki-roots 0.25.2", "winreg", ] [[package]] +name = "retain_mut" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" + +[[package]] +name = "revision" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87eb86913082f8976b06d07a59f17df9120e6f38b882cf3fc5a45b4499e224b6" +dependencies = [ + "bincode", + "chrono", + "geo 0.26.0", + "regex", + "revision-derive", + "roaring", + "rust_decimal", + "serde", + "thiserror", + "uuid", +] + +[[package]] +name = "revision-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf996fc5f61f1dbec35799b5c00c6dda12e8862e8cb782ed24e10d0292e60ed3" +dependencies = [ + "darling", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] name = "ring" version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1850,14 +2623,43 @@ dependencies = [ ] [[package]] -name = "rmp" -version = "0.8.11" +name = "rkyv" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +dependencies = [ + "bitvec", + "bytecheck", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "roaring" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" +checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873" dependencies = [ + "bytemuck", "byteorder", - "num-traits", - "paste", + "retain_mut", + "serde", ] [[package]] @@ -1867,6 +2669,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" [[package]] +name = "robust" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" + +[[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", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] name = "rstar" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1878,6 +2708,17 @@ dependencies = [ ] [[package]] +name = "rstar" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" +dependencies = [ + "heapless", + "num-traits", + "smallvec", +] + +[[package]] name = "rust-ini" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1888,6 +2729,47 @@ dependencies = [ ] [[package]] +name = "rust-stemmers" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "rust_decimal" +version = "1.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand", + "rkyv", + "serde", + "serde_json", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_lexer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86aae0c77166108c01305ee1a36a1e77289d7dc6ca0a3cd91ff4992de2d16a5" +dependencies = [ + "unicode-xid", +] + +[[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1898,23 +2780,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring", @@ -1924,9 +2805,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -1936,28 +2817,34 @@ dependencies = [ [[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.1", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" 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.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "salsa20" @@ -1979,9 +2866,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypt" @@ -2006,10 +2893,16 @@ dependencies = [ ] [[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.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] @@ -2022,30 +2915,31 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -2064,6 +2958,35 @@ dependencies = [ ] [[package]] +name = "serde_with" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" +dependencies = [ + "base64 0.21.4", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.0.0", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] name = "serial_test" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2085,7 +3008,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -2112,9 +3035,9 @@ 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", @@ -2122,19 +3045,68 @@ dependencies = [ ] [[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 = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "smol_str" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" +dependencies = [ + "serde", +] + +[[package]] +name = "snap" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "socket2" @@ -2147,6 +3119,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" @@ -2162,10 +3144,20 @@ dependencies = [ ] [[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der", +] + +[[package]] name = "sqlparser" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3706eefb17039056234df6b566b0014f303f867f2656108334a55b8096f59" +checksum = "0272b7bb0a225320170c99901b4b5fb3a4384e255a7f2cc228f61e2ba3893e75" dependencies = [ "log", ] @@ -2177,17 +3169,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] name = "storekey" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475592c1aa8849fa7874777c9df46aa93ffc47851c7c60bee88b1745a1adb893" +checksum = "43c42833834a5d23b344f71d87114e0cc9994766a5c42938f4b50e7b2aef85b2" dependencies = [ "byteorder", + "memchr", "serde", "thiserror", ] [[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared", + "precomputed-hash", +] + +[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2201,9 +3220,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "surrealdb" -version = "1.0.0-beta.9+20230402" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02e7f6cba9dcb779fe13984a064b7f68e398425355430dcf7184fc4abfc0f97" +checksum = "46fb62fbf4b5f0f28c52e919c7a0f5eb4aa4cd6b92b1e25f2e71a7f2d9f92524" dependencies = [ "addr", "any_ascii", @@ -2211,40 +3230,53 @@ dependencies = [ "async-channel", "async-executor", "async-recursion", + "base64 0.21.4", "bcrypt", - "bigdecimal", - "bung", + "bincode", + "bytes", + "cedar-policy", "chrono", + "deunicode", "dmp", "flume", + "fst", "futures", "futures-concurrency", "fuzzy-matcher", - "geo", - "indexmap", + "geo 0.25.1", + "indexmap 1.9.3", + "ipnet", "lexicmp", - "log", + "lru", "md-5", "nanoid", "nom", "once_cell", + "path-clean", "pbkdf2", "pharos", + "pin-project-lite", + "radix_trie", "rand", "regex", "reqwest", - "rustls 0.20.8", + "revision", + "roaring", + "rust-stemmers", + "rust_decimal", + "rustls 0.20.9", "scrypt", "semver", "serde", "serde_json", "sha-1", "sha2", + "snap", "storekey", "surrealdb-derive", + "surrealdb-jsonwebtoken", "thiserror", "tokio", - "tokio-stream", "tokio-tungstenite", "tokio-util", "tracing", @@ -2253,36 +3285,58 @@ dependencies = [ "url", "uuid", "wasm-bindgen-futures", + "wasmtimer", "ws_stream_wasm", ] [[package]] name = "surrealdb-derive" -version = "0.7.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0f2a75e22417f587cf23a5efa9f680f4002b8655b8481a01ee5e787f15d82b" +checksum = "aacdb4c58b9ebef0291310afcd63af0012d85610d361f3785952c61b6f1dddf4" dependencies = [ "quote", "syn 1.0.109", ] [[package]] +name = "surrealdb-jsonwebtoken" +version = "8.3.0-surreal.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d4f759c65df8a8cf2d83c99db7fdd3ae5b8fff05fa7fe69a8612f29dd5f99b" +dependencies = [ + "base64 0.21.4", + "getrandom", + "hmac", + "pem", + "rand", + "ring", + "rsa", + "serde", + "serde_json", + "sha2", + "simple_asn1", +] + +[[package]] name = "surrealdb-migrations" -version = "0.9.12" +version = "1.0.0-preview.1" dependencies = [ "anyhow", "assert_cmd", + "assert_fs", "chrono", "chrono-human-duration", - "clap 4.3.0", + "clap 4.4.3", "cli-table", "convert_case", "diffy", "dir-diff", "fs_extra", "include_dir", - "itertools", + "itertools 0.11.0", "names", + "predicates", "pretty_assertions", "regex", "rust-ini", @@ -2308,9 +3362,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ "proc-macro2", "quote", @@ -2324,6 +3378,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand 2.0.0", + "redox_syscall 0.3.5", + "rustix", + "windows-sys", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] name = "termcolor" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2346,22 +3424,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[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.16", + "syn 2.0.32", ] [[package]] @@ -2376,13 +3454,30 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "deranged", + "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.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +dependencies = [ + "time-core", ] [[package]] @@ -2411,19 +3506,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.4", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2434,7 +3529,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -2443,18 +3538,18 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "webpki", ] [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.1", + "rustls 0.21.7", "tokio", ] @@ -2471,9 +3566,9 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" dependencies = [ "async-stream", "bytes", @@ -2490,11 +3585,12 @@ checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" dependencies = [ "futures-util", "log", - "rustls 0.20.8", + "rustls 0.20.9", "tokio", "tokio-rustls 0.23.4", "tungstenite", "webpki", + "webpki-roots 0.22.6", ] [[package]] @@ -2513,6 +3609,15 @@ dependencies = [ ] [[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] name = "tower-service" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2532,13 +3637,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", ] [[package]] @@ -2580,7 +3685,7 @@ dependencies = [ "httparse", "log", "rand", - "rustls 0.20.8", + "rustls 0.20.9", "sha1", "thiserror", "url", @@ -2596,15 +3701,24 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ulid" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ "rand", "serde", ] [[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] name = "unicode-bidi" version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2612,9 +3726,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" @@ -2626,6 +3740,22 @@ dependencies = [ ] [[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-security" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef5756b3097992b934b06608c69f48448a0fbe804bb1e72b982f6d7983e9e63" +dependencies = [ + "unicode-normalization", + "unicode-script", +] + +[[package]] name = "unicode-segmentation" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2638,6 +3768,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] name = "untrusted" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2645,9 +3781,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[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", @@ -2656,9 +3792,9 @@ dependencies = [ [[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf-8" @@ -2674,9 +3810,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "atomic", "getrandom", @@ -2707,9 +3843,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", @@ -2717,31 +3853,24 @@ 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 = "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.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2749,24 +3878,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -2776,9 +3905,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2786,28 +3915,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +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", @@ -2817,10 +3946,23 @@ dependencies = [ ] [[package]] +name = "wasmtimer" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf" +dependencies = [ + "futures", + "js-sys", + "parking_lot", + "pin-utils", + "wasm-bindgen", +] + +[[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -2828,9 +3970,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" dependencies = [ "ring", "untrusted", @@ -2846,6 +3988,12 @@ dependencies = [ ] [[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2882,16 +4030,7 @@ 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 0.42.2", + "windows-targets", ] [[package]] @@ -2900,130 +4039,74 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.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", + "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.2" -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" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[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" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[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" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[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" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[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", ] [[package]] diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index 7cf5131719b..40d76140332 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -10,7 +10,7 @@ let pname = "surrealdb-migrations"; - version = "0.9.12"; + version = "1.0.0-preview.1"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-avDztyxjRTa66MUfIvwtxY1SiGNAtVdepUPHggrbDk0="; + hash = "sha256-G3pgUOAkLTcqUP8SLk2Tt38kuHD/2fDY5NLh0BTdNyk="; }; cargoLock = { diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/development/tools/fblog/default.nix index 89f32bd2980..c2ce5719961 100644 --- a/pkgs/development/tools/fblog/default.nix +++ b/pkgs/development/tools/fblog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fblog"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "brocode"; repo = pname; rev = "v${version}"; - hash = "sha256-f4iJ9Fp6Rd1jv2ywRCjvFHjbdCGb116NiQ42fvQUE8A="; + hash = "sha256-T0NvcNg2UeUpEf1hjSdoaUkIzCAP29vo6edfeno/oyo="; }; - cargoHash = "sha256-dt8OMlqNxd78sDxMPHG6jHEmF4LuFIMSo0BuQDWOM6o="; + cargoHash = "sha256-3/j/TjsQjXFe+rTfCncjoownXzaUiUBUkCXbFc5RM2o="; meta = with lib; { description = "A small command-line JSON log viewer"; diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix index 591e0a28a69..c4b06de2ac3 100644 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.0.1"; + version = "1.0.2"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-v63sV0HNHSU9H5rhtJcwZCuIXEGe1+BDyxV0/EqBk2E="; + hash = "sha256-a+B+uAxFXlWVn8b0M17TtP4WTKhMmR6//smV1nmZyxU="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index a12142d2b73..5c4b4ca9e3e 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -1,59 +1,87 @@ -{ stdenv, lib, callPackage, fetchurl }: +{ stdenv, lib, fetchurl, testers, infisical, installShellFiles }: + +# this expression is mostly automated, and you are STRONGLY +# RECOMMENDED to use to nix-update for updating this expression when new +# releases come out, which runs the sibling `update.sh` script. +# +# from the root of the nixpkgs git repository, run: +# +# nix-shell maintainers/scripts/update.nix \ +# --argstr commit true \ +# --argstr package infisical let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - - plat = { - x86_64-linux = "linux_amd64"; - x86_64-darwin = "darwin_amd64"; - aarch64-linux = "linux_arm64"; - aarch64-darwin = "darwin_arm64"; - }.${system} or throwSystem; - - archive_fmt = "tar.gz"; - - sha256 = { - x86_64-linux = "e85c5f2ddca89caa6b44c61554c1dffeacdabc96c25a7e6881dc5722515270d1"; - x86_64-darwin = "eddbcde10271f791eb1473ba00b85b442aa059cdfee38021b8f8880f33754821"; - aarch64-linux = "9793a6db476492802ffec7f933d7f8f107a1c89fee09c8eb6bdb975b1fccecea"; - aarch64-darwin = "46c8a82a71da5731c108d24b4a960a507af66d91bba7b7246dd3a3415afaf7d3"; - }.${system} or throwSystem; + # build hashes, which correspond to the hashes of the precompiled binaries procured by GitHub Actions. + buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); + + # the version of infisical + version = "0.14.3"; + + # the platform-specific, statically linked binary + src = + let + suffix = { + # map the platform name to the golang toolchain suffix + # NOTE: must be synchronized with update.sh! + x86_64-linux = "linux_amd64"; + x86_64-darwin = "darwin_amd64"; + aarch64-linux = "linux_arm64"; + aarch64-darwin = "darwin_arm64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + name = "infisical_${version}_${suffix}.tar.gz"; + hash = buildHashes."${stdenv.hostPlatform.system}"; + url = "https://github.com/Infisical/infisical/releases/download/infisical-cli%2Fv${version}/${name}"; + in + fetchurl { inherit name url hash; }; + in - stdenv.mkDerivation (finalAttrs: { - pname = "infisical"; - version = "0.14.2"; - - src = fetchurl { - url = "https://github.com/Infisical/infisical/releases/download/infisical-cli%2Fv${finalAttrs.version}/infisical_${finalAttrs.version}_${plat}.tar.gz"; - inherit sha256; - }; - - sourceRoot = "."; - installPhase = '' - mkdir -p $out/bin/ $out/share/completions/ $out/share/man/ - cp completions/* $out/share/completions/ - cp manpages/* $out/share/man/ - cp infisical $out/bin - ''; +stdenv.mkDerivation { + pname = "infisical"; + version = version; + inherit src; - postInstall = '' - installManPage share/man/infisical.1.gz - installShellCompletion share/completions/infisical.{bash,fish,zsh} - chmod +x bin/infisical - ''; + nativeBuildInputs = [ installShellFiles ]; + + doCheck = true; + dontConfigure = true; + dontStrip = true; + + sourceRoot = "."; + buildPhase = "chmod +x ./infisical"; + checkPhase = "./infisical --version"; + installPhase = '' + mkdir -p $out/bin/ $out/share/completions/ $out/share/man/ + cp infisical $out/bin + cp completions/* $out/share/completions/ + cp manpages/* $out/share/man/ + ''; + postInstall = '' + installManPage share/man/infisical.1.gz + installShellCompletion share/completions/infisical.{bash,fish,zsh} + ''; - meta = with lib; { - description = "The official Infisical CLI"; - longDescription = '' - Infisical is an Open Source, End-to-End encrypted platform that lets you - securely sync secrets and configs across your team, devices, and infrastructure - ''; - mainProgram = "infisical"; - homepage = "https://infisical.com/"; - downloadPage = "https://github.com/Infisical/infisical/releases/"; - license = licenses.mit; - maintainers = [ maintainers.ivanmoreau maintainers.jgoux ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; - }; - }) + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { package = infisical; }; + }; + + meta = with lib; { + description = "The official Infisical CLI"; + longDescription = '' + Infisical is the open-source secret management platform: + Sync secrets across your team/infrastructure and prevent secret leaks. + ''; + homepage = "https://infisical.com"; + changelog = "https://github.com/infisical/infisical/releases/tag/infisical-cli%2Fv${version}"; + license = licenses.mit; + mainProgram = "infisical"; + maintainers = [ maintainers.ivanmoreau maintainers.jgoux ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + }; +} diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json new file mode 100644 index 00000000000..0e79f2a1e00 --- /dev/null +++ b/pkgs/development/tools/infisical/hashes.json @@ -0,0 +1,6 @@ +{ "_comment": "@generated by pkgs/development/tools/infisical/update.sh" +, "x86_64-linux": "sha256-sTfwooMN5ckdaxpd4R3yQvDEYT7muYZTyFEm0exM33M=" +, "x86_64-darwin": "sha256-B94+mF5Wu0pHKIo8CuHAbrorzIxK2U64Np3JFlTc1kk=" +, "aarch64-linux": "sha256-eGuKnC6h1YPW0UdY5wcChbiSzATAcSmHZ6mKBI2sR80=" +, "aarch64-darwin": "sha256-s4s1la165cQ5I296ZCeW3ZIyYapTfRxa20QdZmXvido=" +} diff --git a/pkgs/development/tools/infisical/update.sh b/pkgs/development/tools/infisical/update.sh new file mode 100755 index 00000000000..5810d2ee48b --- /dev/null +++ b/pkgs/development/tools/infisical/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq nix-prefetch common-updater-scripts nix coreutils +# shellcheck shell=bash +set -euo pipefail + +RELEASE_NAME=$(curl -s https://api.github.com/repos/infisical/infisical/releases \ + | jq -r 'sort_by(.created_at) | reverse | + (map + (select ((.prerelease == false) and (.draft == false))) | + first + ) | .name') +VERSION=$(echo "$RELEASE_NAME" | sed -E 's/^infisical-cli\/v//') + +echo "Latest infisical release: $VERSION" + +ARCHS=( + "x86_64-linux:linux_amd64" + "x86_64-darwin:darwin_amd64" + "aarch64-linux:linux_arm64" + "aarch64-darwin:darwin_arm64" +) + +NFILE=pkgs/development/tools/infisical/default.nix +HFILE=pkgs/development/tools/infisical/hashes.json +rm -f "$HFILE" && touch "$HFILE" + +printf "{ \"_comment\": \"@generated by pkgs/development/tools/infisical/update.sh\"\n" >> "$HFILE" + +for arch in "${ARCHS[@]}"; do + IFS=: read -r arch_name arch_target <<< "$arch" + sha256hash="$(nix-prefetch-url --type sha256 "https://github.com/infisical/infisical/releases/download/${RELEASE_NAME}/infisical_${VERSION}_${arch_target}.tar.gz")" + srihash="$(nix hash to-sri --type sha256 "$sha256hash")" + echo ", \"$arch_name\": \"$srihash\"" >> "$HFILE" +done +echo "}" >> "$HFILE" + +sed -i \ + '0,/version\s*=\s*".*";/s//version = "'"$VERSION"'";/' \ + "$NFILE" + +echo "Done; wrote $HFILE and updated version in $NFILE." diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index 6ab2cb3210e..1785edd5cea 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - hash = "sha256-Snn34Jl6GXtGUwOXBwo0icmuNfesLHUwA7sIvdv0xlY="; + hash = "sha256-W+xUc9B6tTbpPc9xyVnQuAtwiw4RICWKl9C5dF0BMN8="; }; - cargoHash = "sha256-sL884chxQntagj5/h4yWLtDS8T7hbRFjHIqNbbzcsmI="; + cargoHash = "sha256-pxoi9yS6Oc10epSMC3BVAC2WeV0brOMaK1upNiAZbxI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index cbe77811fab..f5afe959967 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4OEc5NfCF8DHCyQfQL2ZmSFBkwYr32dGThVZHsRutVA="; + sha256 = "sha256-PSJNPN5hd5Tgt6F70II2gMiUiU0irncSefm6Q7WjUDE="; }; - vendorHash = "sha256-5B1gA8cigwBNYNYmLb9Jq9wXl/d3hP3+brJFecnKxCY="; + vendorHash = "sha256-0zWTVE82GaSyWfgbRASpNdO/d4kKOts1XdPspmgfpV8="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index a138526a4cf..9222f9d9971 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-dNF0Q/jat2YE/3ZEKqJVX+4+iizJIV25U9U3e+2bfUM="; + hash = "sha256-XTY32B0RkLcZxTuKWUtZlrrUARkoT2+qYkL8Amai2cE="; }; vendorHash = "sha256-wMYrgAgAEgwfjMLP81H0cKWm/kh63ppDkSiymfsaj7U="; diff --git a/pkgs/development/tools/language-servers/jq-lsp/default.nix b/pkgs/development/tools/language-servers/jq-lsp/default.nix new file mode 100644 index 00000000000..08e83763fd0 --- /dev/null +++ b/pkgs/development/tools/language-servers/jq-lsp/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "jq-lsp"; + version = "unstable-2023-10-27"; + + src = fetchFromGitHub { + owner = "wader"; + repo = "jq-lsp"; + rev = "b4707e7776a4eb3093b1a7533ebd41368240095a"; + hash = "sha256-AU4xGweeFx+kSsrqkTtSjl+N77cITF/qvAVZGUZY5SE="; + }; + + vendorHash = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw="; + + meta = with lib; { + description = "jq language server"; + homepage = "https://github.com/wader/jq-lsp"; + license = licenses.mit; + maintainers = with maintainers; [ sysedwinistrator ]; + mainProgram = "jq-lsp"; + }; +} diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 4cd859ed3f5..a001f9f6d3a 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.52"; + version = "0.2.53"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mw0Ul6m8mgx2I3ExoDs5luN4PQXAI0NADTSYt+DFCs8="; + hash = "sha256-p2ujmHWIBUcH5UpHHO72ddqSb1C0gWAyKUIT9E6Oyxk="; }; - vendorHash = "sha256-WoeJ4yB3bTx6I+Ga5X7ZhPfjw3NERp1v/ot5pPsYYLw="; + vendorHash = "sha256-W50NodoaKY7s4x7Goyvydxd5Q2lz9m9pFwgcQ9wRGVM="; doCheck = false; diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix index fc9b48793fa..76d6e4d4291 100644 --- a/pkgs/development/tools/misc/rsonpath/default.nix +++ b/pkgs/development/tools/misc/rsonpath/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-gAoxWdczeaN4VqeQY0qJeLK8aABGhuwXf41QFKUxAG0="; + hash = "sha256-V7Ir1FGKjKYu/J2KSBaDwLdH/MHTS+aChHWcrVTu4dY="; }; - cargoHash = "sha256-UXPVqc4RNIFKx0f/BPCfkJxilioXbRZSAgqQv1MzK7k="; + cargoHash = "sha256-eiYUlHA4vK/zhfULwekt3dRVx//u5mrQ6tRdQh0tmTc="; cargoBuildFlags = [ "-p=rsonpath" ]; cargoTestFlags = cargoBuildFlags; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 9640981526e..591eaeaa1ae 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.5"; + version = "6.6"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-37BRcCOJ4ZeaFRiStZAa/J6Tu8HHDYTJBq3jIkypGYA="; + sha256 = "sha256-QhtBhsBrcFFj5k3IXycevc9nZgr4ZnKDFH1ehZ/IqWw="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index dda169be32d..e7a12deb3ee 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -5,7 +5,6 @@ , fetchurl , git , cctools -, developer_cmds , DarwinTools , makeWrapper , CoreServices @@ -36,8 +35,8 @@ let pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; - mysqlShellVersion = "8.1.1"; - mysqlServerVersion = "8.1.0"; + mysqlShellVersion = "8.2.0"; + mysqlServerVersion = "8.2.0"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell-innovation"; @@ -46,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-PdAXqUBzSqkHlqTGXhJeZxL2S7u+M4jTZGneqoe1mes="; + hash = "sha256-itPj8cWuIVS+Y4rPVW6JgfcC0FKsxZV+d23xciwhGXk="; }) (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-X7A2h9PWgQgNg7h64oD+Th/KsqP3UGpJ2etaP2B0VuY="; + hash = "sha256-kuRo+3vcDtc9aOgAuxJTy0e6E85iOFfCx/ZHtrNg08k="; }) ]; @@ -69,7 +68,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/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix index 79afce5dd83..48c7cbba567 100644 --- a/pkgs/development/tools/oxlint/default.nix +++ b/pkgs/development/tools/oxlint/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-qvUVS/PjocMX57z27Xu6tlqz5bXpvlTuC9ZF+ndfkW8="; + hash = "sha256-zjTJF8yU3Hb8CTzzsPdo2EJI7QriEsjUyXVwprb22xQ="; }; - cargoHash = "sha256-KGs9cEDvLXO26oNv867jMzaQs5I9+8go00FFSH6qexY="; + cargoHash = "sha256-mRmoCH0VVO9LhFfEd4VfDbCfl5VCpcIKBkaNzU0+9SU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index f7dbb736063..5e3b6b7942b 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.156.0"; + version = "0.161.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-1VlG+0jzx6Yho0bc3RypXgOFoM+NgOQ2RX4FB5ZllSw="; + sha256 = "sha256-7PzuFhlOlU5uGsJyGOY761JfzqaPkkkftRlYrvUKEoU="; }; - vendorHash = "sha256-T5UmaS7PPZdkPpFxJIqpF5pH24uFrHbrbsI5gfElUOY="; + vendorHash = "sha256-fhYd2C9xY0kQez6+MofimJP+brLvMDFXlW6kDSI4iqA="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index a314b2f533b..b5f73a13c35 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.3.28"; + version = "2.3.31"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-KxYxHNoXk4RVA5+mpE3hjrl1c+7Ei/km/zrMIvvV+1M="; + hash = "sha256-liDm8lcHSdn9f/tNISRlnqEIcBtmusMplH0N4tW5Lgo="; }; postPatch = '' diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index 07001487ab8..7a1540f1380 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "CLI to render Go template text files"; inherit (src.meta) homepage; license = licenses.gpl3; - maintainers = with maintainers; [ yurrriq ]; + maintainers = []; }; } diff --git a/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix b/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix index 3d78e18dd57..0274f80e01b 100644 --- a/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix +++ b/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bundle-licenses"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "sstadick"; repo = "cargo-bundle-licenses"; rev = "v${version}"; - hash = "sha256-tjxdZ28frY/GRFvhg28DkVajqFC+02962Sgai8NhxK0="; + hash = "sha256-pWQU0IMahbFJR7oRUqnz73cB8yRbTpkh5NASmUKg0E0="; }; - cargoHash = "sha256-uVLoRLGnTe/8ipehGbc5mfWuMsFt3KP9KatXEJFUUEI="; + cargoHash = "sha256-eUY3dyyWbqSqFqafdZ2AdI7vsH60vCRNk2cAGJw0ROk="; meta = with lib; { description = "Generate a THIRDPARTY file with all licenses in a cargo project"; diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 075363057bc..961f3287e64 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-Y4dCkyOAOQRnaHWMuPTpjgIqlnzYw+sQbTyxp1pO7oo="; + hash = "sha256-lh3nK3yj03pEurjw6/fMh70GnBawxUqilupUzfgryG0="; }; - cargoHash = "sha256-Fuc5lToojwcRbcKrApQ8vxd8ZdjEJTDQULYfzV4K4GA="; + cargoHash = "sha256-lUeCMyH6qE76SVjubWVo/Hpj6J8PM6ndOqrJufcfByw="; nativeBuildInputs = [ pkg-config @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { xz zstd ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeCheckInputs = [ diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index fe02f0b78e0..505702a2327 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.3"; + version = "0.37.4"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-7xWxIvMaoKZ1TVgfdBUDvK8VJzW6alrO8xFvSlMusOY="; + hash = "sha256-ZcigUYHNhzLFXA726FqalSt0hIzBVBvmep8jqzaCioc="; }; - cargoHash = "sha256-2I+VZD4KLTtoTIb2NNpfLcFH/lmD6Z/TTPJrr3FcZzI="; + cargoHash = "sha256-hmEo5UQlVtgdmb6b/vhK5GHHUCgbEKdnAu2S+xrDpuk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 40114a810d2..d1902e88fb9 100644 --- a/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.13.1"; + version = "0.14.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-u8VMVW2LJcwDRv43705aOcP0WMRfB3hakdgufYuI7I4="; + sha256 = "sha256-rbfCrq9AwjrynNSklR1un3BUGv0kblwIxy72lTjEDVc="; }; - cargoHash = "sha256-rXLgNzbzMZG+nviAnK9n7ISWuNOPMugubHNMwJRKRZc="; + cargoHash = "sha256-kBolewLzKGq3rmSeWlLMDqKb4QQfWf3J6DnXTB0SV54="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index b9fd2749527..8306a05def0 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }: +{ lib, stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils, testers, gitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "2.3.2"; + version = "3.1.5"; src = fetchzip { - url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; - sha256 = "1zqfnxz57234227rp303iwis0mjkkjkpcqnj9jgw78gykjnqdmmq"; + url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; + hash = "sha256-5Q6bAuEEBkiRHjX8Ie5FFhPfzwKRdlNIQucTqDEIZuQ="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -24,6 +24,19 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "${lib.getExe finalAttrs.finalPackage} --version"; + version = "v${finalAttrs.version}"; + }; + updateScript = gitUpdater { + url = "https://github.com/spring-projects/spring-boot"; + ignoredVersions = ".*-(RC|M).*"; + rev-prefix = "v"; + }; + }; + meta = with lib; { description = '' CLI which makes it easy to create spring-based applications @@ -40,9 +53,11 @@ stdenv.mkDerivation rec { a command line tool that runs “spring scripts”. ''; homepage = "https://spring.io/projects/spring-boot"; + changelog = "https://github.com/spring-projects/spring-boot/releases/tag/v${finalAttrs.version}"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; + mainProgram = "spring"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; }; -} +}) diff --git a/pkgs/development/tools/tfplugindocs/default.nix b/pkgs/development/tools/tfplugindocs/default.nix deleted file mode 100644 index 7f3e4a80ba3..00000000000 --- a/pkgs/development/tools/tfplugindocs/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "tfplugindocs"; - version = "0.14.1"; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "terraform-plugin-docs"; - rev = "v${version}"; - sha256 = "sha256-GiMjm7XG/gFGOQXYeXsKbU7WQdrkQ0+J/SvfbLu24bo="; - }; - - vendorHash = "sha256-qUlyOAiLzLgrtaAfs/aGpAikGmGcQ9PI7QRyp9+Qn4w="; - - meta = with lib; { - description = "Generate and validate Terraform plugin/provider documentation"; - homepage = "https://github.com/hashicorp/terraform-plugin-docs"; - license = licenses.mpl20; - maintainers = with maintainers; [ lewo ]; - }; -} diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index 482ff69ee0a..0b0183aef1d 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.35.0"; + version = "0.35.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-aN8O+5zzGGLWAPk/oNFOnBBv2rsljWaxTKlC19XTt58="; + sha256 = "sha256-zoZPAJTEmKHL78wfAHqayBxw8tRANIsMckj+wXtbLTw="; }; vendorHash = null; diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index e89e00fa011..668fc47fe72 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ytt"; - version = "0.46.0"; + version = "0.46.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-ZCWdOvwWXSeFzRQiiObuJqvz0ngAJ8n/0LeoGCv2vu4="; + sha256 = "sha256-r9LQMQffnc/g1WFJU8m+Oy0hD+DudCNiVAcbAAPy1vI="; }; vendorHash = null; diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index 44b4af44080..3d420158caf 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - hash = "sha256-Ky4DmClSyAVBAetpZM5tFnQZ74fchCOgcxBftd+gwlE="; + hash = "sha256-mDUx9cQoYpU9kSAls36kzNVYZ8a4aqHEMIWfzS41NBk="; }; # the integration tests will try to clone a remote repos @@ -39,6 +39,6 @@ crystal.buildCrystalPackage rec { maintainers = with maintainers; [ peterhoeg ]; mainProgram = "lucky"; platforms = platforms.unix; - broken = lib.versionOlder crystal.version "0.35.1"; + broken = lib.versionOlder crystal.version "1.6.0"; }; } diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/development/web/lucky-cli/shard.lock index 9bf2212760a..b9956fd780d 100644 --- a/pkgs/development/web/lucky-cli/shard.lock +++ b/pkgs/development/web/lucky-cli/shard.lock @@ -2,17 +2,17 @@ version: 2.0 shards: ameba: git: https://github.com/crystal-ameba/ameba.git - version: 1.1.0 + version: 1.5.0 lucky_task: git: https://github.com/luckyframework/lucky_task.git - version: 0.1.1 + version: 0.3.0 + + lucky_template: + git: https://github.com/luckyframework/lucky_template.git + version: 0.2.0 nox: - git: https://github.com/matthewmcgarvey/nox.git + git: https://github.com/crystal-loot/nox.git version: 0.2.2 - teeplate: - git: https://github.com/luckyframework/teeplate.git - version: 0.8.5 - diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/development/web/lucky-cli/shards.nix index fef8c1602ba..a06b87c5029 100644 --- a/pkgs/development/web/lucky-cli/shards.nix +++ b/pkgs/development/web/lucky-cli/shards.nix @@ -1,22 +1,22 @@ { ameba = { url = "https://github.com/crystal-ameba/ameba.git"; - rev = "v1.1.0"; - sha256 = "0famv413myrshgv6y24mr84ny53rcsr777x323jlaf2isnhdd0b8"; + rev = "v1.5.0"; + sha256 = "1idivsbpmi40aqvs82fsv37nrgikirprxrj3ls9chsb876fq9p2d"; }; lucky_task = { url = "https://github.com/luckyframework/lucky_task.git"; - rev = "v0.1.1"; - sha256 = "0w0rnf22pvj3lp5z8c4sshzwhqgwpbjpm7nry9mf0iz3fa0v48f7"; + rev = "v0.3.0"; + sha256 = "0lp2wv01wdcfr3h43n3dqgaymvypy0i6kbffb4mg4l30lijgpfb6"; + }; + lucky_template = { + url = "https://github.com/luckyframework/lucky_template.git"; + rev = "v0.2.0"; + sha256 = "1xix82d0xanq4xkcv83hm56nj5f2rsbrqhk70j5zr37d3kydfypl"; }; nox = { - url = "https://github.com/matthewmcgarvey/nox.git"; + url = "https://github.com/crystal-loot/nox.git"; rev = "v0.2.2"; sha256 = "1dfq0aknrxwp9wc0glri4w5j8pfbc6b1xrsxkahci109p6dhcna5"; }; - teeplate = { - url = "https://github.com/luckyframework/teeplate.git"; - rev = "v0.8.5"; - sha256 = "1kr05qrp674rph1324wry57gzvgvcvlz0w27brlvdgd3gi4s8sdj"; - }; } diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 946ead2a18d..ae30de0e6c4 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.20.0"; + version = "2.20.5"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-E29bXPfQekp/X7yAvcEWHERO3aSCRa41csZqbZ3wOno="; + hash = "sha256-+oaK6OdBRxtWW+0zp+pbCcGyphuOLzyv/LfjDqDiTGw="; }; - vendorHash = "sha256-hgxYk76M2vplOY63vvaWzErNCo7knmMrbenJcoa/t0U="; + vendorHash = "sha256-GQqdr0zMQhi6QfLAyFchtWPOGfpo5yODDinKWA/s+qs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/games/aaaaxy/default.nix b/pkgs/games/aaaaxy/default.nix index c2fcc8a646c..b6e5826be96 100644 --- a/pkgs/games/aaaaxy/default.nix +++ b/pkgs/games/aaaaxy/default.nix @@ -19,17 +19,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.50"; + version = "1.4.72"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-J4SCmIwGlVD8MHs13NO3JFKfH1rvh2dgVV0/8BX9IcY="; + hash = "sha256-wKnwyjgEV1M5CJR0uxs9vNbF3iJvDPWOqya0iLHXjGw="; fetchSubmodules = true; }; - vendorHash = "sha256-dugSK/5mowBfRqnzI3sZqCm69E0WtX2Tydh6Q06+vLU="; + vendorHash = "sha256-hK5w3JhcYUW5bAUovv/ldHoYcY0oIh5q4LWxiGuP2NQ="; buildInputs = [ alsa-lib diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index a016676ac1d..d034e6eab15 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.92.tar.xz", + "name": "factorio_alpha_x64-1.1.94.tar.xz", "needsAuth": true, - "sha256": "1arirh9180bmix2dglqlgcm036mbjanc4sxx0kc92j2grpw7xf53", + "sha256": "06z3l828drnqv075qa3sg8l1877dlakqnppr79y031jlp8vg19pm", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.92/alpha/linux64", - "version": "1.1.92" + "url": "https://factorio.com/get-download/1.1.94/alpha/linux64", + "version": "1.1.94" }, "stable": { - "name": "factorio_alpha_x64-1.1.91.tar.xz", + "name": "factorio_alpha_x64-1.1.94.tar.xz", "needsAuth": true, - "sha256": "0dcanryqmikhllp8lwhdapbm9scrgfgnvgwdf18wn8asr652vz39", + "sha256": "06z3l828drnqv075qa3sg8l1877dlakqnppr79y031jlp8vg19pm", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.91/alpha/linux64", - "version": "1.1.91" + "url": "https://factorio.com/get-download/1.1.94/alpha/linux64", + "version": "1.1.94" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.92.tar.xz", + "name": "factorio_demo_x64-1.1.94.tar.xz", "needsAuth": false, - "sha256": "02mqj2hlpsd0kgg0rav4k70pqh2sk4g2879c2nhp61ms79kdizh4", + "sha256": "1z2l8xj3vvrd1m3q1rypczzqdzrmldmyipfg54qly8cfj3pxvk4w", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.92/demo/linux64", - "version": "1.1.92" + "url": "https://factorio.com/get-download/1.1.94/demo/linux64", + "version": "1.1.94" }, "stable": { - "name": "factorio_demo_x64-1.1.91.tar.xz", + "name": "factorio_demo_x64-1.1.94.tar.xz", "needsAuth": false, - "sha256": "1j9nzc3rs9q43vh9i0jgpyhgnjjif98sdgk4r47m0qrxjb4pnfx0", + "sha256": "1z2l8xj3vvrd1m3q1rypczzqdzrmldmyipfg54qly8cfj3pxvk4w", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.91/demo/linux64", - "version": "1.1.91" + "url": "https://factorio.com/get-download/1.1.94/demo/linux64", + "version": "1.1.94" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.92.tar.xz", + "name": "factorio_headless_x64-1.1.94.tar.xz", "needsAuth": false, - "sha256": "04j3p2r1r0h3fak3vxxq3d7qqpyjlg57n3c8sm6gadg4q4h15aw8", + "sha256": "0ajs883dnz2ak1mxqvsw6hmpahcxqq243ravp5gb3iyiaaprqa4n", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.92/headless/linux64", - "version": "1.1.92" + "url": "https://factorio.com/get-download/1.1.94/headless/linux64", + "version": "1.1.94" }, "stable": { - "name": "factorio_headless_x64-1.1.91.tar.xz", + "name": "factorio_headless_x64-1.1.94.tar.xz", "needsAuth": false, - "sha256": "0v8zg3q79n15242fr79f9amg0icw3giy4aiaf43am5hxzcdb5212", + "sha256": "0ajs883dnz2ak1mxqvsw6hmpahcxqq243ravp5gb3iyiaaprqa4n", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.91/headless/linux64", - "version": "1.1.91" + "url": "https://factorio.com/get-download/1.1.94/headless/linux64", + "version": "1.1.94" } } } diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix index 2cc65cd2c66..11950a8f741 100644 --- a/pkgs/games/minesweep-rs/default.nix +++ b/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.35"; + version = "6.0.39"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-IxyryBWU4NULjcQtUXHel533JosAmp0d0w/+Ntl2aT0="; + hash = "sha256-gV+16gxXfogHFFAXz/aG+D/uaXbZTgVjYK24QQizQ0c="; }; - cargoHash = "sha256-BGjxZxT7iypvhusyx6K4yvK1S7j4WlvoSTkb79d/H1s="; + cargoHash = "sha256-D6HnpXxixmVugbjr5pMYZiVeGLgje41k3n3xic6Ecps="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index e74887799e1..d048e7746aa 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -1,16 +1,9 @@ -{ lib, stdenv -, makeWrapper +{ callPackage , fetchFromGitHub , nixosTests -, gradle -, perl -, jre -, libpulseaudio -, makeDesktopItem -, copyDesktopItems }: -let +callPackage ./generic.nix rec { pname = "shattered-pixel-dungeon"; version = "2.1.4"; @@ -21,103 +14,17 @@ let hash = "sha256-WbRvsHxTYYlhJavYVGMGK25fXEfSfnIztJ6KuCgBjF8="; }; - patches = [ - ./disable-beryx.patch - ]; - - postPatch = '' - # disable gradle plugins with native code and their targets - perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle - perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar|robovm)/ ... /^}/" build.gradle - # Remove unbuildable Android/iOS stuff - rm android/build.gradle ios/build.gradle - ''; - - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src patches postPatch; - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - gradle --no-daemon desktop:release - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - outputHashMode = "recursive"; - outputHash = "sha256-i4k5tdo07E1NJwywroaGvRjZ+/xrDp6ra+GTYwTB7uk="; - }; - - desktopItem = makeDesktopItem { - name = "shattered-pixel-dungeon"; - desktopName = "Shattered Pixel Dungeon"; - comment = "An open-source traditional roguelike dungeon crawler"; - icon = "shattered-pixel-dungeon"; - exec = "shattered-pixel-dungeon"; - terminal = false; - categories = [ "Game" "AdventureGame" ]; - keywords = [ "roguelike" "dungeon" "crawler" ]; - }; - -in stdenv.mkDerivation rec { - inherit pname version src patches postPatch; - - nativeBuildInputs = [ gradle perl makeWrapper copyDesktopItems ]; - - desktopItems = [ desktopItem ]; - - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - # point to offline repo - sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle - gradle --offline --no-daemon desktop:release - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 desktop/build/libs/desktop-${version}.jar $out/share/shattered-pixel-dungeon.jar - mkdir $out/bin - makeWrapper ${jre}/bin/java $out/bin/shattered-pixel-dungeon \ - --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ - --add-flags "-jar $out/share/shattered-pixel-dungeon.jar" - - for s in 16 32 48 64 128 256; do - install -Dm644 desktop/src/main/assets/icons/icon_$s.png \ - $out/share/icons/hicolor/''${s}x$s/apps/shattered-pixel-dungeon.png - done - - runHook postInstall - ''; + depsHash = "sha256-i4k5tdo07E1NJwywroaGvRjZ+/xrDp6ra+GTYwTB7uk="; passthru.tests = { shattered-pixel-dungeon-starts = nixosTests.shattered-pixel-dungeon; }; - meta = with lib; { + desktopName = "Shattered Pixel Dungeon"; + + meta = { homepage = "https://shatteredpixel.com/"; downloadPage = "https://github.com/00-Evan/shattered-pixel-dungeon/releases"; description = "Traditional roguelike game with pixel-art graphics and simple interface"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # deps - ]; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 - broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch b/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch index 5bd6e5bcf16..9530f5b137b 100644 --- a/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch +++ b/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch @@ -38,10 +38,3 @@ index 97f35f7..afd5116 100644 dependencies { implementation project(':core') -@@ -123,4 +124,4 @@ dependencies { - - implementation project(':services:updates:githubUpdates') - implementation project(':services:news:shatteredNews') --} -\ No newline at end of file -+} diff --git a/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch b/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch new file mode 100644 index 00000000000..b7d051541d1 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch @@ -0,0 +1,29 @@ +diff --git a/build.gradle b/build.gradle +--- a/build.gradle ++++ b/build.gradle +@@ -11,7 +11,6 @@ buildscript { + //FIXME the version of R8 coming with gradle plugin 4.0.0 causes serious problems + //noinspection GradleDependency + classpath 'com.android.tools.build:gradle:3.6.4' +- classpath "com.palantir.gradle.gitversion:gradle-git-version:0.12.3" + } + } + +@@ -19,16 +18,13 @@ buildscript { + + allprojects { + +- apply plugin: "com.palantir.git-version" +- +- def details = versionDetails() + + ext { + appName = 'Summoning Pixel Dungeon' + appPackageName = 'com.trashboxbobylev.summoningpixeldungeon' + + appVersionCode = 430 +- appVersionName = '@version@-' + details.gitHash.substring(0, 7) ++ appVersionName = '@version@' + + appAndroidCompileSDK = 33 + appAndroidMinSDK = 15 diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix new file mode 100644 index 00000000000..7134e7aca8e --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix @@ -0,0 +1,30 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "experienced-pixel-dungeon"; + version = "2.15.3"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Experienced-Pixel-Dungeon-Redone"; + rev = "ExpPD-${version}"; + hash = "sha256-qwZk08e+GX8YAVnOZCQ6sIIfV06lWn5bM6/PKD0PAH0="; + }; + + postPatch = '' + substituteInPlace build.gradle \ + --replace "gdxControllersVersion = '2.2.3-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" + ''; + + depsHash = "sha256-MUUeWZUCVPakK1MJwn0lPnjAlLpPWB/J17Ad68XRcHg="; + + desktopName = "Experienced Pixel Dungeon"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Experienced-Pixel-Dungeon-Redone"; + downloadPage = "https://github.com/TrashboxBobylev/Experienced-Pixel-Dungeon-Redone/releases"; + description = "A fork of the Shattered Pixel Dungeon roguelike without limits on experience and items"; + }; +} diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/games/shattered-pixel-dungeon/generic.nix new file mode 100644 index 00000000000..92427674c18 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/generic.nix @@ -0,0 +1,137 @@ +# Generic builder for shattered pixel forks/mods +{ pname +, version +, src +, depsHash +, meta +, desktopName +, patches ? [ ./disable-beryx.patch ] + +, lib +, stdenv +, makeWrapper +, gradle +, perl +, jre +, libpulseaudio +, makeDesktopItem +, copyDesktopItems +, ... +}@attrs: + +let + cleanAttrs = builtins.removeAttrs attrs [ + "lib" + "stdenv" + "makeWrapper" + "gradle" + "perl" + "jre" + "libpulseaudio" + "makeDesktopItem" + "copyDesktopItems" + ]; + + postPatch = '' + # disable gradle plugins with native code and their targets + perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle + perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar|robovm|git-version)/ ... /^}/" build.gradle + # Remove unbuildable Android/iOS stuff + rm -f android/build.gradle ios/build.gradle + ${attrs.postPatch or ""} + ''; + + desktopItem = makeDesktopItem { + name = pname; + inherit desktopName; + comment = meta.description; + icon = pname; + exec = pname; + terminal = false; + categories = [ "Game" "AdventureGame" ]; + keywords = [ "roguelike" "dungeon" "crawler" ]; + }; + + # fake build to pre-download deps into fixed-output derivation + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit version src patches postPatch; + nativeBuildInputs = [ gradle perl ] ++ attrs.nativeBuildInputs or []; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} + gradle --no-daemon desktop:release + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + outputHashMode = "recursive"; + outputHash = depsHash; + }; + +in stdenv.mkDerivation (cleanAttrs // { + inherit pname version src patches postPatch; + + nativeBuildInputs = [ + gradle + perl + makeWrapper + copyDesktopItems + ] ++ attrs.nativeBuildInputs or []; + + desktopItems = [ desktopItem ]; + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} + # point to offline repo + sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle + gradle --offline --no-daemon desktop:release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 desktop/build/libs/desktop-*.jar $out/share/${pname}.jar + mkdir $out/bin + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ + --add-flags "-jar $out/share/${pname}.jar" + + for s in 16 32 48 64 128 256; do + # Some forks only have some icons and/or name them slightly differently + if [ -f desktop/src/main/assets/icons/icon_$s.png ]; then + install -Dm644 desktop/src/main/assets/icons/icon_$s.png \ + $out/share/icons/hicolor/''${s}x$s/apps/${pname}.png + fi + if [ -f desktop/src/main/assets/icons/icon_''${s}x$s.png ]; then + install -Dm644 desktop/src/main/assets/icons/icon_''${s}x$s.png \ + $out/share/icons/hicolor/''${s}x$s/apps/${pname}.png + fi + done + + runHook postInstall + ''; + + meta = with lib; { + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 + broken = stdenv.isDarwin; + mainProgram = pname; + } // meta; +}) diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix new file mode 100644 index 00000000000..34a24a758fd --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix @@ -0,0 +1,25 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "rat-king-adventure"; + version = "1.5.2a"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Rat-King-Adventure"; + rev = version; + hash = "sha256-UgUm7GIn1frS66YYrx+ax+oqMKnQnDlqpn9e1kWwDzo="; + }; + + depsHash = "sha256-yE6zuLnFLtNq76AhtyE+giGLF2vcCqF7sfIvcY8W6Lg="; + + desktopName = "Rat King Adventure"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Rat-King-Adventure"; + downloadPage = "https://github.com/TrashboxBobylev/Rat-King-Adventure/releases"; + description = "An expansive fork of RKPD2, itself a fork of the Shattered Pixel Dungeon roguelike"; + }; +} diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2.nix b/pkgs/games/shattered-pixel-dungeon/rkpd2.nix new file mode 100644 index 00000000000..a3864dd3b6f --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/rkpd2.nix @@ -0,0 +1,25 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "rkpd2"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Zrp200"; + repo = "rkpd2"; + rev = "v${version}"; + hash = "sha256-3WKQCXFDyliObXaIRp3x0kRh3XeNd24SCoTgdFA8/rM="; + }; + + depsHash = "sha256-yE6zuLnFLtNq76AhtyE+giGLF2vcCqF7sfIvcY8W6Lg="; + + desktopName = "Rat King Pixel Dungeon 2"; + + meta = { + homepage = "https://github.com/Zrp200/rkpd2"; + downloadPage = "https://github.com/Zrp200/rkpd2/releases"; + description = "Fork of popular roguelike game Shattered Pixel Dungeon that drastically buffs heroes and thus makes the game significantly easier"; + }; +} diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix new file mode 100644 index 00000000000..062e76cf852 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix @@ -0,0 +1,30 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "shorter-pixel-dungeon"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Shorter-Pixel-Dungeon"; + rev = "Short-${version}"; + hash = "sha256-8vmh65XlNqfIh4WHLPuWU68tb3ajKI8kBMI68CYlsSk="; + }; + + postPatch = '' + substituteInPlace build.gradle \ + --replace "gdxControllersVersion = '2.2.4-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" + ''; + + depsHash = "sha256-MUUeWZUCVPakK1MJwn0lPnjAlLpPWB/J17Ad68XRcHg="; + + desktopName = "Shorter Pixel Dungeon"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Shorter-Pixel-Dungeon"; + downloadPage = "https://github.com/TrashboxBobylev/Shorter-Pixel-Dungeon/releases"; + description = "A shorter fork of the Shattered Pixel Dungeon roguelike"; + }; +} diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix new file mode 100644 index 00000000000..beec48b746c --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix @@ -0,0 +1,36 @@ +{ callPackage +, fetchFromGitHub +, gradle_6 +, substitute +}: + +callPackage ./generic.nix rec { + pname = "summoning-pixel-dungeon"; + version = "1.2.5"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Summoning-Pixel-Dungeon"; + # The GH release is named "$version-$hash", but it's actually a mutable "_latest" tag + rev = "fc63a89a0f9bdf9cb86a750dfec65bc56d9fddcb"; + hash = "sha256-n1YR7jYJ8TQFe654aERgmOHRgaPZ82eXxu0K12/5MGw="; + }; + + patches = [(substitute { + src = ./disable-git-version.patch; + replacements = [ "--subst-var-by" "version" version ]; + })]; + + depsHash = "sha256-0P/BcjNnbDN25DguRcCyzPuUG7bouxEx1ySodIbSwvg="; + + desktopName = "Summoning Pixel Dungeon"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon"; + downloadPage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/releases"; + description = "A fork of the Shattered Pixel Dungeon roguelike with added summoning mechanics"; + }; + + # Probably due to https://github.com/gradle/gradle/issues/17236 + gradle = gradle_6; +} diff --git a/pkgs/misc/sagetex/default.nix b/pkgs/misc/sagetex/default.nix index 0f22158e3eb..f1db705afdd 100644 --- a/pkgs/misc/sagetex/default.nix +++ b/pkgs/misc/sagetex/default.nix @@ -1,10 +1,11 @@ { lib , stdenv , fetchFromGitHub +, writeShellScript , texlive }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation rec { pname = "sagetex"; version = "3.6.1"; @@ -15,8 +16,14 @@ stdenv.mkDerivation (finalAttrs: rec { sha256 = "sha256-OfhbXHbGI+DaDHqZCOGiSHJPHjGuT7ZqSEjKweloW38="; }; - buildInputs = [ + outputs = [ "tex" ]; + + nativeBuildInputs = [ texlive.combined.scheme-basic + # multiple-outputs.sh fails if $out is not defined + (writeShellScript "force-tex-output.sh" '' + out="''${tex-}" + '') ]; buildPhase = '' @@ -29,11 +36,6 @@ stdenv.mkDerivation (finalAttrs: rec { cp -va *.sty *.cfg *.def "$path/" ''; - passthru = { - tlType = "run"; - pkgs = [ finalAttrs.finalPackage ]; - }; - meta = with lib; { description = "Embed code, results of computations, and plots from Sage into LaTeX documents"; homepage = "https://github.com/sagemath/sagetex"; @@ -41,4 +43,4 @@ stdenv.mkDerivation (finalAttrs: rec { maintainers = with maintainers; [ alexnortung ]; platforms = platforms.all; }; -}) +} diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 9ac76160127..15695283134 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -63,7 +63,6 @@ let dtc flex installShellFiles - openssl (buildPackages.python3.withPackages (p: [ p.libfdt p.setuptools # for pkg_resources @@ -78,6 +77,7 @@ let ncurses # tools/kwboot libuuid # tools/mkeficapsule gnutls # tools/mkeficapsule + openssl # tools ]; hardeningDisable = [ "all" ]; diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix index 02c4025ba46..a44b8779593 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/misc/vencord/default.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.6.0"; - gitHash = "ffe6bb1"; + version = "1.6.2"; + gitHash = "dd61b0c"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-t4+8ybPzqcCtTSukBBgvbD7HiKG4K51WPVnJg0RQbs8="; + hash = "sha256-AqyUnDMIASJ/kUTeICdN94W5U0E52RFs6hM2/E8AjXI="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-H2f6xdAa7fNETbQhIv+InCB7+O4nq0bx+RILjGjqXdY="; + npmDepsHash = "sha256-RzOv8LekJqX0C/AjC5ONkfkMK36bAGWFxyM9Akn1CIg="; 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 ad21cfc0c85..6934811f65e 100644 --- a/pkgs/misc/vencord/package-lock.json +++ b/pkgs/misc/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.6.0", + "version": "1.6.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.6.0", + "version": "1.6.2", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -893,9 +893,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.18.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.7.tgz", - "integrity": "sha512-bw+lEsxis6eqJYW8Ql6+yTqkE6RuFtsQPSe5JxXbqYRFQEER5aJA9a5UH9igqDWm3X4iLHIKOHlnAXLM4mi7uQ==", + "version": "18.18.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.8.tgz", + "integrity": "sha512-OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -1177,9 +1177,9 @@ } }, "node_modules/acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "version": "8.11.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -1596,75 +1596,17 @@ "node": ">=0.10.0" } }, - "node_modules/class-utils/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/class-utils/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", + "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", "dev": true, "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/cliui": { @@ -3261,15 +3203,15 @@ "dev": true }, "node_modules/is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz", + "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==", "dev": true, "dependencies": { - "kind-of": "^6.0.0" + "hasown": "^2.0.0" }, "engines": { - "node": ">=0.10.0" + "node": ">= 0.10" } }, "node_modules/is-arrayish": { @@ -3297,29 +3239,28 @@ } }, "node_modules/is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz", + "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==", "dev": true, "dependencies": { - "kind-of": "^6.0.0" + "hasown": "^2.0.0" }, "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz", + "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==", "dev": true, "dependencies": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" }, "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/is-extendable": { @@ -3896,51 +3837,17 @@ "node": ">=0.10.0" } }, - "node_modules/object-copy/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/object-copy/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", + "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", "dev": true, "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/object-copy/node_modules/kind-of": { @@ -4262,9 +4169,9 @@ } }, "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, "engines": { "node": ">=6" @@ -4735,66 +4642,17 @@ "node": ">=0.10.0" } }, - "node_modules/snapdragon/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/snapdragon/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", + "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", "dev": true, "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" }, "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/snapdragon/node_modules/is-extendable": { @@ -4806,15 +4664,6 @@ "node": ">=0.10.0" } }, - "node_modules/snapdragon/node_modules/kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/snapdragon/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -4957,75 +4806,17 @@ "node": ">=0.10.0" } }, - "node_modules/static-extend/node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/static-extend/node_modules/is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz", + "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==", "dev": true, "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "^1.0.1", + "is-data-descriptor": "^1.0.1" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": ">= 0.4" } }, "node_modules/string_decoder": { diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/os-specific/darwin/rectangle/default.nix index 6ea01f7c64d..590e6427d19 100644 --- a/pkgs/os-specific/darwin/rectangle/default.nix +++ b/pkgs/os-specific/darwin/rectangle/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.73"; + version = "0.74"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-D+heCrJVo2xsKY9XtEuhrG/59yFIJTGhKJIfN9Vhc+M="; + hash = "sha256-ERfzgw8R39dOc9F/dgcgCKbEVFNChC5LqDFBDzbS+Wg="; }; sourceRoot = "."; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index e74ef773915..07cdbf6bdce 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20230614"; + version = "20231030"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "sha256-TLQHZYcnO7VzIHH+aCj78plTwK5RrcsU/OfNXApAvdM="; + sha256 = "sha256-+h0FwvfIoluhldOi6cgVDvmNWe1Lvj1SV3pL8Zh+gRM="; }; installPhase = '' diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 0cd37f262cd..ab55839c340 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -67,13 +67,13 @@ with lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.19.5"; + version = "1.19.6"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - hash = "sha256-m8tI68PUEkO+tWbcq8CF5TAiKqFU9kcXMbi6NszS7NE="; + hash = "sha256-L8YSbdk+qQl17L4IRajFD/AEWRXb2w7xH9sM9qPGrQo="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0f59d3ac7aa..fb583551f1b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -320,9 +320,11 @@ let FRAMEBUFFER_CONSOLE = yes; FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = yes; FRAMEBUFFER_CONSOLE_ROTATION = yes; + FRAMEBUFFER_CONSOLE_DETECT_PRIMARY = yes; FB_GEODE = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; # On 5.14 this conflicts with FB_SIMPLE. DRM_SIMPLEDRM = whenAtLeast "5.14" no; + DRM_FBDEV_EMULATION = yes; }; fonts = { @@ -1005,6 +1007,28 @@ let # Keeping it a built-in ensures it will be used if possible. FB_SIMPLE = yes; + # https://docs.kernel.org/arch/arm/mem_alignment.html + # tldr: + # when buggy userspace code emits illegal misaligned LDM, STM, + # LDRD and STRDs, the instructions trap, are caught, and then + # are emulated by the kernel. + # + # This is the default on armv7l, anyway, but it is explicitly + # enabled here for the sake of providing context for the + # aarch64 compat option which follows. + ALIGNMENT_TRAP = mkIf (stdenv.hostPlatform.system == "armv7l-linux") yes; + + # https://patchwork.kernel.org/project/linux-arm-kernel/patch/20220701135322.3025321-1-ardb@kernel.org/ + # tldr: + # when encountering alignment faults under aarch64, this option + # makes the kernel attempt to handle the fault by doing the + # same style of misaligned emulation that is performed under + # armv7l (see above option). + # + # This minimizes the potential for aarch32 userspace to behave + # differently when run under aarch64 kernels compared to when + # it is run under an aarch32 kernel. + COMPAT_ALIGNMENT_FIXUPS = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "6.1" yes); } // optionalAttrs (versionAtLeast version "5.4" && (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")) { # Required for various hardware features on Chrome OS devices CHROME_PLATFORMS = yes; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index a5ee8344b32..33b7f88493d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,62 +2,62 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.327-hardened1.patch", - "sha256": "0183jgdvp20mk6vmmn62mdmy75xp816lm3gg5dlpvg4aw9n5hiz9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.327-hardened1/linux-hardened-4.14.327-hardened1.patch" + "name": "linux-hardened-4.14.328-hardened1.patch", + "sha256": "1qq2l4nwhxgl4drx6isc1ly892kffjq4hqb4zadqs6sxvsdm7x57", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.328-hardened1/linux-hardened-4.14.328-hardened1.patch" }, - "sha256": "0nharfyxlr17yan86zrhlbq7idm0g3zvvvmy2zbw7m9dhgc8bw5z", - "version": "4.14.327" + "sha256": "1igcpvnhwwrczfdsafmszvi0456k7f6j4cgpfw6v6afw09p95d8x", + "version": "4.14.328" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.296-hardened1.patch", - "sha256": "0yzxnh2gdrbz9dspw3xbsrqhcdsk0pl938w229kccps9klg9s7lb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.296-hardened1/linux-hardened-4.19.296-hardened1.patch" + "name": "linux-hardened-4.19.297-hardened1.patch", + "sha256": "1qj09bynl7ml880xpc2956jn0b1gmm77yf3jc45v3jq3610jhna4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.297-hardened1/linux-hardened-4.19.297-hardened1.patch" }, - "sha256": "1bk051canr4fb00j6x9ff2wam2f20whw4h4z767x2cn2kmv6cqb3", - "version": "4.19.296" + "sha256": "0c9xxqgv2i36hrr06dwz7f3idc04xpv0a5pxg08xdh03cnyf12cx", + "version": "4.19.297" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.198-hardened1.patch", - "sha256": "0xvpq41nslrdz7w39glswibj6aywny06rvxwqks2sgcbwbggldi6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.198-hardened1/linux-hardened-5.10.198-hardened1.patch" + "name": "linux-hardened-5.10.199-hardened1.patch", + "sha256": "10vwd5wygfnxpbz15bq56pjygba3vqqal0d7xry2bch4p444pp5f", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.199-hardened1/linux-hardened-5.10.199-hardened1.patch" }, - "sha256": "01gsw96anw44nh8ii3zipp6vh61m1n8yf0bv2fzznr23k771y51b", - "version": "5.10.198" + "sha256": "1h944syk7n6c4j1djlx19n77alzwbxcdza77c9ykicgfynhpgsm0", + "version": "5.10.199" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.136-hardened1.patch", - "sha256": "11cw8pqcjqbmxgkqh42p58q1pi6m684qjyjf7fcw2bip8jdbvqk7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.136-hardened1/linux-hardened-5.15.136-hardened1.patch" + "name": "linux-hardened-5.15.137-hardened1.patch", + "sha256": "19gs1w380qgvazwjwhxypizpfx71faa7hsji0x5cgyw6vxhi6l1b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.137-hardened1/linux-hardened-5.15.137-hardened1.patch" }, - "sha256": "1f5cxrair8qycjcc931kcdsarbrph32ypdyhrws8sw74gvzbj966", - "version": "5.15.136" + "sha256": "1xxjbxldrhmnh2q6rykpxyfbj8xqgl82q30n8sfavrzr14bb4jcp", + "version": "5.15.137" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.258-hardened1.patch", - "sha256": "1c6m65m3cjx1nbaqilkiqhwb143rd2zwy8mkxxdrm1916cs5hvbk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.258-hardened1/linux-hardened-5.4.258-hardened1.patch" + "name": "linux-hardened-5.4.259-hardened1.patch", + "sha256": "1w8ipflgisd127gmx6wyz8p5qfi8cfd2a5j2xgibspkf45nzfwi8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.259-hardened1/linux-hardened-5.4.259-hardened1.patch" }, - "sha256": "0gk2xav1ng565l1qsqlr8ja6m4j5g8rfj66vad1fmdd1lwaihw1r", - "version": "5.4.258" + "sha256": "195v4fidavzm637glj6580006mrcaygnbj4za874imb62bxf9rpz", + "version": "5.4.259" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.59-hardened1.patch", - "sha256": "19x0hc3h80r5i3lm09pky5i4hzapd8p53hr9hqk3g6yaj4k24h9q", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.59-hardened1/linux-hardened-6.1.59-hardened1.patch" + "name": "linux-hardened-6.1.60-hardened1.patch", + "sha256": "1k0807jpjljf2fcjxnmvd9rb8y8xqj21x2qn4yd72c58jkii52qq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.60-hardened1/linux-hardened-6.1.60-hardened1.patch" }, - "sha256": "1860r1aan258yi2jq68bp1kdbcyy7ygc7d8g54wnc0vmqqj7fzv2", - "version": "6.1.59" + "sha256": "02pvymr1dgd36mp7yikxqqv0sfrpwi1grnvxvx6jbbx6wmx0wljq", + "version": "6.1.60" }, "6.5": { "patch": { diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index ab2775ab922..08222392499 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,16 +4,16 @@ "hash": "sha256:1zzd32ya4hldfywicgpnc2cyd412s7q9c31qvxx2nl9nkx11xsxv" }, "6.5": { - "version": "6.5.9", - "hash": "sha256:1mcg0lpxr832mwyqlbn0s5gssvsk2nn2xhq9w0qbymizf5j2yrn6" + "version": "6.5.10", + "hash": "sha256:12sswml8jvabv6bqx35lg3jj6gq8jjk365rghjngdy5d0j34jpx1" }, "6.4": { "version": "6.4.16", "hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln" }, "6.1": { - "version": "6.1.60", - "hash": "sha256:02pvymr1dgd36mp7yikxqqv0sfrpwi1grnvxvx6jbbx6wmx0wljq" + "version": "6.1.61", + "hash": "sha256:1kk4d7ph6pvgdrdmaklg15wf58nw9n7yqgkag7jdvqinzh99sb5d" }, "5.15": { "version": "5.15.137", diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index b99a19bf9d0..e9af8a2be35 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19417"; - sha256 = "1m7zbc5hjjcckr271cg2vgpxmy9ih4hf54fsvmpz75j45lcqvqik"; + rev = "19438"; + sha256 = "14bdnxw23d0pl53b1rn7g69wn9a7hr6c0q8zd5p6j2aap0i7c4a4"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index eadd57c1e3b..bc45a86905c 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.133-rt70"; # updated by ./update-rt.sh + version = "5.15.137-rt71"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1paxzzcagc7s8i491zjny43rxhfamafyly438kj8hyw96iwmx17g"; + sha256 = "1xxjbxldrhmnh2q6rykpxyfbj8xqgl82q30n8sfavrzr14bb4jcp"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0n066vd63wm08dzpr0c79k2b454vslgwcjjhp8kh672j5acxii9p"; + sha256 = "11zk02ni3b0l1wwrfvyc1q92bd9as61hwgbwlj42xv5gbpd39jlw"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 07f95884aa7..6fe869e86c5 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.9"; #zen - suffix = "zen2"; #zen - sha256 = "07dxxs4bz4d6bahymzjzg42ic09wkvd8ynwvv9z19zjh6mk70vr2"; #zen + version = "6.6"; #zen + suffix = "zen1"; #zen + sha256 = "0rda54h5lg2llbwkj2h4mqfshjyha1dzlcwhx099is7g2lfzksxx"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { version = "6.5.9"; #lqx - suffix = "lqx1"; #lqx - sha256 = "0z5mfcblwqzsw2d98npv1aa32bni46xmsvwc1ijad1c54iimsk9a"; #lqx + suffix = "lqx2"; #lqx + sha256 = "12l6z4bgrx5pf4fpcqsnzascr7f43cg1vwpayhgcwd7zimlbz1mg"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch b/pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch new file mode 100644 index 00000000000..2b4b35774d1 --- /dev/null +++ b/pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch @@ -0,0 +1,38 @@ +From 592de67191a3969fcccef6293740c7142793d461 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Wed, 1 Nov 2023 21:54:05 +0100 +Subject: [PATCH] skip installing example configuration +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This requires root if prefix dir is pointed to /etc, +which we cannot do in nix builds. + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + meson.build | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 5f5935f..8373013 100644 +--- a/meson.build ++++ b/meson.build +@@ -114,10 +114,10 @@ else + runstatedir = rundir + endif + +-install_data( +- sources: 'ksmbd.conf.example', +- install_dir: get_option('sysconfdir') / 'ksmbd', +-) ++#install_data( ++# sources: 'ksmbd.conf.example', ++# install_dir: get_option('sysconfdir') / 'ksmbd', ++#) + + systemdsystemunitdir = get_option('systemdsystemunitdir') + if systemdsystemunitdir == '' +-- +2.42.0 + diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/os-specific/linux/ksmbd-tools/default.nix index 6813e773a95..4098f6c2225 100644 --- a/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/pkgs/os-specific/linux/ksmbd-tools/default.nix @@ -1,8 +1,8 @@ { lib , stdenv , fetchFromGitHub -, autoconf -, automake +, meson +, ninja , glib , libkrb5 , libnl @@ -13,22 +13,23 @@ stdenv.mkDerivation rec { pname = "ksmbd-tools"; - version = "3.4.9"; + version = "3.5.0"; src = fetchFromGitHub { owner = "cifsd-team"; repo = pname; rev = version; - sha256 = "sha256-GZccOlp9zZMqtv3+u8JnKFfIe8sjwbZBLkDk8lt3CGk="; + sha256 = "sha256-8mjfKCazigHnuN7Egf11ZuD+nQx7ZTesn0a4LsVvV/M="; }; buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; - - preConfigure = "./autogen.sh"; - - configureFlags = lib.optional withKerberos "--enable-krb5"; + nativeBuildInputs = [ meson ninja libtool pkg-config ]; + patches = [ ./0001-skip-installing-example-configuration.patch ]; + mesonFlags = [ + "-Drundir=/run" + "--sysconfdir /etc" + ]; meta = with lib; { description = "Userspace utilities for the ksmbd kernel SMB server"; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix b/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix index 41e3547a786..5eea877803a 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/2.nix @@ -84,6 +84,17 @@ kaem.runCommand "${pname}-${version}" { "-e" (builtins.toFile "bash-builder.sh" '' export CONFIG_SHELL=$SHELL + + # Normalize the NIX_BUILD_CORES variable. The value might be 0, which + # means that we're supposed to try and auto-detect the number of + # available CPU cores at run-time. We don't have nproc to detect the + # number of available CPU cores so default to 1 if not set. + NIX_BUILD_CORES="''${NIX_BUILD_CORES:-1}" + if [ $NIX_BUILD_CORES -le 0 ]; then + NIX_BUILD_CORES=1 + fi + export NIX_BUILD_CORES + bash -eux $buildCommandPath '') ]; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix index 35c4da7acf9..86fa3a58687 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/bash/default.nix @@ -54,6 +54,17 @@ bootBash.runCommand "${pname}-${version}" { "-e" (builtins.toFile "bash-builder.sh" '' export CONFIG_SHELL=$SHELL + + # Normalize the NIX_BUILD_CORES variable. The value might be 0, which + # means that we're supposed to try and auto-detect the number of + # available CPU cores at run-time. + NIX_BUILD_CORES="''${NIX_BUILD_CORES:-1}" + if ((NIX_BUILD_CORES <= 0)); then + guess=$(nproc 2>/dev/null || true) + ((NIX_BUILD_CORES = guess <= 0 ? 1 : guess)) + fi + export NIX_BUILD_CORES + bash -eux $buildCommandPath '') ]; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index 11b7f5b11a6..a246b587dd4 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -24,14 +24,12 @@ lib.makeScope }; binutils = callPackage ./binutils { - bash = bash_2_05; tinycc = tinycc-musl; gnumake = gnumake-musl; gnutar = gnutar-musl; }; bzip2 = callPackage ./bzip2 { - bash = bash_2_05; tinycc = tinycc-musl; gnumake = gnumake-musl; gnutar = gnutar-musl; @@ -53,7 +51,6 @@ lib.makeScope }; findutils = callPackage ./findutils { - bash = bash_2_05; tinycc = tinycc-musl; gnumake = gnumake-musl; gnutar = gnutar-musl; diff --git a/pkgs/os-specific/linux/nct6687d/default.nix b/pkgs/os-specific/linux/nct6687d/default.nix new file mode 100644 index 00000000000..493d0e6af10 --- /dev/null +++ b/pkgs/os-specific/linux/nct6687d/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, kernel +}: + +stdenv.mkDerivation rec { + pname = "nct6687d"; + version = "unstable-2023-09-22"; + + src = fetchFromGitHub { + owner = "Fred78290"; + repo = "nct6687d"; + rev = "cdfe855342a9383a9c4c918d51576c36d989070d"; + hash = "sha256-iOLWxj4I6oYkNXFSkmw7meTQEnrIfb4Mw+/LkzgzDxM="; + }; + + setSourceRoot = '' + export sourceRoot=$(pwd)/source + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(sourceRoot)" + ]; + + buildFlags = [ "modules" ]; + installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; + installTargets = [ "modules_install" ]; + + meta = with lib; { + description = "Kernel module for the Nuvoton NCT6687-R chipset found on many B550/B650 motherboards from ASUS and MSI"; + license = with licenses; [ gpl2Only ]; + homepage = "https://github.com/Fred78290/nct6687d/"; + platforms = platforms.linux; + maintainers = with maintainers; [ atemu ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 39ebe3e27e2..e6f366f3433 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,30 +27,24 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "535.113.01"; - sha256_64bit = "sha256-KOME2N/oG39en2BAS/OMYvyjVXjZdSLjxwoOjyMWdIE="; - sha256_aarch64 = "sha256-mw/p5ELGTNcM4P94soJIGqpLMBJHSPf+z9qsGnISuCk="; - openSha256 = "sha256-SePRFb5S2T0pOmkSGflYfJkJBjG3Dx/Z0MjwnWccfcI="; - settingsSha256 = "sha256-hiX5Nc4JhiYYt0jaRgQzfnmlEQikQjuO0kHnqGdDa04="; - persistencedSha256 = "sha256-V5Wu8a7EhwZarGsflAhEQDE9s9PjuQ3JNMU1nWvNNsQ="; + version = "535.129.03"; + sha256_64bit = "sha256-5tylYmomCMa7KgRs/LfBrzOLnpYafdkKwJu4oSb/AC4="; + sha256_aarch64 = "sha256-i6jZYUV6JBvN+Rt21v4vNstHPIu9sC+2ZQpiLOLoWzM="; + openSha256 = "sha256-/Hxod/LQ4CGZN1B1GRpgE/xgoYlkPpMh+n8L7tmxwjs="; + settingsSha256 = "sha256-QKN/gLGlT+/hAdYKlkIjZTgvubzQTt4/ki5Y+2Zj3pk="; + persistencedSha256 = "sha256-FRMqY5uAJzq3o+YdM2Mdjj8Df6/cuUUAnh52Ne4koME="; }; latest = selectHighestVersion production (generic { - version = "530.41.03"; - sha256_64bit = "sha256-riehapaMhVA/XRYd2jQ8FgJhKwJfSu4V+S4uoKy3hLE="; - sha256_aarch64 = "sha256-uM5zMEO/AO32VmqUOzmc05FFm/lz76jPSSaQmeZUlFo="; - openSha256 = "sha256-etbtw6LMRUcFoZC9EDDRrTDekV8JFRYmkp3idLaMk5g="; - settingsSha256 = "sha256-8KB6T9f+gWl8Ni+uOyrJKiiH5mNx9eyfCcW/RjPTQQA="; - persistencedSha256 = "sha256-zrstlt/0YVGnsPGUuBbR9ULutywi2wNDVxh7OhJM7tM="; + version = "545.29.02"; + sha256_64bit = "sha256-RncPlaSjhvBFUCOzWdXSE3PAfRPCIrWAXyJMdLPKuIU="; + sha256_aarch64 = "sha256-Y2RDOuDtiIclr06gmLrPDfE5VFmFamXxiIIKtKAewro="; + openSha256 = "sha256-PukpOBtG5KvZKWYfJHVQO6SuToJUd/rkjpOlEi8pSmk="; + settingsSha256 = "sha256-zj173HCZJaxAbVV/A2sbJ9IPdT1+3yrwyxD+AQdkSD8="; + persistencedSha256 = "sha256-mmMi2pfwzI1WYOffMVdD0N1HfbswTGg7o57x9/IiyVU="; patchFlags = [ "-p1" "-d" "kernel" ]; - patches = [ - # source: https://gist.github.com/joanbm/77f0650d45747b9a4dc8e330ade2bf5c - (fetchpatch { - url = "https://gist.github.com/joanbm/77f0650d45747b9a4dc8e330ade2bf5c/raw/688b612624945926676de28059fe749203b4b549/nvidia-470xx-fix-linux-6.4.patch"; - hash = "sha256-OyRmezyzqAi7mSJHDjsWQVocSsgJPTW5DvHDFVNX7Dk="; - }) - ]; + patches = []; }); beta = selectHighestVersion latest (generic { @@ -93,25 +87,14 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.199.02"; - sha256_64bit = "sha256-/fggDt8RzjLDW0JiGjr4aV4RGnfEKL8MTTQ4tCjXaP0="; - sha256_aarch64 = "sha256-UmF7LszdrO2d+bOaoQYrTVKXUwDqzMy1UDBW5SPuZy4="; - settingsSha256 = "sha256-FkKPE4QV5IiVizGYUNUYoEXRpEhojt/cbH/I8iCn3hw="; - persistencedSha256 = "sha256-JP71wt3uCNOgheLNlQbW3DqVFQNTC5vj4y4COWKQzAs="; + version = "470.223.02"; + sha256_64bit = "sha256-s2hi1TNsw+br6Ow6tPiFsYPaJY8d+x4FrkBrP2xNRPg="; + sha256_aarch64 = "sha256-CFkg2ARlGWqlFQKm8SlbwMH6eLidHKA/q5QGVOpPGuU="; + settingsSha256 = "sha256-r6DuIH/rnsCm/y51iRgPNi5/kz+EFMVABREdTjBneZ0="; + persistencedSha256 = "sha256-e71fpPBBv8S/aoeXxBXkzKy5bsMMbv8y024cSLc8DYc="; patchFlags = [ "-p1" "-d" "kernel" ]; - patches = [ - # source: https://gist.github.com/joanbm/dfe8dc59af1c83e2530a1376b77be8ba - (fetchpatch { - url = "https://gist.github.com/joanbm/dfe8dc59af1c83e2530a1376b77be8ba/raw/37ff2b5ccf99f295ff958c9a44ca4ed4f42503b4/nvidia-470xx-fix-linux-6.5.patch"; - hash = "sha256-s5r7nwuMva0BLy2qJBVKqNtnUN9am5+PptnVwNdzdbk="; - }) - # source: https://gist.github.com/joanbm/2ec3c512a1ac21f5f5c6b3c1a4dbef35 - (fetchpatch { - url = "https://gist.github.com/joanbm/2ec3c512a1ac21f5f5c6b3c1a4dbef35/raw/615feaefed2de3a28bd12fe9783894b84a7c86e4/nvidia-470xx-fix-linux-6.6.patch"; - hash = "sha256-gdV+a+JFzQX8MzRz9eb4gVbnOfTWN+Ds9sOeyIBN5y0="; - }) - ]; + patches = []; }; # Last one supporting x86 diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 0b801d4b272..b11dc06c85e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -69,7 +69,9 @@ stdenv.mkDerivation { url = "https://github.com/NVIDIA/nvidia-settings/commit/a7c1f5fce6303a643fadff7d85d59934bd0cf6b6.patch"; hash = "sha256-ZwF3dRTYt/hO8ELg9weoz1U/XcU93qiJL2d1aq1Jlak="; }) - ++ lib.optional (lib.versionAtLeast nvidia_x11.settingsVersion "515.43.04") + ++ lib.optional + ((lib.versionAtLeast nvidia_x11.settingsVersion "515.43.04") + && (lib.versionOlder nvidia_x11.settingsVersion "545.29")) (fetchpatch { # fix wayland support for compositors that use wl_output version 4 url = "https://github.com/NVIDIA/nvidia-settings/pull/99/commits/2e0575197e2b3247deafd2a48f45afc038939a06.patch"; diff --git a/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix index 3715e2e840d..7b0df23ee66 100644 --- a/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix +++ b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix @@ -6,12 +6,9 @@ let val = 1; }; - include_file = (writeText "libconfig-test-include" '' + include_file = writeText "libconfig-test-include" '' val=1; - '').overrideAttrs { - outputHashAlgo = "sha256"; - outputHashMode = "flat"; - }; + ''; expression = { simple_top_level_attr = "1.0"; @@ -63,12 +60,15 @@ in doCheck = true; checkPhase = '' - diff -U3 ${./expected.txt} ${libconfig-test-cfg} + cp ${./expected.txt} expected.txt + substituteInPlace expected.txt \ + --subst-var-by include_file "${include_file}" + diff -U3 ./expected.txt ${libconfig-test-cfg} ''; installPhase = '' mkdir $out - cp ${./expected.txt} $out/expected.txt + cp expected.txt $out 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 index 3e9b1af821f..ef6e09f8111 100644 --- a/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt +++ b/pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt @@ -1,6 +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" +@include "@include_file@" 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/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index b3c2604d62e..500f0882796 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/pkgs/servers/audiobookshelf/default.nix @@ -17,13 +17,13 @@ let nodejs = nodejs_18; pname = "audiobookshelf"; - version = "2.4.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "advplyr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W0Vk1G/NI2u/iWhR5Q9Dwo9Ndq4QDiWUae6K22QfHfo="; + sha256 = "sha256-yPDByM09rc9zRLh0ONcY5bScY4NOrKDv0Pdwo97Czcs="; }; client = buildNpmPackage { @@ -37,7 +37,7 @@ let NODE_OPTIONS = "--openssl-legacy-provider"; npmBuildScript = "generate"; - npmDepsHash = "sha256-ep67S92WWvZO578EIpJCkdgMJAG/qJLe8twy4663RHQ="; + npmDepsHash = "sha256-ZNkHDNjaQbUt3oWnNIYPYkcvjelieY4RJxNSbzR1+JM="; }; wrapper = import ./wrapper.nix { @@ -52,7 +52,7 @@ in buildNpmPackage { dontNpmBuild = true; npmInstallFlags = [ "--only-production" ]; - npmDepsHash = "sha256-SutXEc9kKV/9E/Sh1gl49W6JcN/w+6FIJwL8rxPbBVA="; + npmDepsHash = "sha256-PVgK8R8sf16KKQS/mPXtvit9CW9+4Gc9Onpaw+SSgNI="; installPhase = '' mkdir -p $out/opt/client diff --git a/pkgs/servers/fastnetmon-advanced/default.nix b/pkgs/servers/fastnetmon-advanced/default.nix index ac3069d94f0..0a06d7b17c3 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.352"; + version = "2.0.353"; src = fetchurl { url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; - hash = "sha256-XYb1W3NYT8C9Jfs66NnqD2gRdYZFR5jzFLAIzx8a2Ck="; + hash = "sha256-EkZlQL/rb5x+6apV0nZ4Ay6hUEPifPCZF6CQaxKSWuM="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/fishnet/Cargo.lock.patch b/pkgs/servers/fishnet/Cargo.lock.patch deleted file mode 100644 index 7929eeee088..00000000000 --- a/pkgs/servers/fishnet/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 963e40e..fb76d78 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -230,7 +230,7 @@ dependencies = [ - - [[package]] - name = "fishnet" --version = "2.5.1-dev" -+version = "2.5.1" - dependencies = [ - "arrayvec", - "atty", \ No newline at end of file diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/servers/fishnet/default.nix index 10695e54781..6a808080517 100644 --- a/pkgs/servers/fishnet/default.nix +++ b/pkgs/servers/fishnet/default.nix @@ -6,21 +6,21 @@ }: let - nnueFile = "nn-13406b1dcbe0.nnue"; + nnueFile = "nn-5af11540bbfe.nnue"; nnue = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; - sha256 = "sha256-E0BrHcvgo238XgfaUdjbOLekXX2kMHjsJadiTCuDI28="; + hash = "sha256-WvEVQLv+/LVOOMXdAAyrS0ad+nWZodVb5dJyLCCokps="; }; in rustPlatform.buildRustPackage rec { pname = "fishnet"; - version = "2.5.1"; + version = "2.7.1"; src = fetchFromGitHub { - owner = "niklasf"; + owner = "lichess-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nVRG60sSpTqfqhCclvWoeyHR0+oO1Jn1PgftigDGq5c="; + hash = "sha256-q73oGQYSWx1aFy9IvbGpecOoc0wLEY2IzJH9GufnvCs="; fetchSubmodules = true; }; @@ -29,19 +29,18 @@ rustPlatform.buildRustPackage rec { cp -v '${nnue}' 'Fairy-Stockfish/src/${nnueFile}' ''; - cargoSha256 = "sha256-BJK7M/pjHRj74xoeciavhkK2YRpeogkELIuXetX73so="; + # Copying again bacause the file is deleted during build. + postBuild = '' + cp -v '${nnue}' 'Stockfish/src/${nnueFile}' + ''; - # TODO: Cargo.lock is out of date, so fix it. Likely not necessary anymore in - # the next update. - cargoPatches = [ - ./Cargo.lock.patch - ]; + cargoHash = "sha256-NO3u2ZXSiDQnZ/FFZLOtTnQoGMyN9pSI4sqGIXtjEcI="; meta = with lib; { description = "Distributed Stockfish analysis for lichess.org"; - homepage = "https://github.com/niklasf/fishnet"; + homepage = "https://github.com/lichess-org/fishnet"; license = licenses.gpl3Plus; maintainers = with maintainers; [ tu-maurice ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d1ebe9fefa1..60248f80d7b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.10.5"; + version = "2023.11.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -682,6 +682,8 @@ "cpuspeed" = ps: with ps; [ py-cpuinfo ]; + "cribl" = ps: with ps; [ + ]; "crownstone" = ps: with ps; [ aiohttp-cors crownstone-cloud @@ -944,6 +946,8 @@ "eafm" = ps: with ps; [ aioeafm ]; + "eastron" = ps: with ps; [ + ]; "easyenergy" = ps: with ps; [ easyenergy ]; @@ -984,7 +988,6 @@ pythonegardia ]; "eight_sleep" = ps: with ps; [ - pyeight ]; "electrasmart" = ps: with ps; [ ]; # missing inputs: pyElectra @@ -1245,6 +1248,9 @@ "fitbit" = ps: with ps; [ aiohttp-cors fitbit + fnv-hash-fast + psutil-home-assistant + sqlalchemy ]; "fivem" = ps: with ps; [ fivem-api @@ -1538,6 +1544,13 @@ psutil-home-assistant sqlalchemy ]; + "google_tasks" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + google-api-python-client + psutil-home-assistant + sqlalchemy + ]; "google_translate" = ps: with ps; [ gtts ]; @@ -1959,10 +1972,31 @@ aiohttp-cors aioimaplib ]; - "imap_email_content" = ps: with ps; [ + "improv_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors - aioimaplib - ]; + aioruuvigateway + aioshelly + async-interrupt + bleak + bleak-retry-connector + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + sqlalchemy + webrtc-noise-gain + zeroconf + ]; # missing inputs: py-improv-ble-client "incomfort" = ps: with ps; [ incomfort-client ]; @@ -2370,6 +2404,9 @@ psutil-home-assistant sqlalchemy ]; + "local_todo" = ps: with ps; [ + ical + ]; "locative" = ps: with ps; [ aiohttp-cors ]; @@ -3241,6 +3278,8 @@ "poolsense" = ps: with ps; [ poolsense ]; + "portlandgeneral" = ps: with ps; [ + ]; "powerwall" = ps: with ps; [ tesla-powerwall ]; @@ -3332,6 +3371,7 @@ ]; "python_script" = ps: with ps; [ restrictedpython + restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent @@ -3464,6 +3504,21 @@ psutil-home-assistant sqlalchemy ]; + "recovery_mode" = ps: with ps; [ + aiohttp-cors + fnv-hash-fast + hass-nabucasa + hassil + home-assistant-frontend + home-assistant-intents + janus + mutagen + pillow + psutil-home-assistant + pyturbojpeg + sqlalchemy + webrtc-noise-gain + ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch "reddit" = ps: with ps; [ @@ -3617,21 +3672,6 @@ "sabnzbd" = ps: with ps; [ pysabnzbd ]; - "safe_mode" = ps: with ps; [ - aiohttp-cors - fnv-hash-fast - hass-nabucasa - hassil - home-assistant-frontend - home-assistant-intents - janus - mutagen - pillow - psutil-home-assistant - pyturbojpeg - sqlalchemy - webrtc-noise-gain - ]; "saj" = ps: with ps; [ pysaj ]; @@ -3829,9 +3869,6 @@ pyudev sqlalchemy ]; - "shiftr" = ps: with ps; [ - paho-mqtt - ]; "shodan" = ps: with ps; [ shodan ]; @@ -4208,6 +4245,8 @@ "tailscale" = ps: with ps; [ tailscale ]; + "tami4" = ps: with ps; [ + ]; # missing inputs: Tami4EdgeAPI "tank_utility" = ps: with ps; [ tank-utility ]; @@ -4390,6 +4429,9 @@ ]; "tod" = ps: with ps; [ ]; + "todo" = ps: with ps; [ + aiohttp-cors + ]; "todoist" = ps: with ps; [ todoist-api-python ]; @@ -4733,6 +4775,7 @@ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors + aiowithings fnv-hash-fast hass-nabucasa hassil @@ -4742,7 +4785,6 @@ pyturbojpeg sqlalchemy webrtc-noise-gain - withings-api ]; "wiz" = ps: with ps; [ aiohttp-cors @@ -5231,6 +5273,7 @@ "google_mail" "google_pubsub" "google_sheets" + "google_tasks" "google_translate" "google_travel_time" "google_wifi" @@ -5290,7 +5333,6 @@ "image_processing" "image_upload" "imap" - "imap_email_content" "influxdb" "inkbird" "input_boolean" @@ -5347,6 +5389,7 @@ "local_calendar" "local_file" "local_ip" + "local_todo" "locative" "lock" "logbook" @@ -5518,6 +5561,7 @@ "rdw" "recollect_waste" "recorder" + "recovery_mode" "reddit" "remote" "renault" @@ -5544,7 +5588,6 @@ "ruuvi_gateway" "ruuvitag_ble" "sabnzbd" - "safe_mode" "samsungtv" "scene" "schedule" @@ -5657,6 +5700,7 @@ "time_date" "timer" "tod" + "todo" "todoist" "tolo" "tomato" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5f4ee05a732..d0ca426a014 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,26 +67,6 @@ let ]; }); - blinkpy = super.blinkpy.overridePythonAttrs (oldAttrs: rec { - version = "0.21.0"; - src = fetchFromGitHub { - owner = "fronzbot"; - repo = "blinkpy"; - rev = "refs/tags/v${version}"; - hash = "sha256-0sEZlnS6CJj8nMyjtSFZRALRKdmY0Uu5N6sozPiDG6w="; - }; - }); - - dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { - version = "0.33"; - src = fetchFromGitHub { - owner = "ndokter"; - repo = "dsmr_parser"; - rev = "refs/tags/v${version}"; - hash = "sha256-Phx8Yqx6beTzkQv0fU8Pfs2btPgKVARdO+nMcne1S+w="; - }; - }); - geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -385,7 +365,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.10.5"; + hassVersion = "2023.11.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -401,7 +381,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-jVw0Mudb/L4Lw3AodwcOTrNJZctSfEIcXUzxozo7saA="; + hash = "sha256-qLs098k/MUvmOl6/tB4SDU55V7KTZ0+T3RUoLH4AQ2Q="; }; # Secondary source is git for tests @@ -409,7 +389,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-wKxAwa4t3JbS4puDAufjpzcVLcvEY9Bk73qmg3JeLPk="; + hash = "sha256-I5I/OcVE6nGO7LG3s2I1P/VUbPjPkUc7qj43z99tIRM="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index da86e1c698c..ae2ef562440 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20231005.0"; + version = "20231030.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-p93bo5+VQykcuK5f0r848tMoANSexvHDVBm7f3IYOMM="; + hash = "sha256-S363j7HnOxLqCBaml1Kb9xfY0AaqBIgj09NutByn6Xo="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 5f815628a50..52d9f622c41 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.10.2"; + version = "2023.10.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-4zaMDYHrUape+s9Z1nfGpud74pbkAeKBpJtmIyLdCjk="; + hash = "sha256-qW5KzABEEBw2tu5+fAoWd8nCxuvTzEU14M8iaSo2WzE="; fetchSubmodules = true; }; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 0c83c2e750a..7a5d6f5e556 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.72"; + version = "1.4.73"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-98reTWm3VKB0jAFGPDPNi0VsqcwDuwnoWnG8vNVOVew="; + sha256 = "sha256-gYgW0LMUsKqHKKcHZRNDX21esifzthMjRo4fENvoTKg="; }; postPatch = '' diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 8f90adab101..6194548a6a9 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -186,7 +186,7 @@ stdenv.mkDerivation { passthru = { inherit modules; tests = { - inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-proxyprotocol nginx-pubhtml nginx-sandbox nginx-sso nginx-status-page nginx-unix-socket; + inherit (nixosTests) nginx nginx-auth nginx-etag nginx-globalredirect nginx-http3 nginx-proxyprotocol nginx-pubhtml nginx-sso nginx-status-page nginx-unix-socket; variants = lib.recurseIntoAttrs nixosTests.nginx-variants; acme-integration = nixosTests.acme; } // passthru.tests; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 3d1afd389ee..180554acd72 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.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - hash = "sha256-Kr6Y1ePgBeH+WhkfEYqmoBZ9AJ54G+OVgrY73aV0+OU="; + hash = "sha256-TqsY0AUDEpFOGIAH6jDdofIJAYQYtj8Uk4djk5hYemo="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 02d164216f4..4b7c6d21f30 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -16,20 +16,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.95.0"; + version = "1.95.1"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-WYKuWTOP0w9Xtao9vF3+km4mXVTrt/mshcaXuF92voQ="; + hash = "sha256-5RyJCMYsf6p9rd1ATEHa+FMV6vv3ULbcx7PXxMSUGSU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-uUu2Hu4a7J49S3rhZ7xsLJQC7seYkVScYYbWaw4Q/rU="; + hash = "sha256-gNjpML+j9ABv24WrAiJI5hoEoIqcVPL2I4V/W+sWFSg="; }; postPatch = '' diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 4a74b6e4a72..0098317d062 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.19.0"; + version = "3.20.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-zDLL+3k6/Jgq/pflpmjuLcfPzvDl0LQLQklW+kOvtQg="; + hash = "sha256-kdeDV8IWbfeC6KDgJtOl1NX6jwvxiaIdGAYtrDuYFdI="; }; - vendorHash = "sha256-8qEGp95y8iBIJXCTh2Pa/JwiruZVVIjHLwaZqwFZMl8="; + vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index fbde71958f6..b54888cad96 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.10.0"; + version = "2.10.3"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-4UBbtJRQ6F3Dm+G4OWZeWtD4MJWtq91yiSZNW7EhEto="; + hash = "sha256-tVJcvxKcxhSeYyqBsBeG+OrWoD+hTDAoPuIXB72MMkY="; }; vendorHash = null; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index c6d335e9c85..bc99ae1f8f6 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.74"; + version = "2.0.75"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "sha256-jiAlqhJyeeoCxUYrUoPW5fdiPCtbuGwXRlmgBHYkF14="; + sha256 = "sha256-fxjF2CV5SoUTirusGQBpbNu9MYKU5yx+DHS2h0NJoic="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 708623bc9ff..26f7cc890df 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.75.0"; + version = "2.76.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-Tz1ogwht6MCRUM4Knr7Ka0VNN2yUmh/lQrJNdPEUMiI="; + hash = "sha256-nk+uYO8tJPUezu/nqfwNhK4q/ds9C96re/fWebrTa1Y="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/servers/monitoring/prometheus/nats-exporter.nix index b710acec9e3..3ba045745f0 100644 --- a/pkgs/servers/monitoring/prometheus/nats-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nats-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus-nats-exporter"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3LgxMbcq4vmFxFTrLrJECFqaD5xp9oJsFrqPXATkzqg="; + sha256 = "sha256-TsFj/iUG/PkGvVVn5RSWwEnHsEIGWMY8iapBHVpzt1c="; }; - vendorHash = "sha256-2QGz+7CGBrQPukDMRDapQ5MMMqRTPS6kqsa9J6UXEXY="; + vendorHash = "sha256-IoguUXHxEeyHb2io41ROgam8+7vD5WKzEWwNh4Dlk1o="; preCheck = '' # Fix `insecure algorithm SHA1-RSA` problem diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index d1418a9a248..62f041b285b 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-Y66VxzKaadTNE/84aQxgTKsr/KpXwq2W/1BOvsvyNbM="; + sha256 = "sha256-fxVU2z1RGgI8AoKiJb+3LIEa1KDhPptmdP21/ESzmgw="; }; - vendorHash = "sha256-+ly4zZFCnrWycdi/RP8L0yG5/lsGzu4VwKDlea2prio="; + vendorHash = "sha256-/AL9Qkcrp5Kvj2epJMuNrtwqBbyCy4P6oVGUfODXS/Q="; ldflags = let diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index ac13d678ff1..88d5befb19d 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.28.2"; + version = "1.28.3"; subPackages = [ "cmd/telegraf" ]; @@ -16,10 +16,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-gD4xdKjIx0zLKJySx8UdSKvMIZJaIXtubWQX/mLu+TI="; + hash = "sha256-9BwAsLk8pz1QharomkuQdsoNVQYzw+fSU3nDkw053JE="; }; - vendorHash = "sha256-OzAAchUHNno58Em2oDnMt9P1B03HtQylFBFEkv4bAkU="; + vendorHash = "sha256-EJ6NSc7vTnK6brhsBBplyuAjoTDSItswLA/2U1MrmFU="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 94f77b5dfda..f586b606f1d 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -13,6 +13,7 @@ , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , fetchpatch +, nixosTests }: let @@ -28,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "mosquitto"; - version = "2.0.17"; + version = "2.0.18"; src = fetchFromGitHub { owner = "eclipse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hOnZ6oHLvunZL6MrCmR5GkROQNww34QQ3m4gYDaSpb4="; + sha256 = "sha256-Vs0blV2IhnlEAm0WtOartz+0vLesJfp78FNJCivRxHk="; }; patches = lib.optionals stdenv.isDarwin [ @@ -76,6 +77,10 @@ stdenv.mkDerivation rec { "-DWITH_WEBSOCKETS=ON" ] ++ lib.optional withSystemd "-DWITH_SYSTEMD=ON"; + passthru.tests = { + inherit (nixosTests) mosquitto; + }; + meta = with lib; { description = "An open source MQTT v3.1/3.1.1/5.0 broker"; homepage = "https://mosquitto.org/"; diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index d901a66c4fa..d4c20cf2dd7 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -45,18 +45,18 @@ let in stdenv.mkDerivation rec { pname = "peertube"; - version = "5.1.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - hash = "sha256-C9mBF+QymGXyBB3IFX6MNgsZpHk739qv1/DLuvzrTaU="; + hash = "sha256-8JzU0JVb+JQCNiro8hPHBwkofNTUy90YkSCzTOoB+/A="; }; yarnOfflineCacheServer = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-W+pX2XO27j6qAVxvo+Xf1h7g3V0LUMtwNf+meZmkgwE="; + hash = "sha256-pzXH6hdDf8O6Kr12Xw0jRcnPRD2TrDGdiEfxVr3KmwY="; }; yarnOfflineCacheTools = fetchYarnDeps { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { yarnOfflineCacheClient = fetchYarnDeps { yarnLock = "${src}/client/yarn.lock"; - hash = "sha256-TAv8QAAfT3q28jUo26h0uCGsoqBzAn8lybIaqNAApU8="; + hash = "sha256-Ejzk/VEx7YtJpsrkHcXAZnJ+yRx1VhBJGpqquHYULNU="; }; nativeBuildInputs = [ brotli fixup_yarn_lock jq nodejs which yarn ]; diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 1945068b237..7d57eca6419 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-9gD39eHIQEd59UNlz/Sw7V7ekBvk/pHETfo8HzfdQDQ="; + sha256 = "sha256-VFyFQ3c4EEbQAj3bUgjWbmpCyugcpfz0phgBz0ZUB/Q="; }; patches = [ @@ -26,17 +26,6 @@ beamPackages.mixRelease rec { overrides = final: prev: { # mix2nix does not support git dependencies yet, # so we need to add them manually - gettext = beamPackages.buildMix rec { - name = "gettext"; - version = "0.19.1"; - - src = fetchFromGitHub { - owner = "tusooa"; - repo = "gettext"; - rev = "72fb2496b6c5280ed911bdc3756890e7f38a4808"; - sha256 = "sha256-V0qmE+LcAbVoWsJmWE4fwrduYFIZ5BzK/sGzgLY3eH0="; - }; - }; prometheus_ex = beamPackages.buildMix rec { name = "prometheus_ex"; version = "3.0.5"; diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix index cd5bb10b79c..2b3512f1c8a 100644 --- a/pkgs/servers/pleroma/mix.nix +++ b/pkgs/servers/pleroma/mix.nix @@ -13,9 +13,9 @@ let version = "0.3.5"; src = fetchHex { - pkg = "${name}"; + pkg = "accept"; version = "${version}"; - sha256 = "1f0vmjjyyz8klhdb3k8zrcxpidhfy6706327nmisnbnc1ci8rc8i"; + sha256 = "11b18c220bcc2eab63b5470c038ef10eb6783bcb1fcdb11aa4137defa5ac1bb8"; }; beamDeps = []; @@ -26,9 +26,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "base62"; version = "${version}"; - sha256 = "1fvpygkdmd7l737lv7svir8n1vhk0m094i8ygwcvx9gam2ykc4yl"; + sha256 = "d41336bda8eaa5be197f1e4592400513ee60518e5b9f4dcf38f4b4dae6f377bb"; }; beamDeps = [ custom_base ]; @@ -39,9 +39,9 @@ let version = "0.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "bbcode_pleroma"; version = "${version}"; - sha256 = "1hyixcxhcf2j2gyavmmnvfslnl6z60dz1qa9xysfspws85s1118r"; + sha256 = "19851074419a5fedb4ef49e1f01b30df504bb5dbb6d6adfc135238063bebd1c3"; }; beamDeps = [ nimble_parsec ]; @@ -49,12 +49,12 @@ let bcrypt_elixir = buildMix rec { name = "bcrypt_elixir"; - version = "2.3.0"; + version = "2.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "bcrypt_elixir"; version = "${version}"; - sha256 = "0s9psinz913l690xbcrl21m23zwinw4r2ypjgg7ybl3f9wfxd09c"; + sha256 = "42182d5f46764def15bf9af83739e3bf4ad22661b1c34fc3e88558efced07279"; }; beamDeps = [ comeonin elixir_make ]; @@ -62,15 +62,15 @@ let benchee = buildMix rec { name = "benchee"; - version = "1.0.1"; + version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "benchee"; version = "${version}"; - sha256 = "1nxd6blgmalb1qm9n11yaq24din2grc3pnnfsx6wkiz9hzkqmm9s"; + sha256 = "7da57d545003165a012b587077f6ba90b89210fd88074ce3c60ce239eb5e6d93"; }; - beamDeps = [ deep_merge ]; + beamDeps = [ deep_merge statistex ]; }; bunt = buildMix rec { @@ -78,9 +78,9 @@ let version = "0.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "bunt"; version = "${version}"; - sha256 = "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"; + sha256 = "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"; }; beamDeps = []; @@ -88,12 +88,12 @@ let cachex = buildMix rec { name = "cachex"; - version = "3.3.0"; + version = "3.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cachex"; version = "${version}"; - sha256 = "189irin4xkbnj6b3ih1h5fvli1xq6m1sz1xiyqryyk71vphmw3nr"; + sha256 = "ebf24e373883bc8e0c8d894a63bbe102ae13d918f790121f5cfe6e485cc8e2e2"; }; beamDeps = [ eternal jumper sleeplocks unsafe ]; @@ -104,9 +104,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "calendar"; version = "${version}"; - sha256 = "0vqa1zpzsdgr6i3yx8j9b6qscvgrbvzn43p5bqm930hcja0ra3lr"; + sha256 = "990e9581920c82912a5ee50e62ff5ef96da6b15949a2ee4734f935fdef0f0a6f"; }; beamDeps = [ tzdata ]; @@ -114,12 +114,12 @@ let castore = buildMix rec { name = "castore"; - version = "0.1.18"; + version = "0.1.22"; src = fetchHex { - pkg = "${name}"; + pkg = "castore"; version = "${version}"; - sha256 = "01kawrhxcc0i7zkygss5ia8hmkzv39q4bnrwnf0fz0mpa9jazfv1"; + sha256 = "c17576df47eb5aa1ee40cc4134316a99f5cad3e215d5c77b8dd3cfef12a22cac"; }; beamDeps = []; @@ -130,9 +130,9 @@ let version = "2.9.0"; src = fetchHex { - pkg = "${name}"; + pkg = "certifi"; version = "${version}"; - sha256 = "0ha6vmf5p3xlbf5w1msa89frhvfk535rnyfybz9wdmh6vdms8v96"; + sha256 = "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"; }; beamDeps = []; @@ -143,9 +143,9 @@ let version = "0.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "combine"; version = "${version}"; - sha256 = "06s5y8b0snr1s5ax9v3s7rc6c8xf5vj6878d1mc7cc07j0bvq78v"; + sha256 = "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"; }; beamDeps = []; @@ -153,12 +153,12 @@ let comeonin = buildMix rec { name = "comeonin"; - version = "5.3.2"; + version = "5.3.3"; src = fetchHex { - pkg = "${name}"; + pkg = "comeonin"; version = "${version}"; - sha256 = "012zr4s7b5bipng6yszqxkqr1lcv7imf8gyvxad56jachh1396fh"; + sha256 = "3e38c9c2cb080828116597ca8807bb482618a315bfafd98c90bc22a821cc84df"; }; beamDeps = []; @@ -169,9 +169,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "concurrent_limiter"; version = "${version}"; - sha256 = "1sqnb987qwwy4ip7kxh9g7vv5wz61fpv3pbnxpbv9yy073r8z5jk"; + sha256 = "53968ff238c0fbb4d7ed76ddb1af0be6f3b2f77909f6796e249e737c505a16eb"; }; beamDeps = [ telemetry ]; @@ -182,9 +182,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "connection"; version = "${version}"; - sha256 = "1746n8ba11amp1xhwzp38yfii2h051za8ndxlwdykyqqljq1wb3j"; + sha256 = "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"; }; beamDeps = []; @@ -195,9 +195,9 @@ let version = "2.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "cors_plug"; version = "${version}"; - sha256 = "1sls8rns2k48qrga0ngysbn9aknapmn3xfn28by1gqbcir0y2jpf"; + sha256 = "ee4ae1418e6ce117fc42c2ba3e6cbdca4e95ecd2fe59a05ec6884ca16d469aea"; }; beamDeps = [ plug ]; @@ -205,12 +205,12 @@ let covertool = buildRebar3 rec { name = "covertool"; - version = "2.0.4"; + version = "2.0.6"; src = fetchHex { - pkg = "${name}"; + pkg = "covertool"; version = "${version}"; - sha256 = "1p0c1n3nl4063xwi1sv176l1x68xqf07qwvj444a5z888fx6i5aw"; + sha256 = "5db3fcd82180d8ea4ad857d4d1ab21a8d31b5aee0d60d2f6c0f9e25a411d1e21"; }; beamDeps = []; @@ -218,12 +218,12 @@ let cowboy = buildErlangMk rec { name = "cowboy"; - version = "2.9.0"; + version = "2.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy"; version = "${version}"; - sha256 = "1phv0a1zbgk7imfgcm0dlacm7hbjcdygb0pqmx4s26jf9f9rywic"; + sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"; }; beamDeps = [ cowlib ranch ]; @@ -234,9 +234,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy_telemetry"; version = "${version}"; - sha256 = "1pn90is3k9dq64wbijvzkqb6ldfqvwiqi7ymc8dx6ra5xv0vm63x"; + sha256 = "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"; }; beamDeps = [ cowboy telemetry ]; @@ -244,12 +244,12 @@ let cowlib = buildRebar3 rec { name = "cowlib"; - version = "2.11.0"; + version = "2.12.1"; src = fetchHex { - pkg = "${name}"; + pkg = "cowlib"; version = "${version}"; - sha256 = "1ac6pj3x4vdbsa8hvmbzpdfc4k0v1p102jbd39snai8wnah9sgib"; + sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"; }; beamDeps = []; @@ -257,12 +257,12 @@ let credo = buildMix rec { name = "credo"; - version = "1.6.7"; + version = "1.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "credo"; version = "${version}"; - sha256 = "1lvxzksdrc2lbl0rzrww4q5rmayf37q0phcpz2kyvxq7n2zi1qa1"; + sha256 = "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7"; }; beamDeps = [ bunt file_system jason ]; @@ -273,7 +273,7 @@ let version = "1.1.8"; src = fetchHex { - pkg = "${name}"; + pkg = "crontab"; version = "${version}"; sha256 = "1gkb7ps38j789acj8dw2q7jnhhw43idyvh36fb3i52yjkhli7ra8"; }; @@ -286,9 +286,9 @@ let version = "0.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "custom_base"; version = "${version}"; - sha256 = "0qx47d4w2mxa3rr6mrxdasgk7prxqwd0y9zpjhz61jayrkx1kw4d"; + sha256 = "8df019facc5ec9603e94f7270f1ac73ddf339f56ade76a721eaa57c1493ba463"; }; beamDeps = []; @@ -296,25 +296,25 @@ let db_connection = buildMix rec { name = "db_connection"; - version = "2.4.2"; + version = "2.5.0"; src = fetchHex { - pkg = "${name}"; + pkg = "db_connection"; version = "${version}"; - sha256 = "0s1nx1gi96r8g7x8y7cklz8z823a6llh4fk996i5xxcr3flkrrag"; + sha256 = "c92d5ba26cd69ead1ff7582dbb860adeedfff39774105a4f1c92cbb654b55aa2"; }; - beamDeps = [ connection telemetry ]; + beamDeps = [ telemetry ]; }; decimal = buildMix rec { name = "decimal"; - version = "2.0.0"; + version = "2.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "decimal"; version = "${version}"; - sha256 = "0xzm8hfhn8q02rmg8cpgs68n5jz61wvqg7bxww9i1a6yanf6wril"; + sha256 = "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"; }; beamDeps = []; @@ -325,9 +325,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "deep_merge"; version = "${version}"; - sha256 = "0c2li2a3hxcc05nwvy4kpsal0315yk900kxyybld972b15gqww6f"; + sha256 = "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"; }; beamDeps = []; @@ -338,9 +338,9 @@ let version = "1.4.22"; src = fetchHex { - pkg = "${name}"; + pkg = "earmark"; version = "${version}"; - sha256 = "1yzx2j48cxny7l8ap1jgq2qiz1kiq6q8cwiismvgshjscr2m3bqw"; + sha256 = "1caf5145665a42fd76d5317286b0c171861fb1c04f86ab103dde76868814fdfb"; }; beamDeps = [ earmark_parser ]; @@ -348,12 +348,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.29"; + version = "1.4.32"; src = fetchHex { - pkg = "${name}"; + pkg = "earmark_parser"; version = "${version}"; - sha256 = "00rmqvf3hkxfvkijqd624n0hn1xqims8h211xmm02fdi7qdsy0j9"; + sha256 = "b8b0dd77d60373e77a3d7e8afa598f325e49e8663a51bcc2b88ef41838cca755"; }; beamDeps = []; @@ -364,9 +364,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eblurhash"; version = "${version}"; - sha256 = "0k040pj8hlm8mwy0ra459hk35v9gfsvvgp596nl27q2dj00cl84c"; + sha256 = "8c20ca00904de023a835a9dcb7b7762fed32264c85a80c3cafa85288e405044c"; }; beamDeps = []; @@ -374,12 +374,12 @@ let ecto = buildMix rec { name = "ecto"; - version = "3.9.2"; + version = "3.10.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto"; version = "${version}"; - sha256 = "05cxg8rq6rawmn8ryfks5hj7h9b4k9bxxsn7k8l5b7p0fx8nsii1"; + sha256 = "6a895778f0d7648a4b34b486af59a1c8009041fbdf2b17f1ac215eb829c60235"; }; beamDeps = [ decimal jason telemetry ]; @@ -390,9 +390,9 @@ let version = "1.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_enum"; version = "${version}"; - sha256 = "1r2ffrr020fhfviqn21cv06sd3sp4bf1jra0xrgb3hl1f445rdcg"; + sha256 = "8fb55c087181c2b15eee406519dc22578fa60dd82c088be376d0010172764ee4"; }; beamDeps = [ ecto ecto_sql postgrex ]; @@ -400,12 +400,12 @@ let ecto_psql_extras = buildMix rec { name = "ecto_psql_extras"; - version = "0.7.4"; + version = "0.7.11"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_psql_extras"; version = "${version}"; - sha256 = "1ra9jh2p1jp1hn4g7aynivbrj52y9c20aspmqw6ksbkp3cpv079i"; + sha256 = "def61f1f92d4f40d51c80bbae2157212d6c0a459eb604be446e47369cbd40b23"; }; beamDeps = [ ecto_sql postgrex table_rex ]; @@ -413,12 +413,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.9.0"; + version = "3.10.1"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_sql"; version = "${version}"; - sha256 = "0lv4b45j0bja98q0qhlp97a7zvb0g7x2bgkqr721m2rv0whggwx8"; + sha256 = "f6a25bdbbd695f12c8171eaff0851fa4c8e72eec1e98c7364402dda9ce11c56b"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -429,9 +429,9 @@ let version = "1.0.14"; src = fetchHex { - pkg = "${name}"; + pkg = "eimp"; version = "${version}"; - sha256 = "1dl3xdfd42y389fc3sbssva163jgpy48pni2kqnvjy9027rk64ah"; + sha256 = "501133f3112079b92d9e22da8b88bf4f0e13d4d67ae9c15c42c30bd25ceb83b6"; }; beamDeps = [ p1_utils ]; @@ -439,12 +439,12 @@ let elixir_make = buildMix rec { name = "elixir_make"; - version = "0.6.2"; + version = "0.6.3"; src = fetchHex { - pkg = "${name}"; + pkg = "elixir_make"; version = "${version}"; - sha256 = "1na8agkks1hrwq1lxfj4yd96bvfcs4hk7mbra9z6lli2vanrxr03"; + sha256 = "f5cbd651c5678bcaabdbb7857658ee106b12509cd976c2c2fca99688e1daf716"; }; beamDeps = []; @@ -455,35 +455,22 @@ let version = "0.5.0"; src = fetchHex { - pkg = "${name}"; + pkg = "esbuild"; version = "${version}"; - sha256 = "1rgzjjb0j3m0xz8gs112dydfz7m5brlpfm2qmz7w8qyr6ars10zi"; + sha256 = "f183a0b332d963c4cfaf585477695ea59eef9a6f2204fdd0efa00e099694ffe5"; }; beamDeps = [ castore ]; }; - esshd = buildMix rec { - name = "esshd"; - version = "0.1.1"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "10cryiv674p2mn9gvncl9j3rzgv0523chz9q6sm91lq960g38gnp"; - }; - - beamDeps = []; - }; - eternal = buildMix rec { name = "eternal"; version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eternal"; version = "${version}"; - sha256 = "10p7m6kv2z2c16gw36wgiwnkykss4lfkmm71llxp09ipkhmy77rc"; + sha256 = "2c9fe32b9c3726703ba5e1d43a1d255a4f3f2d8f8f9bc19f094c7cb1a7a9e782"; }; beamDeps = []; @@ -494,9 +481,9 @@ let version = "2.1.9"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_aws"; version = "${version}"; - sha256 = "040dmj94xg3wnk9wplm0myr2q12zad4w1xz1zc0n01y90dkpfv1y"; + sha256 = "3e6c776703c9076001fbe1f7c049535f042cb2afa0d2cbd3b47cbc4e92ac0d10"; }; beamDeps = [ hackney jason sweet_xml ]; @@ -504,12 +491,12 @@ let ex_aws_s3 = buildMix rec { name = "ex_aws_s3"; - version = "2.2.0"; + version = "2.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_aws_s3"; version = "${version}"; - sha256 = "1g91dd4jfmqp9ds8ji5kqlgcm2bk6ajci3mpi0grxqki6dhmq5qm"; + sha256 = "85dda6e27754d94582869d39cba3241d9ea60b6aa4167f9c88e309dc687e56bb"; }; beamDeps = [ ex_aws sweet_xml ]; @@ -520,9 +507,9 @@ let version = "0.2.4"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_const"; version = "${version}"; - sha256 = "0rwppain0bd36krph1as0vxlxb42psc6mlkfi67jp6fc21k39zcn"; + sha256 = "96fd346610cc992b8f896ed26a98be82ac4efb065a0578f334a32d60a3ba9767"; }; beamDeps = []; @@ -530,12 +517,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.24.2"; + version = "0.29.4"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_doc"; version = "${version}"; - sha256 = "1nmpdxydbc1khcayab98gfv7km2qrqmgp1s64kjdkf11x3cy2d71"; + sha256 = "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -546,9 +533,9 @@ let version = "2.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_machina"; version = "${version}"; - sha256 = "1y2v4j1zg1ji8q8di0fxpc3z3n2jmbnc85d6hx68j4fykfisg6j1"; + sha256 = "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"; }; beamDeps = [ ecto ecto_sql ]; @@ -559,22 +546,35 @@ let version = "1.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_syslogger"; version = "${version}"; - sha256 = "16c376cvw0bcjz8a6gs3nhmg037i894gl5kgxi8jdinv6r0sp7xb"; + sha256 = "ab9fab4136dbc62651ec6f16fa4842f10cf02ab4433fa3d0976c01be99398399"; }; beamDeps = [ poison syslog ]; }; + expo = buildMix rec { + name = "expo"; + version = "0.4.1"; + + src = fetchHex { + pkg = "expo"; + version = "${version}"; + sha256 = "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"; + }; + + beamDeps = []; + }; + fast_html = buildMix rec { name = "fast_html"; version = "2.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_html"; version = "${version}"; - sha256 = "01k51qri44535b1hwixlxk7151vph6vapswlfq918g245544ypv0"; + sha256 = "605f4f4829443c14127694ebabb681778712ceecb4470ec32aa31012330e6506"; }; beamDeps = [ elixir_make nimble_pool ]; @@ -582,12 +582,12 @@ let fast_sanitize = buildMix rec { name = "fast_sanitize"; - version = "0.2.2"; + version = "0.2.3"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_sanitize"; version = "${version}"; - sha256 = "0rj4x64rl7pspagp30dhw9yzal4q2c8937am1m5akbshjbdh9wk9"; + sha256 = "e8ad286d10d0386e15d67d0ee125245ebcfbc7d7290b08712ba9013c8c5e56e2"; }; beamDeps = [ fast_html plug ]; @@ -598,9 +598,9 @@ let version = "0.2.10"; src = fetchHex { - pkg = "${name}"; + pkg = "file_system"; version = "${version}"; - sha256 = "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"; + sha256 = "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"; }; beamDeps = []; @@ -611,9 +611,9 @@ let version = "0.10.2"; src = fetchHex { - pkg = "${name}"; + pkg = "finch"; version = "${version}"; - sha256 = "0l3mvf0jnh49rj58vj1051fvsj6294wjhlh8ycpfqb07har132yx"; + sha256 = "dd8b11b282072cec2ef30852283949c248bd5d2820c88d8acc89402b81db7550"; }; beamDeps = [ castore mint nimble_options nimble_pool telemetry ]; @@ -624,9 +624,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "flake_id"; version = "${version}"; - sha256 = "09yq3dlqqrb7v4ysblwpz1al0q5qcmryldkwq1kx5b71zn881z1i"; + sha256 = "31fc8090fde1acd267c07c36ea7365b8604055f897d3a53dd967658c691bd827"; }; beamDeps = [ base62 ecto ]; @@ -634,15 +634,15 @@ let floki = buildMix rec { name = "floki"; - version = "0.30.1"; + version = "0.34.3"; src = fetchHex { - pkg = "${name}"; + pkg = "floki"; version = "${version}"; - sha256 = "1f3b2wd1pmsgkl8np13pwgp57161p0wxfwnnrjzlq73x8hj3bh79"; + sha256 = "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341"; }; - beamDeps = [ html_entities ]; + beamDeps = []; }; gen_smtp = buildRebar3 rec { @@ -650,22 +650,35 @@ let version = "0.15.0"; src = fetchHex { - pkg = "${name}"; + pkg = "gen_smtp"; version = "${version}"; - sha256 = "03s40l97j6z4mx6a84cbl9w94v3dvfw4f97dqx4hi61hh2l19g99"; + sha256 = "29bd14a88030980849c7ed2447b8db6d6c9278a28b11a44cafe41b791205440f"; }; beamDeps = []; }; + gettext = buildMix rec { + name = "gettext"; + version = "0.22.2"; + + src = fetchHex { + pkg = "gettext"; + version = "${version}"; + sha256 = "8a2d389673aea82d7eae387e6a2ccc12660610080ae7beb19452cfdc1ec30f60"; + }; + + beamDeps = [ expo ]; + }; + gun = buildRebar3 rec { name = "gun"; - version = "2.0.0-rc.2"; + version = "2.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "gun"; version = "${version}"; - sha256 = "1z2lsbbpl2925z8x2ri0rhp30ccn9d08pgqd2hkxf4342jp1x7bb"; + sha256 = "a10bc8d6096b9502205022334f719cc9a08d9adcfbfc0dbee9ef31b56274a20b"; }; beamDeps = [ cowlib ]; @@ -676,9 +689,9 @@ let version = "1.18.1"; src = fetchHex { - pkg = "${name}"; + pkg = "hackney"; version = "${version}"; - sha256 = "13hja14kig5jnzcizpdghj68i88f0yd9wjdfjic9nzi98kzxmv54"; + sha256 = "a4ecdaff44297e9b5894ae499e9a070ea1888c84afdd1fd9b7b2bc384950128e"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; @@ -689,9 +702,9 @@ let version = "0.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "hpax"; version = "${version}"; - sha256 = "04wci9ifsfyd2pbcrnpgh2aq0a8fi1lpkrzb91kz3x93b8yq91rc"; + sha256 = "2c87843d5a23f5f16748ebe77969880e29809580efdaccd615cd3bed628a8c13"; }; beamDeps = []; @@ -702,9 +715,9 @@ let version = "0.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "html_entities"; version = "${version}"; - sha256 = "1k7xyj0q38ms3n5hbn782pa6w1vgd6biwlxr4db6319l828a6fy5"; + sha256 = "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"; }; beamDeps = []; @@ -715,9 +728,9 @@ let version = "0.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "http_signatures"; version = "${version}"; - sha256 = "18s2b5383xl2qjijkxag4mvwk2p5kv2fw58c9ii7pk12fc08lfyc"; + sha256 = "cc3b8a007322cc7b624c0c15eec49ee58ac977254ff529a3c482f681465942a3"; }; beamDeps = []; @@ -725,12 +738,12 @@ let httpoison = buildMix rec { name = "httpoison"; - version = "1.8.0"; + version = "1.8.2"; src = fetchHex { - pkg = "${name}"; + pkg = "httpoison"; version = "${version}"; - sha256 = "0fiwkdrbj7mmz449skp7laz2jdwsqn3svddncmicd46gk2m9w218"; + sha256 = "2bb350d26972e30c96e2ca74a1aaf8293d61d0742ff17f01e0279fef11599921"; }; beamDeps = [ hackney ]; @@ -741,9 +754,9 @@ let version = "6.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "idna"; version = "${version}"; - sha256 = "1sjcjibl34sprpf1dgdmzfww24xlyy34lpj7mhcys4j4i6vnwdwj"; + sha256 = "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"; }; beamDeps = [ unicode_util_compat ]; @@ -754,9 +767,9 @@ let version = "1.0.4"; src = fetchHex { - pkg = "${name}"; + pkg = "inet_cidr"; version = "${version}"; - sha256 = "1g61i08cizr99ivy050lv8fmvnwia9zmipfvlwff8jkhi40x78k4"; + sha256 = "64a2d30189704ae41ca7dbdd587f5291db5d1dda1414e0774c29ffc81088c1bc"; }; beamDeps = []; @@ -767,9 +780,9 @@ let version = "1.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "jason"; version = "${version}"; - sha256 = "0891p2yrg3ri04p302cxfww3fi16pvvw1kh4r91zg85jhl87k8vr"; + sha256 = "79a3791085b2a0f743ca04cec0f7be26443738779d09302e01318f97bdb82121"; }; beamDeps = [ decimal ]; @@ -777,12 +790,12 @@ let joken = buildMix rec { name = "joken"; - version = "2.3.0"; + version = "2.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "joken"; version = "${version}"; - sha256 = "07mwnzzb9slhzqjmd0nbs4dyjkbb3v06km82mhvdbi8fkjkn7cjp"; + sha256 = "5a95b05a71cd0b54abd35378aeb1d487a23a52c324fa7efdffc512b655b5aaa7"; }; beamDeps = [ jose ]; @@ -790,12 +803,12 @@ let jose = buildMix rec { name = "jose"; - version = "1.11.1"; + version = "1.11.5"; src = fetchHex { - pkg = "${name}"; + pkg = "jose"; version = "${version}"; - sha256 = "1i8szzpmiqc7xdv0lp38ng9fild7c5182b4pzkx4qbydnfgnr3q7"; + sha256 = "dcd3b215bafe02ea7c5b23dafd3eb8062a5cd8f2d904fd9caa323d37034ab384"; }; beamDeps = []; @@ -806,9 +819,9 @@ let version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "jumper"; version = "${version}"; - sha256 = "0cvlbfkapkvbwaijmjq3cxg5m6yv4rh69wvss9kfj862i83mk31i"; + sha256 = "318c59078ac220e966d27af3646026db9b5a5e6703cb2aa3e26bcfaba65b7433"; }; beamDeps = []; @@ -819,9 +832,9 @@ let version = "0.5.3"; src = fetchHex { - pkg = "${name}"; + pkg = "linkify"; version = "${version}"; - sha256 = "0xw14ls480jzha9fx4lxd40dff4xx82w1h87dr82az6lfw9mmwry"; + sha256 = "3ef35a1377d47c25506e07c1c005ea9d38d700699d92ee92825f024434258177"; }; beamDeps = []; @@ -832,9 +845,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "majic"; version = "${version}"; - sha256 = "17hab8kmqc6gsiqicfgsaik0rvmakb6mbshlbxllj3b5fs7qa1br"; + sha256 = "7905858f76650d49695f14ea55cd9aaaee0c6654fa391671d4cf305c275a0a9e"; }; beamDeps = [ elixir_make mime nimble_pool plug ]; @@ -845,9 +858,9 @@ let version = "1.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup"; version = "${version}"; - sha256 = "1a9cp9zp85yfybhdxapi9haa1yykzq91bw8abmk0qp1z5p05i8fg"; + sha256 = "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"; }; beamDeps = [ nimble_parsec ]; @@ -858,9 +871,9 @@ let version = "0.14.1"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_elixir"; version = "${version}"; - sha256 = "04fyrd0fcyfvv4i3ngm3gbykhfrp9z6l2p1bhgg9xv7ah0d8nhzj"; + sha256 = "f2438b1a80eaec9ede832b5c41cd4f373b38fd7aa33e3b22d9db79e640cbde11"; }; beamDeps = [ makeup ]; @@ -868,12 +881,12 @@ let makeup_erlang = buildMix rec { name = "makeup_erlang"; - version = "0.1.1"; + version = "0.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_erlang"; version = "${version}"; - sha256 = "1fvw0zr7vqd94vlj62xbqh0yrih1f7wwnmlj62rz0klax44hhk8p"; + sha256 = "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"; }; beamDeps = [ makeup ]; @@ -884,9 +897,9 @@ let version = "0.9.2"; src = fetchHex { - pkg = "${name}"; + pkg = "meck"; version = "${version}"; - sha256 = "09jq0jrsd3dwzjlnwqjv6m9r2rijgiv57yja6jl41p2p2db4yd41"; + sha256 = "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"; }; beamDeps = []; @@ -897,9 +910,9 @@ let version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "metrics"; version = "${version}"; - sha256 = "05lz15piphyhvvm3d1ldjyw0zsrvz50d2m5f2q3s8x2gvkfrmc39"; + sha256 = "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"; }; beamDeps = []; @@ -910,9 +923,9 @@ let version = "1.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mime"; version = "${version}"; - sha256 = "19qrpnmaf3w8bblvkv6z5g82hzd10rhc7bqxvqyi88c37xhsi89i"; + sha256 = "31a1a8613f8321143dde1dafc36006a17d28d02bdfecb9e95a880fa7aabd19a7"; }; beamDeps = []; @@ -923,9 +936,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mimerl"; version = "${version}"; - sha256 = "08wkw73dy449n68ssrkz57gikfzqk3vfnf264s31jn5aa1b5hy7j"; + sha256 = "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"; }; beamDeps = []; @@ -933,12 +946,12 @@ let mint = buildMix rec { name = "mint"; - version = "1.4.2"; + version = "1.5.1"; src = fetchHex { - pkg = "${name}"; + pkg = "mint"; version = "${version}"; - sha256 = "106x9nmzi4ji5cqaddn76pxiyxdihk12z2qgszcdgd2rrjxsaxff"; + sha256 = "4a63e1e76a7c3956abd2c72f370a0d0aecddc3976dea5c27eccbecfa5e7d5b1e"; }; beamDeps = [ castore hpax ]; @@ -949,7 +962,7 @@ let version = "2.18.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mochiweb"; version = "${version}"; sha256 = "16j8cfn3hq0g474xc5xl8nk2v46hwvwpfwi9rkzavnsbaqg2ngmr"; }; @@ -959,12 +972,12 @@ let mock = buildMix rec { name = "mock"; - version = "0.3.7"; + version = "0.3.8"; src = fetchHex { - pkg = "${name}"; + pkg = "mock"; version = "${version}"; - sha256 = "0p3yrx049fdw88kjidngd2lkwqkkyck5r51ng2dxj7z41539m92d"; + sha256 = "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"; }; beamDeps = [ meck ]; @@ -972,12 +985,12 @@ let mogrify = buildMix rec { name = "mogrify"; - version = "0.9.1"; + version = "0.9.3"; src = fetchHex { - pkg = "${name}"; + pkg = "mogrify"; version = "${version}"; - sha256 = "01bzbfd0c932acnla5s3b5f9gvyyiwi0rgs815f15lipjccdykhk"; + sha256 = "0189b1e1de27455f2b9ae8cf88239cefd23d38de9276eb5add7159aea51731e6"; }; beamDeps = []; @@ -985,12 +998,12 @@ let mox = buildMix rec { name = "mox"; - version = "1.0.0"; + version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "mox"; version = "${version}"; - sha256 = "1pzlqq9y4i9i7d0dm8ah2c5a7y2h9649gkz9hfqamnmbnwh0l6r0"; + sha256 = "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2"; }; beamDeps = []; @@ -1001,9 +1014,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_options"; version = "${version}"; - sha256 = "0bd0pi3sij9vxhiilv25x6n3jls75g3b38rljvm1x896ycd1qw76"; + sha256 = "e6701c1af326a11eea9634a3b1c62b475339ace9456c1a23ec3bc9a847bca02d"; }; beamDeps = []; @@ -1011,12 +1024,12 @@ let nimble_parsec = buildMix rec { name = "nimble_parsec"; - version = "0.5.0"; + version = "0.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_parsec"; version = "${version}"; - sha256 = "1cx9p22kkywkg40yqy9xswy4ighdw7i8cc9x1481pzy1d620n12w"; + sha256 = "27eac315a94909d4dc68bc07a4a83e06c8379237c5ea528a9acff4ca1c873c52"; }; beamDeps = []; @@ -1027,9 +1040,9 @@ let version = "0.2.6"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_pool"; version = "${version}"; - sha256 = "0gv59waa505mz2gi956sj1aa6844c65w2dp2qh2jfgsx15am0w8w"; + sha256 = "1c715055095d3f2705c4e236c18b618420a35490da94149ff8b580a2144f653f"; }; beamDeps = []; @@ -1037,12 +1050,12 @@ let oban = buildMix rec { name = "oban"; - version = "2.13.4"; + version = "2.13.6"; src = fetchHex { - pkg = "${name}"; + pkg = "oban"; version = "${version}"; - sha256 = "097isyz3mlix1qkazsgbhgvx6sp02rvs2xdviy9dgqh9nj16zlm7"; + sha256 = "3c1c5eb16f377b3cbbf2ea14be24d20e3d91285af9d1ac86260b7c2af5464887"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1050,12 +1063,12 @@ let open_api_spex = buildMix rec { name = "open_api_spex"; - version = "3.10.0"; + version = "3.17.3"; src = fetchHex { - pkg = "${name}"; + pkg = "open_api_spex"; version = "${version}"; - sha256 = "0rc7q857b8zb9vc4c699arjihca353rzm3bfjc31z0ib7pg2pfrd"; + sha256 = "165db21a85ca83cffc8e7c8890f35b354eddda8255de7404a2848ed652b9f0fe"; }; beamDeps = [ jason plug poison ]; @@ -1066,9 +1079,9 @@ let version = "3.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "parse_trans"; version = "${version}"; - sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87"; + sha256 = "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"; }; beamDeps = []; @@ -1079,9 +1092,9 @@ let version = "1.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "pbkdf2_elixir"; version = "${version}"; - sha256 = "07s862m4y74fyv9gwdhrhx04rvpfrwgqkjlyy51b9w1h8r50md6k"; + sha256 = "d3b40a4a4630f0b442f19eca891fcfeeee4c40871936fed2f68e1c4faa30481f"; }; beamDeps = [ comeonin ]; @@ -1089,12 +1102,12 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.6.15"; + version = "1.6.16"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix"; version = "${version}"; - sha256 = "0wh6s8id3b4c4hgiawq995p192wxsws4sr4bm1g7b55kyvxvj2np"; + sha256 = "e15989ff34f670a96b95ef6d1d25bad0d9c50df5df40b671d8f4a669e050ac39"; }; beamDeps = [ castore jason phoenix_pubsub phoenix_view plug plug_cowboy plug_crypto telemetry ]; @@ -1102,12 +1115,12 @@ let phoenix_ecto = buildMix rec { name = "phoenix_ecto"; - version = "4.4.0"; + version = "4.4.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_ecto"; version = "${version}"; - sha256 = "1h9wnjmxns8y8dsr0r41ks66gscaqm7ivk4gsh5y07nkiralx1h9"; + sha256 = "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"; }; beamDeps = [ ecto phoenix_html plug ]; @@ -1115,12 +1128,12 @@ let phoenix_html = buildMix rec { name = "phoenix_html"; - version = "3.2.0"; + version = "3.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_html"; version = "${version}"; - sha256 = "0ky5idgid1psz6hmh2b2kmj6n974axww74hrxwv02p6jasx9gv1n"; + sha256 = "bed1906edd4906a15fd7b412b85b05e521e1f67c9a85418c55999277e553d0d3"; }; beamDeps = [ plug ]; @@ -1128,12 +1141,12 @@ let phoenix_live_dashboard = buildMix rec { name = "phoenix_live_dashboard"; - version = "0.6.2"; + version = "0.6.5"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_dashboard"; version = "${version}"; - sha256 = "0ywfqndxhjwx0pxv381p2rj5xzbaxvy248s41c1bba1ciarwdijv"; + sha256 = "ef4fa50dd78364409039c99cf6f98ab5209b4c5f8796c17f4db118324f0db852"; }; beamDeps = [ ecto ecto_psql_extras mime phoenix_live_view telemetry_metrics ]; @@ -1144,9 +1157,9 @@ let version = "1.3.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_reload"; version = "${version}"; - sha256 = "1b5blinpmzdgspgk0dsy01bfjwwnhikb1gfiwnx8smazdrkrcrvn"; + sha256 = "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"; }; beamDeps = [ file_system phoenix ]; @@ -1154,12 +1167,12 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.17.5"; + version = "0.17.14"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "1qxhb1lw68vkz6h7q6ki0502pklfxgsx8sf72j11pxsd7mm6wn65"; + sha256 = "afeb6ba43ce329a6f7fc1c9acdfc6d3039995345f025febb7f409a92f6faebd3"; }; beamDeps = [ jason phoenix phoenix_html telemetry ]; @@ -1167,12 +1180,12 @@ let phoenix_pubsub = buildMix rec { name = "phoenix_pubsub"; - version = "2.1.1"; + version = "2.1.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_pubsub"; version = "${version}"; - sha256 = "1nfqrmbrq45if9pgk6g6vqiply2sxc40is3bfanphn7a3rnpqdl1"; + sha256 = "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"; }; beamDeps = []; @@ -1180,12 +1193,12 @@ let phoenix_swoosh = buildMix rec { name = "phoenix_swoosh"; - version = "1.1.0"; + version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_swoosh"; version = "${version}"; - sha256 = "0gbwv2ffbxh8afsvdd221lhmpcijjjxls9zkzn060jwszl5g30ma"; + sha256 = "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"; }; beamDeps = [ finch hackney phoenix phoenix_html phoenix_view swoosh ]; @@ -1193,12 +1206,12 @@ let phoenix_template = buildMix rec { name = "phoenix_template"; - version = "1.0.0"; + version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_template"; version = "${version}"; - sha256 = "0ms39n5s6kh532s20yxzj7sh0rz5lslh09ibq5j21lkglacny1hv"; + sha256 = "157dc078f6226334c91cb32c1865bf3911686f8bcd6bcff86736f6253e6993ee"; }; beamDeps = [ phoenix_html ]; @@ -1206,12 +1219,12 @@ let phoenix_view = buildMix rec { name = "phoenix_view"; - version = "2.0.1"; + version = "2.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_view"; version = "${version}"; - sha256 = "1xm6p2r0rmspqax83s6rzqwx5gvbamy8cjwi533l3wy5xwn8wdbc"; + sha256 = "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"; }; beamDeps = [ phoenix_html phoenix_template ]; @@ -1219,12 +1232,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.10.4"; + version = "1.14.2"; src = fetchHex { - pkg = "${name}"; + pkg = "plug"; version = "${version}"; - sha256 = "1874ixvvjklg0hnxr6d990qzarvvfxhd4s35c5bfqbixwwzj67md"; + sha256 = "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1232,12 +1245,12 @@ let plug_cowboy = buildMix rec { name = "plug_cowboy"; - version = "2.6.0"; + version = "2.6.1"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_cowboy"; version = "${version}"; - sha256 = "19jgv5dm53hv5aqgxxzr3fnrpgfll9ics199swp6iriwfl5z4g07"; + sha256 = "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"; }; beamDeps = [ cowboy cowboy_telemetry plug ]; @@ -1245,12 +1258,12 @@ let plug_crypto = buildMix rec { name = "plug_crypto"; - version = "1.2.3"; + version = "1.2.5"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_crypto"; version = "${version}"; - sha256 = "18plj2idhp3f0nmqyjjf2rzj849l3br0797m8ln20p5dqscj0rxm"; + sha256 = "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"; }; beamDeps = []; @@ -1261,9 +1274,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_static_index_html"; version = "${version}"; - sha256 = "1kxm1flxw3rnsj5jj24c2p23wq1wyblbl32n4rf6046i6k7lzzbr"; + sha256 = "79fd4fcf34d110605c26560cbae8f23c603ec4158c08298bd4360fdea90bb5cf"; }; beamDeps = [ plug ]; @@ -1274,9 +1287,9 @@ let version = "3.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "poison"; version = "${version}"; - sha256 = "1kng8xadrs03i77irxvdk9vfncrqzncmgxc5gc8y8gkknw76dj7y"; + sha256 = "fec8660eb7733ee4117b85f55799fd3833eb769a6df71ccf8903e8dc5447cfce"; }; beamDeps = []; @@ -1287,9 +1300,9 @@ let version = "1.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "poolboy"; version = "${version}"; - sha256 = "1qq116314418jp4skxg8c6jx29fwp688a738lgaz6h2lrq29gmys"; + sha256 = "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"; }; beamDeps = []; @@ -1297,25 +1310,25 @@ let postgrex = buildMix rec { name = "postgrex"; - version = "0.16.5"; + version = "0.17.1"; src = fetchHex { - pkg = "${name}"; + pkg = "postgrex"; version = "${version}"; - sha256 = "1s5jbwfzsdsyvlwgx3bqlfwilj2c468wi3qxq0c2d23fvhwxdspd"; + sha256 = "14b057b488e73be2beee508fb1955d8db90d6485c6466428fe9ccf1d6692a555"; }; - beamDeps = [ connection db_connection decimal jason ]; + beamDeps = [ db_connection decimal jason ]; }; pot = buildRebar3 rec { name = "pot"; - version = "1.0.1"; + version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "pot"; version = "${version}"; - sha256 = "0vgvpiwiy1gm2npfm3qdybwvg39jllw13aig8ll1bn9icnbzb1zd"; + sha256 = "78fe127f5a4f5f919d6ea5a2a671827bd53eb9d37e5b4128c0ad3df99856c2e0"; }; beamDeps = []; @@ -1326,9 +1339,9 @@ let version = "1.7.1"; src = fetchHex { - pkg = "${name}"; + pkg = "prom_ex"; version = "${version}"; - sha256 = "027dlv89wl35wy0lbl7xf7308j42c42ls3ssj8rri4lap1r8i5sc"; + sha256 = "4c978872b88a929833925a0f4d0561824804c671fdd04581e765509ed0a6ed08"; }; beamDeps = [ ecto finch jason oban phoenix phoenix_live_view plug plug_cowboy telemetry telemetry_metrics telemetry_metrics_prometheus_core telemetry_poller ]; @@ -1336,15 +1349,15 @@ let prometheus = buildMix rec { name = "prometheus"; - version = "4.8.0"; + version = "4.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "prometheus"; version = "${version}"; - sha256 = "1dgwd8wxw2cifwmsmjvkbgr1n686n125ssm4b0vxngh70dqy3hhg"; + sha256 = "2a99bb6dce85e238c7236fde6b0064f9834dc420ddbd962aac4ea2a3c3d59384"; }; - beamDeps = []; + beamDeps = [ quantile_estimator ]; }; prometheus_ecto = buildMix rec { @@ -1352,9 +1365,9 @@ let version = "1.4.3"; src = fetchHex { - pkg = "${name}"; + pkg = "prometheus_ecto"; version = "${version}"; - sha256 = "10pd5cmm6m62xwlfp7al8yj62zn181rjizc1v9zb64zrfygjhrld"; + sha256 = "8d66289f77f913b37eda81fd287340c17e61a447549deb28efc254532b2bed82"; }; beamDeps = [ ecto prometheus_ex ]; @@ -1365,9 +1378,9 @@ let version = "1.3.0"; src = fetchHex { - pkg = "${name}"; + pkg = "prometheus_phoenix"; version = "${version}"; - sha256 = "0xccdidbzffgy2mpy18p017ijcgav2kv47b0v9ixklz9qi541lf4"; + sha256 = "c4d1404ac4e9d3d963da601db2a7d8ea31194f0017057fabf0cfb9bf5a6c8c75"; }; beamDeps = [ phoenix prometheus_ex ]; @@ -1378,22 +1391,35 @@ let version = "1.1.5"; src = fetchHex { - pkg = "${name}"; + pkg = "prometheus_plugs"; version = "${version}"; - sha256 = "0ybazh6r52vjpf14gjcphsavl3ggk9iapc0rr9wnv4yb7i4acwq2"; + sha256 = "0273a6483ccb936d79ca19b0ab629aef0dba958697c94782bb728b920dfc6a79"; }; beamDeps = [ accept plug prometheus_ex ]; }; + quantile_estimator = buildRebar3 rec { + name = "quantile_estimator"; + version = "0.2.1"; + + src = fetchHex { + pkg = "quantile_estimator"; + version = "${version}"; + sha256 = "282a8a323ca2a845c9e6f787d166348f776c1d4a41ede63046d72d422e3da946"; + }; + + beamDeps = []; + }; + ranch = buildRebar3 rec { name = "ranch"; version = "1.8.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ranch"; version = "${version}"; - sha256 = "1rfz5ld54pkd2w25jadyznia2vb7aw9bclck21fizargd39wzys9"; + sha256 = "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"; }; beamDeps = []; @@ -1401,12 +1427,12 @@ let recon = buildMix rec { name = "recon"; - version = "2.5.1"; + version = "2.5.3"; src = fetchHex { - pkg = "${name}"; + pkg = "recon"; version = "${version}"; - sha256 = "0j26nin8h3zzypppkdxsjiwgjc8jm8n73b6cikvdh8h1snvcc8ap"; + sha256 = "6c6683f46fd4a1dfd98404b9f78dcabc7fcd8826613a89dcb984727a8c3099d7"; }; beamDeps = []; @@ -1414,12 +1440,12 @@ let sleeplocks = buildRebar3 rec { name = "sleeplocks"; - version = "1.1.1"; + version = "1.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "sleeplocks"; version = "${version}"; - sha256 = "1q823i5bisc83pyssgrqkggyxiasm7b8dygzj2r943adzyp3gvl4"; + sha256 = "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"; }; beamDeps = []; @@ -1427,12 +1453,25 @@ let ssl_verify_fun = buildRebar3 rec { name = "ssl_verify_fun"; - version = "1.1.6"; + version = "1.1.7"; src = fetchHex { - pkg = "${name}"; + pkg = "ssl_verify_fun"; version = "${version}"; - sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x"; + sha256 = "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"; + }; + + beamDeps = []; + }; + + statistex = buildMix rec { + name = "statistex"; + version = "1.0.0"; + + src = fetchHex { + pkg = "statistex"; + version = "${version}"; + sha256 = "ff9d8bee7035028ab4742ff52fc80a2aa35cece833cf5319009b52f1b5a86c27"; }; beamDeps = []; @@ -1440,12 +1479,12 @@ let sweet_xml = buildMix rec { name = "sweet_xml"; - version = "0.7.2"; + version = "0.7.3"; src = fetchHex { - pkg = "${name}"; + pkg = "sweet_xml"; version = "${version}"; - sha256 = "1s56f3ak35z2h9gk3g302akhwx7p4lrylichv4s4ai8g2a5fd538"; + sha256 = "e110c867a1b3fe74bfc7dd9893aa851f0eed5518d0d7cad76d7baafd30e4f5ba"; }; beamDeps = []; @@ -1453,12 +1492,12 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.8.2"; + version = "1.10.3"; src = fetchHex { - pkg = "${name}"; + pkg = "swoosh"; version = "${version}"; - sha256 = "1nxpcwq7ynvqjp65z544dvdfw7jx9k0m58w4kb0bdbdg1rsvln6h"; + sha256 = "8b7167d93047bac6e1a1c367bf7d899cf2e4fea0592ee04a70673548ef6091b9"; }; beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mime plug_cowboy telemetry ]; @@ -1469,9 +1508,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "syslog"; version = "${version}"; - sha256 = "1qarnqappln4xhlr700rhnhfnfvgvv9l3y1ywdxmh83y7hvl2sjc"; + sha256 = "4c6a41373c7e20587be33ef841d3de6f3beba08519809329ecc4d27b15b659e1"; }; beamDeps = []; @@ -1482,9 +1521,9 @@ let version = "3.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "table_rex"; version = "${version}"; - sha256 = "141404hwnwnpspvhs112j2la8dfnvkwr0xy14ff42w6nljmj72k7"; + sha256 = "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"; }; beamDeps = []; @@ -1495,9 +1534,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry"; version = "${version}"; - sha256 = "0yn5mr83hrx0dslsqxmfr5zf0a65hdak6926zd72i85lb7x0kg3k"; + sha256 = "73bc09fa59b4a0284efb4624335583c528e07ec9ae76aca96ea0673850aec57a"; }; beamDeps = []; @@ -1508,9 +1547,9 @@ let version = "0.6.1"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_metrics"; version = "${version}"; - sha256 = "1iilk2n75kn9i95fdp8mpxvn3rcn3ghln7p77cijqws13j3y1sbv"; + sha256 = "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"; }; beamDeps = [ telemetry ]; @@ -1521,9 +1560,9 @@ let version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_metrics_prometheus_core"; version = "${version}"; - sha256 = "0c5pfm0jbri0x7p6cryif0b0h2iy0jqk4hmljz4kh3pqaq6ilda8"; + sha256 = "48351a0d56f80e38c997b44232b1043e0a081670d16766eee920e6254175b730"; }; beamDeps = [ telemetry telemetry_metrics ]; @@ -1534,9 +1573,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_poller"; version = "${version}"; - sha256 = "0vjgxkxn9ll1gc6xd8jh4b0ldmg9l7fsfg7w63d44gvcssplx8mk"; + sha256 = "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"; }; beamDeps = [ telemetry ]; @@ -1547,9 +1586,9 @@ let version = "1.4.4"; src = fetchHex { - pkg = "${name}"; + pkg = "tesla"; version = "${version}"; - sha256 = "0mv48vgby1fv9b2npc0ird3y4isr10np3a3yas3v5hfyz54kll6m"; + sha256 = "d5503a49f9dec1b287567ea8712d085947e247cb11b06bc54adb05bfde466457"; }; beamDeps = [ castore finch gun hackney jason mime mint poison telemetry ]; @@ -1557,12 +1596,12 @@ let timex = buildMix rec { name = "timex"; - version = "3.7.5"; + version = "3.7.7"; src = fetchHex { - pkg = "${name}"; + pkg = "timex"; version = "${version}"; - sha256 = "1r3l50p8f8mxgghh079v1y5g02kzqr15ijbi7mkfzwl0lvf0hmm1"; + sha256 = "0ec4b09f25fe311321f9fc04144a7e3affe48eb29481d7a5583849b6c4dfa0a7"; }; beamDeps = [ combine gettext tzdata ]; @@ -1573,9 +1612,9 @@ let version = "0.0.7"; src = fetchHex { - pkg = "${name}"; + pkg = "trailing_format_plug"; version = "${version}"; - sha256 = "0gv9z8m1kpfs5f5zcsh9m6vr36s88x1xc6g0k6lr7sgk2m6dwkxx"; + sha256 = "bd4fde4c15f3e993a999e019d64347489b91b7a9096af68b2bdadd192afa693f"; }; beamDeps = [ plug ]; @@ -1586,9 +1625,9 @@ let version = "1.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "tzdata"; version = "${version}"; - sha256 = "0nia83zpk0pb4jkpvhkmmgw8i5p6kd6cf776q6aj0pcym6i9llam"; + sha256 = "55519aa2a99e5d2095c1e61cc74c9be69688f8ab75c27da724eb8279ff402a5a"; }; beamDeps = [ hackney ]; @@ -1596,12 +1635,12 @@ let ueberauth = buildMix rec { name = "ueberauth"; - version = "0.6.3"; + version = "0.10.5"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth"; version = "${version}"; - sha256 = "0q0vz7vlbw66a32d7yij3p5l4a59bi0sygiynn8na38ll7c97hmg"; + sha256 = "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"; }; beamDeps = [ plug ]; @@ -1612,9 +1651,9 @@ let version = "0.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "unicode_util_compat"; version = "${version}"; - sha256 = "08952lw8cjdw8w171lv8wqbrxc4rcmb3jhkrdb7n06gngpbfdvi5"; + sha256 = "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"; }; beamDeps = []; @@ -1625,9 +1664,9 @@ let version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "unsafe"; version = "${version}"; - sha256 = "1rahpgz1lsd66r7ycns1ryz2qymamz1anrlps986900lsai2jxvc"; + sha256 = "6c7729a2d214806450d29766abc2afaa7a2cbecf415be64f36a6691afebb50e5"; }; beamDeps = []; @@ -1638,9 +1677,9 @@ let version = "0.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "web_push_encryption"; version = "${version}"; - sha256 = "18p2f1gqkg209vf3nychjxy7xpxhgiwyhn4halvr7yr2fvjv50jg"; + sha256 = "4f82b2e57622fb9337559058e8797cb0df7e7c9790793bdc4e40bc895f70e2a2"; }; beamDeps = [ httpoison jose ]; @@ -1651,9 +1690,9 @@ let version = "0.4.3"; src = fetchHex { - pkg = "${name}"; + pkg = "websockex"; version = "${version}"; - sha256 = "1r2kmi2pcmdzvgbd08ci9avy0g5p2lhx80jn736a98w55c3ygwlm"; + sha256 = "95f2e7072b85a3a4cc385602d42115b73ce0b74a9121d0d6dbbf557645ac53e4"; }; beamDeps = []; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index a41de7bebc8..d7ff34951c8 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sozu"; - version = "0.15.6"; + version = "0.15.13"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = pname; rev = version; - hash = "sha256-8JvSVqU8JSf7VrHYxKTZWsX59gMW7eRg4WHrvemhUNU="; + hash = "sha256-egxeKwIgjpzF19ZunK9o2F/pjHWP8wva4KhGreXvR1w="; }; - cargoHash = "sha256-f4tteNovor8/YS71SbpD0GlHXEHfLmZmOLxn8impRj8="; + cargoHash = "sha256-q61HLKsF6h9/JPmggXHrCHXiFLYnWHtKayC/O0BAtA8="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6bf881d5281..427a394873f 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -344,17 +344,6 @@ let }; mkPackages = self: { - # TODO: remove ahead of 23.11 branchoff - # "PostgreSQL 11 will stop receiving fixes on November 9, 2023" - postgresql_11 = self.callPackage generic { - version = "11.21"; - psqlSchema = "11.1"; # should be 11, but changing it is invasive - hash = "sha256-B7CDdHHV3XeyUWazRxjzuhCBa2rWHmkeb8VHzz/P+FA="; - this = self.postgresql_11; - thisAttr = "postgresql_11"; - inherit self; - }; - postgresql_12 = self.callPackage generic { version = "12.16"; psqlSchema = "12"; diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index c0de0c30d5a..3a1c1c8388b 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -6,7 +6,6 @@ let "14" = "sha256-w93Q499sZRk4q85A9yqKQjGUd9Pl8UL8K1D3W7mHRTU="; "13" = "sha256-Sot7FR0oW7kWA680pNCMCmlflu4RfJTSWZn9mrXrpzw="; "12" = "sha256-XezcXoHHLCD1/2OHmKhxome2pdjOsYAfZlpvOoU3aS4="; - "11" = "sha256-ZkNAIMO69BxF3knQ+jcUBVuDgcoZXZccF5O+acpZ81M="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix new file mode 100644 index 00000000000..a39dcd53727 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, postgresql }: + +stdenv.mkDerivation rec { + pname = "pg_embedding"; + version = "0.3.6"; + + src = fetchFromGitHub { + owner = "neondatabase"; + repo = pname; + rev = version; + hash = "sha256-NTBxsQB8mR7e/CWwkCEyDiYhi3Nxl/aKgRBwqc0THcI="; + }; + + buildInputs = [ postgresql ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + meta = with lib; { + description = "PostgreSQL extension implementing the HNSW algorithm for vector similarity search"; + homepage = "https://github.com/neondatabase/pg_embedding"; + maintainers = with maintainers; [ ivan ]; + platforms = postgresql.meta.platforms; + license = licenses.asl20; + broken = versionOlder postgresql.version "12"; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index d0cf1193fb5..afc5b9fe650 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -22,10 +22,6 @@ let version = "1.3.9"; hash = "sha256-64/dlm6e4flCxMQ8efsxfKSlja+Tko0zsghTgLatN+Y="; }; - "11" = { - version = "1.3.9"; - hash = "sha256-8t/HhB/2Kjx4xMItmmKv3g9gba5VCBHdplYtYD/3UhA="; - }; }.${lib.versions.major postgresql.version} or (throw "Source for pg_hint_plan is not available for ${postgresql.version}"); in stdenv.mkDerivation { diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 188451f1b88..f4c03d611f5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -22,10 +22,6 @@ let version = "1.4.3"; hash = "sha256-c8/xUFIHalu2bMCs57DeylK0oW0VnQwmUCpdp+tYqk4="; }; - "11" = { - version = "1.3.4"; - hash = "sha256-UEnwD36ejeYWyKRHZ4mPt6/Ru76Gy8s/rgIvmgermiM="; - }; }.${lib.versions.major postgresql.version} or (throw "Source for pgaudit is not available for ${postgresql.version}"); in stdenv.mkDerivation { diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix deleted file mode 100644 index 6403138fd70..00000000000 --- a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, zeromq, openssl, libsodium, libkrb5 }: - -stdenv.mkDerivation rec { - pname = "pipelinedb"; - version = "1.0.0-13"; - - src = fetchFromGitHub { - owner = "pipelinedb"; - repo = pname; - rev = version; - sha256 = "1mnqpvx6g1r2n4kjrrx01vbdx7kvndfsbmm7zbzizjnjlyixz75f"; - }; - - buildInputs = [ postgresql openssl zeromq libsodium libkrb5 ]; - - makeFlags = [ "USE_PGXS=1" ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lsodium"; - - preConfigure = '' - substituteInPlace Makefile \ - --replace "/usr/lib/libzmq.a" "${zeromq}/lib/libzmq.a" - ''; - - installPhase = '' - mkdir -p $out/bin - install -D -t $out/lib/ pipelinedb.so - install -D -t $out/share/postgresql/extension {pipelinedb-*.sql,pipelinedb.control} - ''; - - meta = with lib; { - description = "High-performance time-series aggregation for PostgreSQL"; - homepage = "https://www.pipelinedb.com/"; - license = licenses.asl20; - platforms = postgresql.meta.platforms; - maintainers = [ maintainers.marsam ]; - broken = versions.major postgresql.version != "11"; - }; -} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index d9d9ce8b09d..6685602ec3a 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -18,6 +18,8 @@ self: super: { pg_ed25519 = super.callPackage ./ext/pg_ed25519.nix { }; + pg_embedding = super.callPackage ./ext/pg_embedding.nix { }; + pg_hint_plan = super.callPackage ./ext/pg_hint_plan.nix { }; pg_ivm = super.callPackage ./ext/pg_ivm.nix { }; @@ -56,8 +58,6 @@ self: super: { pgtap = super.callPackage ./ext/pgtap.nix { }; - pipelinedb = super.callPackage ./ext/pipelinedb.nix { }; - smlar = super.callPackage ./ext/smlar.nix { }; temporal_tables = super.callPackage ./ext/temporal_tables.nix { }; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index abdeb97319a..35335e5e587 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute2, procps, shadow, getent }: let - version = "1.50.1"; + version = "1.52.0"; in buildGoModule { pname = "tailscale"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-YosV9zyWbZ18xeiKJ6/4ZzSSfcoACWadZQsqGBD/hZ4="; + hash = "sha256-mvsDM1kOLP/1LbTzmojquEF8HGy6Kb2cqJu7EnxEHPU="; }; - vendorHash = "sha256-aVtlDzC+sbEWlUAzPkAryA/+dqSzoAFc02xikh6yhf8="; + vendorHash = "sha256-WGZkpffwe4I8FewdBHXGaLbKQP/kHr7UF2lCXBTcNb4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index d837b6b2642..9a35bf29bd8 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -1,26 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "tempo"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-23wjD8HTSEGonIMAWCoKORMLIISASxlN4FeY+Bmt/+I="; + hash = "sha256-vqYewQT2alW9HFYRh/Ok3jFt2a+VsfqDypNaT+mngys="; }; - patches = [ - # Backport patch for Go 1.21 compatibility - # FIXME: remove after 2.3.0 - (fetchpatch { - url = "https://github.com/grafana/tempo/commit/0d37e8f0edd8a96876b0a5f5ab97ef79ff04608f.patch"; - hash = "sha256-YC59g5pdcrwJeQ4raS0Oq+fZvRBKFj4johZtGTAYpEs="; - }) - ]; - vendorHash = null; subPackages = [ diff --git a/pkgs/servers/web-apps/livebook/default.nix b/pkgs/servers/web-apps/livebook/default.nix index 511f7b80bc5..dee6017624d 100644 --- a/pkgs/servers/web-apps/livebook/default.nix +++ b/pkgs/servers/web-apps/livebook/default.nix @@ -1,4 +1,4 @@ -{ lib, beamPackages, makeWrapper, rebar3, elixir, erlang, fetchFromGitHub }: +{ lib, beamPackages, makeWrapper, rebar3, elixir, erlang, fetchFromGitHub, nixosTests }: beamPackages.mixRelease rec { pname = "livebook"; version = "0.11.3"; @@ -32,6 +32,10 @@ beamPackages.mixRelease rec { --set MIX_REBAR3 ${rebar3}/bin/rebar3 ''; + passthru.tests = { + livebook-service = nixosTests.livebook-service; + }; + meta = with lib; { license = licenses.asl20; homepage = "https://livebook.dev/"; diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index a93163b560c..1b8ae2e3178 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.33.1"; + version = "1.33.2"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-Rd8PJWKPUriVf3BmHFvhmb+SQskVeqOFdJB8Gsopgnw="; + hash = "sha256-pRY4FOIJwsLSKYieN0D1esKdoUqx62NMFgiYXaXguJ0="; }; - npmDepsHash = "sha256-rEqbwdeIQg6YS7uLeoP2uMbJWsnovIHBVp9CPlTc2NY="; + npmDepsHash = "sha256-9bOFM8Ie0334H2L94ypgkMrB6zyVJ9YTvNnKeBJjOUI="; nativeBuildInputs = [ python3 diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index b94201c96d7..0d50270dafd 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.28.0"; + version = "0.28.2"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-0ubZt4KsjsoIcglo/lh9JDAZjuACBNdVLJazH0Csxl0="; + hash = "sha256-ojcQ69FxU7luxYzKxnblwQgX0sapFJS8YNalMdTuzCo="; }; - vendorHash = "sha256-35Gmye5NPOtUaW8zNkjK0cQ3FRB1fK7UyqT5c17rls4="; + vendorHash = "sha256-jbKF68fPwMigKSoSOP6pJMjn+PW2yeI/oZKv2ytoHuY="; ldflags = [ "-s" diff --git a/pkgs/shells/fish/plugins/bobthefish.nix b/pkgs/shells/fish/plugins/bobthefish.nix index e39f6198534..417ac87257a 100644 --- a/pkgs/shells/fish/plugins/bobthefish.nix +++ b/pkgs/shells/fish/plugins/bobthefish.nix @@ -3,15 +3,15 @@ , fetchFromGitHub , }: -buildFishPlugin rec { +buildFishPlugin { pname = "bobthefish"; - version = "unstable-2022-08-02"; + version = "unstable-2023-06-16"; src = fetchFromGitHub { owner = "oh-my-fish"; repo = "theme-bobthefish"; - rev = "2dcfcab653ae69ae95ab57217fe64c97ae05d8de"; - sha256 = "sha256-jBbm0wTNZ7jSoGFxRkTz96QHpc5ViAw9RGsRBkCQEIU="; + rev = "c2c47dc964a257131b3df2a127c2631b4760f3ec"; + sha256 = "sha256-LB4g+EA3C7OxTuHfcxfgl8IVBe5NufFc+5z9VcS0Bt0="; }; meta = with lib; { diff --git a/pkgs/shells/fish/plugins/bobthefisher.nix b/pkgs/shells/fish/plugins/bobthefisher.nix index 1930890d4de..56d179cd24b 100644 --- a/pkgs/shells/fish/plugins/bobthefisher.nix +++ b/pkgs/shells/fish/plugins/bobthefisher.nix @@ -3,15 +3,15 @@ , fetchFromGitHub , }: -buildFishPlugin rec { +buildFishPlugin { pname = "bobthefisher"; - version = "unstable-2023-03-09"; + version = "unstable-2023-10-25"; src = fetchFromGitHub { owner = "Scrumplex"; repo = "bobthefisher"; - rev = "6528033a2c9ca90611d04b6a4afd2131b9495cdc"; - sha256 = "sha256-UDoSMFKtd6ur10guqJlkpA0YSCBv45FR5QKJqdXZWgw="; + rev = "f4179a14b087c7fbfc2e892da429adad40a39e44"; + sha256 = "sha256-l1DHSZa40BX2/4GCjm5E53UOeFEnMioWbZtCW14WX6k="; }; meta = with lib; { diff --git a/pkgs/shells/zsh/agdsn-zsh-config/default.nix b/pkgs/shells/zsh/agdsn-zsh-config/default.nix index 248cd8e2f0d..6efbb285f29 100644 --- a/pkgs/shells/zsh/agdsn-zsh-config/default.nix +++ b/pkgs/shells/zsh/agdsn-zsh-config/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "agdsn-zsh-config"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "agdsn"; repo = "agdsn-zsh-config"; rev = "v${version}"; - sha256 = "sha256-79bD3YQcpNTKYvEoKu22gqOKvNH7eZPGS/iU+/4IbAU="; + sha256 = "sha256-kbpiA+aI3mXQAanmTyZo2rJNOKX77FKjpVsQywyyq90="; }; dontBuild = true; diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 12c42444f18..70813466882 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -454,8 +454,7 @@ rec { ''; # link all binaries in single derivation - allPackages = with lib; concatLists (catAttrs "pkgs" (filter isAttrs (attrValues texlive))); - binPackages = lib.filter (p: p.tlType == "bin") allPackages; + binPackages = lib.catAttrs "out" (lib.attrValues texlive.pkgs); binaries = buildEnv { name = "texlive-binaries"; paths = binPackages; }; in runCommand "texlive-test-binaries" @@ -565,8 +564,7 @@ rec { # check that all scripts have a Nix shebang shebangs = let - allPackages = with lib; concatLists (catAttrs "pkgs" (filter isAttrs (attrValues texlive))); - binPackages = lib.filter (p: p.tlType == "bin") allPackages; + binPackages = lib.catAttrs "out" (lib.attrValues texlive.pkgs); in runCommand "texlive-test-shebangs" { } ('' @@ -615,7 +613,7 @@ rec { correctLicenses = scheme: builtins.foldl' (acc: pkg: concatLicenses acc (lib.toList (pkg.meta.license or []))) [] - scheme.passthru.packages; + scheme.passthru.requiredTeXPackages; correctLicensesAttrNames = scheme: lib.sort lt (map licenseToAttrName (correctLicenses scheme)); @@ -648,10 +646,13 @@ rec { # this is effectively an eval-time assertion, converted into a derivation for # ease of testing fixedHashes = with lib; let - combine = findFirst (p: (head p.pkgs).pname == "combine") { pkgs = []; } (head texlive.collection-latexextra.pkgs).tlDeps; - all = concatLists (map (p: p.pkgs or []) (attrValues (removeAttrs texlive [ "bin" "combine" "combined" "tlpdb" ]))) ++ combine.pkgs; - fods = filter (p: isDerivation p && p.tlType != "bin") all; - errorText = concatMapStrings (p: optionalString (! p ? outputHash) "${p.pname + optionalString (p.tlType != "run") ("." + p.tlType)} does not have a fixed output hash\n") fods; + fods = lib.concatMap + (p: lib.optional (p ? tex) p.tex + ++ lib.optional (p ? texdoc) p.texdoc + ++ lib.optional (p ? texsource) p.texsource + ++ lib.optional (p ? tlpkg) p.tlpkg) + (attrValues texlive.pkgs); + errorText = concatMapStrings (p: optionalString (! p ? outputHash) "${p.pname}-${p.tlOutputName} does not have a fixed output hash\n") fods; in runCommand "texlive-test-fixed-hashes" { inherit errorText; passAsFile = [ "errorText" ]; diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 2ea53b75d83..485146a6ae2 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.183"; + version = "3.0.184"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-L00vQTuY4m5vGqu09FyOdM/XOIMyLZG/BSj8dktEa40="; + sha256 = "sha256-VqHyTwSSBAWbeWjQc1RU5mWTqIA2CJDcL83ElaS++5E="; }; - vendorHash = "sha256-S8Nthnr3wASvRyZS5UTHILPnUA+FeZJEwIvT0O39U3I="; + vendorHash = "sha256-JrzN9ycc3obxOX8NYM1cQ9AfKKPXffugCsiAxEHVBr0="; subPackages = [ "main" ]; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 87231b2277b..982fc5efa3f 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -5,14 +5,14 @@ }: let - version = "2.53.0"; + version = "2.53.1"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-5c2Z0EJnKyLqWiz8/BEFAdy5A0+sBbai7UQ2KPL1jr8="; + hash = "sha256-++JquLva3ij4NDhXnY7tSQMH4HCtJ8DhZIzE0XguInM="; }; # put packages that needs to be overridden in the py package scope @@ -25,45 +25,35 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { sourceRoot = "${src.name}/src/azure-cli"; - prePatch = '' - substituteInPlace setup.py \ - --replace "chardet~=3.0.4" "chardet" \ - --replace "javaproperties~=0.5.1" "javaproperties" \ - --replace "scp~=0.13.2" "scp" \ - --replace "fabric~=2.4" "fabric" - - # remove namespace hacks - # remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well - sed -i setup.py \ - -e '/urllib3/d' - ''; - nativeBuildInputs = [ installShellFiles ]; propagatedBuildInputs = with py.pkgs; [ + antlr4-python3-runtime + applicationinsights + argcomplete + asn1crypto azure-appconfiguration azure-batch azure-cli-core azure-cli-telemetry + azure-common + azure-core azure-cosmos azure-data-tables azure-datalake-store - azure-functions-devops-build azure-graphrbac - azure-identity - azure-keyvault azure-keyvault-administration - azure-keyvault-keys azure-keyvault-certificates + azure-keyvault-keys azure-keyvault-secrets azure-loganalytics azure-mgmt-advisor azure-mgmt-apimanagement - azure-mgmt-applicationinsights azure-mgmt-appconfiguration azure-mgmt-appcontainers + azure-mgmt-applicationinsights azure-mgmt-authorization azure-mgmt-batch azure-mgmt-batchai @@ -76,12 +66,12 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-containerinstance azure-mgmt-containerregistry azure-mgmt-containerservice + azure-mgmt-core azure-mgmt-cosmosdb azure-mgmt-databoxedge - azure-mgmt-datalake-analytics + azure-mgmt-datalake-nspkg azure-mgmt-datalake-store azure-mgmt-datamigration - azure-mgmt-deploymentmanager azure-mgmt-devtestlabs azure-mgmt-dns azure-mgmt-eventgrid @@ -95,14 +85,13 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-keyvault azure-mgmt-kusto azure-mgmt-loganalytics - azure-mgmt-managedservices azure-mgmt-managementgroups + azure-mgmt-managedservices azure-mgmt-maps azure-mgmt-marketplaceordering azure-mgmt-media azure-mgmt-monitor azure-mgmt-msi - azure-mgmt-network azure-mgmt-netapp azure-mgmt-policyinsights azure-mgmt-privatedns @@ -112,7 +101,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-redhatopenshift azure-mgmt-redis azure-mgmt-relay - azure-mgmt-reservations azure-mgmt-resource azure-mgmt-search azure-mgmt-security @@ -120,51 +108,68 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-servicefabric azure-mgmt-servicefabricmanagedclusters azure-mgmt-servicelinker - azure-mgmt-signalr azure-mgmt-sql + azure-mgmt-signalr azure-mgmt-sqlvirtualmachine azure-mgmt-storage azure-mgmt-synapse azure-mgmt-trafficmanager azure-mgmt-web azure-multiapi-storage - azure-storage-blob + azure-nspkg azure-storage-common + azure-storage-blob azure-synapse-accesscontrol azure-synapse-artifacts azure-synapse-managedprivateendpoints azure-synapse-spark + bcrypt + certifi + cffi chardet colorama cryptography distro fabric - jsmin + humanfriendly + idna + invoke + isodate + javaproperties + jinja2 + jmespath + jsondiff knack - mock + markupsafe + msal-extensions + msal + msrest + msrestazure + oauthlib + packaging paramiko - pydocumentdb + pbr + pkginfo + portalocker + psutil + pycomposefile + pycparser pygithub - pygments + pyjwt pynacl pyopenssl - pytz - pyyaml - psutil + python-dateutil + requests-oauthlib requests scp semver six sshtunnel + tabulate urllib3 - vsts-cd-manager + wcwidth websocket-client xmltodict - javaproperties - jsondiff - # urllib3[secure] - # shell completion - argcomplete ]; postInstall = '' @@ -185,10 +190,12 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { --set PYTHONPATH $PYTHONPATH ''; - # almost the entire test suite requires an azure account setup and networking - # ensure that the azure namespaces are setup correctly and that azure.cli can be accessed - checkPhase = '' - HOME=$TMPDIR $out/bin/az --help > /dev/null + doInstallCheck = true; + installCheckPhase = '' + export HOME=$TMPDIR + + $out/bin/az --version + $out/bin/az self-test ''; # ensure these namespaces are able to be accessed @@ -198,7 +205,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { "azure.cli.telemetry" "azure.cosmos" "azure.datalake.store" - "azure_functions_devops_build" "azure.graphrbac" "azure.keyvault" "azure.loganalytics" @@ -220,10 +226,8 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { "azure.mgmt.containerregistry" "azure.mgmt.containerservice" "azure.mgmt.cosmosdb" - "azure.mgmt.datalake.analytics" "azure.mgmt.datalake.store" "azure.mgmt.datamigration" - "azure.mgmt.deploymentmanager" "azure.mgmt.devtestlabs" "azure.mgmt.dns" "azure.mgmt.eventgrid" @@ -243,7 +247,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { "azure.mgmt.media" "azure.mgmt.monitor" "azure.mgmt.msi" - "azure.mgmt.network" "azure.mgmt.netapp" "azure.mgmt.policyinsights" "azure.mgmt.privatedns" @@ -252,7 +255,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { "azure.mgmt.recoveryservicesbackup" "azure.mgmt.redis" "azure.mgmt.relay" - "azure.mgmt.reservations" "azure.mgmt.resource" "azure.mgmt.search" "azure.mgmt.security" diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index fa7d84e5117..5cbb6a903d6 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -10,8 +10,7 @@ let buildAzureCliPackage = with py.pkgs; buildPythonPackage; overrideAzureMgmtPackage = package: version: extension: hash: - # check to make sure overriding is even necessary - package.overridePythonAttrs (oldAttrs: rec { + package.overridePythonAttrs (oldAttrs: { inherit version; src = fetchPypi { @@ -46,38 +45,25 @@ let sourceRoot = "${src.name}/src/azure-cli-core"; propagatedBuildInputs = with self; [ - adal - antlr4-python3-runtime argcomplete - azure-common azure-cli-telemetry - azure-data-tables - azure-mgmt-appcontainers + azure-common azure-mgmt-core - azure-mgmt-resource - colorama cryptography distro humanfriendly jmespath knack - msal msal-extensions - msrest + msal msrestazure + packaging paramiko pkginfo psutil - pygments pyjwt - pymysql pyopenssl - pyperclip - pysocks - pyyaml requests - six - tabulate ]; nativeCheckInputs = with self; [ pytest ]; @@ -86,8 +72,8 @@ let # ignore tests that does network call, or assume powershell checkPhase = '' - rm azure/{,cli/}__init__.py python -c 'import azure.common; print(azure.common)' + PYTHONPATH=$PWD:${src}/src/azure-cli-testsdk:$PYTHONPATH HOME=$TMPDIR pytest \ azure/cli/core/tests \ --ignore=azure/cli/core/tests/test_profile.py \ @@ -103,18 +89,17 @@ let azure-cli-telemetry = buildAzureCliPackage { pname = "azure-cli-telemetry"; - version = "1.0.8"; # might be wrong, but doesn't really matter + version = "1.1.0"; inherit src; sourceRoot = "${src.name}/src/azure-cli-telemetry"; - propagatedBuildInputs = with super; [ + propagatedBuildInputs = with self; [ applicationinsights - knack portalocker ]; - nativeCheckInputs = [ py.pkgs.pytest ]; + nativeCheckInputs = with self; [ pytest ]; # ignore flaky test checkPhase = '' cd azure @@ -126,89 +111,29 @@ let antlr4 = super.pkgs.antlr4_9; }); - azure-batch = overrideAzureMgmtPackage super.azure-batch "14.0.0" "zip" - "sha256-FlsembhvghAkxProX7NIadQHqg67DKS5b7JthZwmyTQ="; - - azure-data-tables = (overrideAzureMgmtPackage super.azure-data-tables "12.4.0" "zip" - "sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "4.0.0" "zip" - "sha256-AiTjLJ28g80xnrRFLfPUevJgeaxLpuGmvkd3+FskNiw="; - - azure-mgmt-appcontainers = (overrideAzureMgmtPackage super.azure-mgmt-appcontainers "2.0.0" "zip" - "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "17.0.0" "zip" - "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; + azure-mgmt-appcontainers = overrideAzureMgmtPackage super.azure-mgmt-appcontainers "2.0.0" "zip" + "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU="; azure-mgmt-batchai = overrideAzureMgmtPackage super.azure-mgmt-batchai "7.0.0b1" "zip" "sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y="; - azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" - "sha256-1PXFpBiKRW/h6zK2xF9VyiBpx0vkHrdpIYQLOfL1wH8="; - - azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "2.0.0b3" "zip" - "sha256-XZGQOeMw8usyQ1tl8j57fZ3uqLshomHY9jO/rbpQOvM="; - - azure-mgmt-extendedlocation = overrideAzureMgmtPackage super.azure-mgmt-extendedlocation "1.0.0b2" "zip" - "sha256-mjfH35T81JQ97jVgElWmZ8P5MwXVxZQv/QJKNLS3T8A="; - azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.1.0b4" "zip" "sha512-NW2BNj45lKzBmPXWMuBnVEDG2C6xzo9J/QjcC5fczvyhKBIkhugJVOWdPUsSzyGeQYKdqpRWPOl0yBG/eblHQA=="; + azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip" + "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b10" "zip" "sha256-sM8oZdhv+5WCd4RnMtEmCikTBmzGsap5heKzSbHbRPI="; - azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.4.0" "zip" - "sha256-2JeOvtNxx6Z3AY4GI9fBRKbMcYVHsbrhk8C+5t5eelk="; - - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "6.0.0" "zip" - "sha256-lIEYi/jvF9pYbnH+clUzfU0fExlY+dZojIyZRtTLQh8="; - azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "3.0.0" "zip" "sha256-FJhuVgqNjdRIegP4vUISrAtHvvVle5VQFVITPm4HLEw="; - azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.5.0" "zip" - "sha512-bUFY0+JipVihatMib0Giv7THnv4rRAbT36PhP+5tcsVlBVLmCYqjyp0iWnTfSbvRiljKOjbm3w+xeC0gL/IE7w=="; - - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "30.0.0" "zip" - "sha256-cyD7r8OSdwsD7QK2h2AYXmCUVS7ZjX/V6nchClpRPHg="; - - azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" - "sha256-moWonzDyJNJhdJviC0YWoOuJSFhvfw8gVzuOoy8mUYk="; - - azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "10.1.0" "zip" - "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; - - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "25.0.0" "zip" - "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; - - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.2.0" "zip" - "sha256-PAaBkR77Ho2YI5I+lmazR/8vxEZWpbvM427yRu1ET0k="; - - azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip" - "sha256-BAkAYrwejwDC9FMVo7zrD7OzR57BR01xuINC4TSZsIc="; - - azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" - "sha256-RuNCInmT/JrKsd2kLy61ZrUiqMlFq50O6lYna0b21zA="; - azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip" "sha256-QcHY1wCwQyVOEdUi06/wEa4dqJH5Ccd33gJ1Sju0qZA="; - azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.2.0" "zip" - "sha256-XmGIzw+yGYgdaNGZJClFRl531BGsQUH+HESUXGVK6TI="; - - azure-mgmt-iothub = (overrideAzureMgmtPackage super.azure-mgmt-iothub "2.3.0" "zip" - "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.1.0" "zip" - "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.3.0" "zip" + "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A="; azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "10.0.0b1" "zip" "sha256-1CiZuTXYhIb74eGQZUJHHzovYNnnVd3Ydu1UCy2Bu00="; @@ -219,73 +144,20 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.1.0" "zip" - "sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM="; - - azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" - "sha256-QHwtrLM1E/++nKS+Wt216dS64Mt++mE8P31THve/jeg="; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b4" "zip" "sha256-Jm1t7v5vyFjNNM/evVaEI9sXJKNwJk6XAXuJSRSnKHk="; - azure-mgmt-network = (overrideAzureMgmtPackage super.azure-mgmt-network "21.0.1" "zip" - "sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-maps = (overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip" - "sha256-OE4X92potwCk+YhHiUXDqXIXEcBAByWv38tjz4ToXw4=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" - "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; - - azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "1.0.0" "zip" - "sha256-urm9UyocNFV/Wwq5lQ5DHj8Au5boo85m3w9s4q4ZzXM="; - - azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" - "sha256-aLOB9SpN9ENdrK1al+HFmsTJgfZn3MqPnQRFNBfWCtg="; - azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip" "sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM="; - azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs (old: rec { - version = "7.0.0"; - src = old.src.override { - inherit version; - hash = "sha256-ctRsmmJ4PsTqthm+nRt4/+u9qhZNQG/TA/FjA/NyVrI="; - }; - }); - - azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip" - "sha256-tg8W5D97KRWCxfV7rhsIMJbYMD6dmVjiwpInpVzCfEU="; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "7.0.0" "zip" "sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA="; - azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.2.0" "zip" - "sha256-ZU4mKTzny9tsKDrFSU+lll5v6oDivYJlXDriWJLAYec="; - - azure-mgmt-redis = (overrideAzureMgmtPackage super.azure-mgmt-redis "14.1.0" "zip" - "sha256-LO92Wc2+VvsEKiOjVSHXw2o3D69NQlL58m+YqWl6+ig=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "2.0.0" "zip" - "sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E="; - - azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "9.0.0" "zip" - "sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0="; - - azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "5.0.0" "zip" - "sha512-wMI55Ou96rzUEZIeTDmMfR4KIz3tG98z6A6teJanGPyNgte9tGa0/+2ge0yX10iwRKZyZZPNTReCkcd+IOkS+A=="; - - azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.1.0" "zip" - "sha256-lUNIDyP5W+8aIX7manfMqaO2IJJm/+2O+Buv+Bh4EZE="; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.1.0" "zip" + "sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM="; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b10" "zip" - "sha256-QHvbO6Toh5QflMIaNYmxXBy0Dmw++RVdim3HEDtLBrQ="; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b12" "tar.gz" + "sha256-LJx9cdtqpoHl1pPGYodoA50y8NP4ftbXhY7zohsCPH8="; azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b5" "zip" "sha256-ZFgJflgynRSxo+B+Vso4eX1JheWlDQjfJ9QmupXypMc="; @@ -293,296 +165,32 @@ let azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip" "sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k="; - azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "10.0.0" "zip" - "sha256-XO5w+X/joJPDy3DCoZDC35Nrdy6UoJ73496x7Rd8nzI="; - - azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" - "sha256-2fmHzymYuKNU8zGypxCCwEkZPx4c00WBLhS5uCE2Wss="; - azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "10.1.0" "zip" "sha256-MZqhSBkwypvEefhoEWEPsBUFidWYD7qAX6edcBDDSSA="; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.2.2" "zip" - "sha256-LG6oMTZepgT87KdJrwCpc4ZYEclUsEAHUitZrxFCkL4="; - - azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip" - "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; - - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.1.0" "zip" - "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc="; - - azure-mgmt-monitor = (overrideAzureMgmtPackage super.azure-mgmt-monitor "6.0.2" "tar.gz" - "sha256-X/v1AOSZq3kSsbptJs7yZIDZrkEVMgGbt41yViGW4Hs=").overridePythonAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; - }); - - azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" - "sha256-/ECLNzFf6EeBtRkST4yxuKwQsvQkHkOdDT4l/WyhjXs="; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.2.3" "zip" + "sha256-JDM6F0ToMpUeBlLULih17TLzCbrNdxrGrcq5oIfsybU="; azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "1.0.0" "zip" "sha256-woeix9703hn5LAwxugKGf6xvW433G129qxkoi7RV/Fs="; - azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "3.0.0" "zip" - "sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0="; - - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "21.0.0" "zip" - "sha256-brE+7s+JGVsrX0e+Bnnj8niI79e9ITLux+vLznXLE3c="; - - azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "8.2.0" "zip" - "sha256-i+kgjxQdmnifaNuNIZdU/3gGn9j5OQ6fdkS7laO+nsI="; - azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" "sha256-3jXhF5EoMsGp6TEJqNJMq5T1VwOpCHsuscWwZVs7GRM="; azure-mgmt-servicelinker = overrideAzureMgmtPackage super.azure-mgmt-servicelinker "1.2.0b1" "zip" "sha256-RK1Q51Q0wAG55oKrFmv65/2AUKl+gRdp27t/EcuMONk="; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0" "zip" - "sha256-QevcacDR+B0l3TBDjBT/9DMfZmOfVYBbkYuWSer/54o="; + azure-storage-common = overrideAzureMgmtPackage super.azure-storage-common "1.4.2" "tar.gz" + "sha256-Tsh8dTfUV+yVJS4ORkd+LBzPM3dP/v0F2FRGgssK5AE="; - azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.2.0" "tar.gz" - "sha256-CQuoWHeh0EMitTRsvifotrTwpWd/Q9LWWD7jZ2w9r8I="; + azure-keyvault-keys = overrideAzureMgmtPackage super.azure-keyvault-keys "4.8.0b2" "zip" + "sha256-VUwQJAwpZIQ8fzBUjUX0ui2yaVkDK7p0fwmnz373XbY="; - azure-appconfiguration = super.azure-appconfiguration.overrideAttrs (oldAttrs: rec { - version = "1.1.1"; + azure-mgmt-datalake-store = overrideAzureMgmtPackage super.azure-mgmt-datalake-store "0.5.0" "zip" + "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw="; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; - extension = "zip"; - }; - }); - - azure-graphrbac = super.azure-graphrbac.overrideAttrs (oldAttrs: rec { - version = "0.60.0"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-0Lti2L+OGWuQPzlxukr6RI5P4U6DlOv83ZQdhNYuyv4="; - extension = "zip"; - }; - }); - - azure-storage-common = super.azure-storage-common.overrideAttrs (oldAttrs: rec { - version = "1.4.2"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-Tsh8dTfUV+yVJS4ORkd+LBzPM3dP/v0F2FRGgssK5AE="; - }; - }); - - azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs (oldAttrs: rec { - version = "0.15.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-XxryuN5HVuY9h6ioSEv9nwzkK6wYLupvFOCJqX82eWE="; - extension = "zip"; - }; - propagatedBuildInputs = with super; oldAttrs.propagatedBuildInputs ++ [ - azure-mgmt-core - ]; - }); - - azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs (oldAttrs: rec { - version = "0.5.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-g14ySiByqPgkJGRH8EnIRJO9Q6H2usS5FOeMCQiUuwQ="; - extension = "zip"; - }; - }); - - azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs (oldAttrs: rec { - version = "0.4.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-kA6urM/9zQEBKySKfQSQCMkoB7dJ7dHJB0ypJIVUwX4="; - extension = "zip"; - }; - }); - - azure-synapse-spark = super.azure-synapse-spark.overrideAttrs (oldAttrs: rec { - version = "0.2.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-OQ5brhweEIrtN2iP4I5NacdC9t3YUiGIVhhqSs3FMuI="; - extension = "zip"; - }; - }); - - azure-keyvault = super.azure-keyvault.overrideAttrs (oldAttrs: rec { - version = "1.1.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - extension = "zip"; - hash = "sha256-N6jl83brWjBPzQZtQUtdk7mH5o+SErDEHvo31Cmq3Uk="; - }; - - propagatedBuildInputs = with self; [ - azure-common - azure-nspkg - msrest - msrestazure - cryptography - ]; - pythonNamespaces = [ "azure" ]; - pythonImportsCheck = [ ]; - }); - - azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs (oldAttrs: rec { - version = "4.3.0"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - extension = "zip"; - hash = "sha256-PuKjui0OP0ODNErjbjJ90hOgee97JDrVT2sh+MufxWY="; - }; - }); - - azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs (oldAttrs: rec { - version = "4.8.0b2"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - extension = "zip"; - hash = "sha256-VUwQJAwpZIQ8fzBUjUX0ui2yaVkDK7p0fwmnz373XbY="; - }; - }); - - - # part of azure.mgmt.datalake namespace - azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs (oldAttrs: rec { - version = "0.2.1"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-THlg0JT1hH2aRWwYuKPI5gxCjjCAo5BfHJQ9gbpjUaQ="; - extension = "zip"; - }; - - preBuild = '' - rm azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-datalake-nspkg" "" - ''; - }); - - azure-mgmt-datalake-store = super.azure-mgmt-datalake-store.overrideAttrs (oldAttrs: rec { - version = "0.5.0"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw="; - extension = "zip"; - }; - - preBuild = '' - rm azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-datalake-nspkg" "" - ''; - }); - - adal = super.adal.overridePythonAttrs (oldAttrs: rec { - version = "1.2.7"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE="; - }; - - # sdist doesn't provide tests - doCheck = false; - }); - - msal = super.msal.overridePythonAttrs (oldAttrs: rec { - version = "1.24.0b1"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-ze5CqX+m8XH4NUECL2SgNT9EXV4wS/0DgO5XMDHo/Uo="; - }; - }); - - semver = super.semver.overridePythonAttrs (oldAttrs: rec { - version = "2.13.0"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-+g/ici7hw/V+rEeIIMOlri9iSvgmTL35AAyYD/f3Xj8="; - }; - }); - - jsondiff = super.jsondiff.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0"; - - src = oldAttrs.src.override { - inherit version; - hash = "sha256-J5WETvB17IorjThcTVn16kiwjnGA/OPLJ4e+DbALH7Q="; - }; - }); - - knack = super.knack.overridePythonAttrs (oldAttrs: rec { - version = "0.11.0"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-62VoAB6RELGzIJQUMcUQM9EEzJjNoiVKXCsJulaf1JQ="; - }; - }); - - argcomplete = super.argcomplete.overridePythonAttrs (oldAttrs: rec { - version = "3.1.1"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-bExWPxTwFECq/6Pq4TRBxdsjV7Xuxjmr58CxUzRiff8="; - }; - }); - - sshtunnel = super.sshtunnel.overridePythonAttrs (oldAttrs: rec { - name = "sshtunnel-${version}"; - version = "0.1.5"; - - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-yBP9zajoHDk2/+rEfLac+y0fXnetDeZWxtq1au69kkk="; - }; - }); - - websocket-client = super.websocket-client.overridePythonAttrs (oldAttrs: rec { - version = "1.3.1"; - - src = oldAttrs.src.override { - inherit version; - hash = "sha256-YninUGU5VBgoP4h958O+r7OqaNraXKy+SyFOjSbaSZs="; - }; - }); - - azure-mgmt-resource = super.azure-mgmt-resource.overridePythonAttrs (oldAttrs: rec { - version = "23.1.0b2"; - - src = oldAttrs.src.override { - inherit version; - hash = "sha256-kMmiKVwjPgmsTIxxxDRNXE41jSTJkemnKhO+P/OcPZI="; - }; - }); + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "23.1.0b2" "zip" + "sha256-kMmiKVwjPgmsTIxxxDRNXE41jSTJkemnKhO+P/OcPZI="; }; }; in diff --git a/pkgs/tools/admin/iredis/default.nix b/pkgs/tools/admin/iredis/default.nix index bc38b606b2e..95f8a98ed4a 100644 --- a/pkgs/tools/admin/iredis/default.nix +++ b/pkgs/tools/admin/iredis/default.nix @@ -6,26 +6,18 @@ python3.pkgs.buildPythonApplication rec { pname = "iredis"; - version = "1.13.2"; - format = "pyproject"; + version = "1.14.0"; + pyproject = true; src = fetchFromGitHub { owner = "laixintao"; repo = "iredis"; rev = "refs/tags/v${version}"; - hash = "sha256-dGOB7emhuP+V0pHlSdS1L1OC4jO3jtf5RFOy0UFYiuY="; + hash = "sha256-5TMO1c29ahAQDbAJZb3u2oY0Z8M+6b8hwbNfqMsuPzM="; }; - pythonRelaxDeps = [ - "configobj" - "wcwidth" - "click" - "packaging" - ]; - nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -65,5 +57,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://iredis.io/"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; + mainProgram = "iredis"; }; } diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 73b8ada86ee..84195ebcbaf 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,56 +1,56 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.90.0"; + version = "3.91.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.90.0-linux-x64.tar.gz"; - sha256 = "1d1mmfvhbj6s9lfjmb7dw46byngh2fh3g8mhnpbgqpifl5iabldp"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.91.1-linux-x64.tar.gz"; + sha256 = "1f8ywz395aby9q2gxkjj6f8ff8wr755fgy96sxjcdr78cw8rjm0z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-linux-amd64.tar.gz"; - sha256 = "11dgpi0bg975iyf0xa8r9vyvs4r3nj7nn8mp36w9b5m7128mpkwp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-amd64.tar.gz"; + sha256 = "1ppfs7cnhns4lqxj7cs87f78hcvy73r32fa7wxcybl5wnd73g5c6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.0-linux-amd64.tar.gz"; - sha256 = "0dlk2f37r8bv30dc630x5zh0wy9fd49zz9fbpmc0g4a1vr2scqxm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-linux-amd64.tar.gz"; + sha256 = "0pf1pka8pq4cizlnf5hm5ji1hf5nchkj21mwpi2cxdk2w4ghw0ds"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.1-linux-amd64.tar.gz"; - sha256 = "055j0jv9zahqb0j4rx0ck62yw9zda9j4w420bbgmqjx8hyd46x9y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.2-linux-amd64.tar.gz"; + sha256 = "0qi3wp5iy9pym4yqzx1186paz80dv7lppcd0jw4fgpi8lclfygbm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.3.0-linux-amd64.tar.gz"; - sha256 = "0qzqz0wxwc0bvpchhbmpy46pa796x9yprgw9qm8jzf6cihws3s8n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.1-linux-amd64.tar.gz"; + sha256 = "0ykzbcjglc4g4ac46w2h7xmvfa2dqnnswhy9wf787jmi00msz259"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-amd64.tar.gz"; sha256 = "0vyhmdyln0cpcf1fgc0v641c78a66dzx97i7xq6isspl6zx9njn5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.6.0-linux-amd64.tar.gz"; - sha256 = "00345k517ndy743y4vxkyihzlfvgqw0k4z3ds7gfaby0qa5hlkpg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.7.0-linux-amd64.tar.gz"; + sha256 = "187ryaf24vv6mwwhv8cw5g3hpi67ssc0n98fsff9rllnb6p4k2k9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.43.0-linux-amd64.tar.gz"; - sha256 = "1dsqa72hg9c1qwyncm5jnsgj36xpb4v9h05kq93khz2bsap1qh18"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-linux-amd64.tar.gz"; + sha256 = "0slbvp9pg2yrrm5i4z7zhyksn8lmz82xymvwadr69z71h59s3b1x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-linux-amd64.tar.gz"; - sha256 = "1hz2xavx3h19dgq8j7x9wfa3p93ki60z6vrkgxgj0x2ws606wqb3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-linux-amd64.tar.gz"; + sha256 = "029xymc6ynb7aq5wdkvksgqhjl9aix5j3rn8dfzlbmrmmz0xyvxr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.53.0-linux-amd64.tar.gz"; - sha256 = "1xmp3rm2174xlfkyyj9hghlmicg2fw0b4jmkwzdf1k3nr0kwq8p7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.54.0-linux-amd64.tar.gz"; + sha256 = "1yfysnc4y6pi6ys1gv3aik7qx6xs27jyf5cz7s9cyr5wm9a3bhkc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.0-linux-amd64.tar.gz"; - sha256 = "0hlqm8k3bclpxs3fnn722dsv2n8pv78smndrlbwi3kaw8x051jby"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.1-linux-amd64.tar.gz"; + sha256 = "0px43nn5c8dfairg9jilv67kv7jdclw588d910hzx2wci6ym7vjs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-linux-amd64.tar.gz"; - sha256 = "0drdv78f7xx3fx8xx6iialcy3nkq9z1lkdfj1fbhzaxpa6bmzyjh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-linux-amd64.tar.gz"; + sha256 = "1h7rxzax73hq6dyldb6dqxrjhbddamaljn2h0cabdjlvrvbnkg0l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-linux-amd64.tar.gz"; @@ -69,48 +69,48 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.3.0-linux-amd64.tar.gz"; - sha256 = "0bkgaskq84vac20dbw81xc3qnkb6vginyd2qfdd0akjpakx94678"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-linux-amd64.tar.gz"; + sha256 = "1l3pqshzxscv3pxp5wjyrc83irkhh6g7hbdi51x2jhdywjz5r55m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.67.0-linux-amd64.tar.gz"; sha256 = "148sg0jsm05qqgi10m8y4b7ib1miyvs1346h36mg1pf8hykg3psb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-linux-amd64.tar.gz"; - sha256 = "03qwzqq90l3z7yp7nb0zx34pgrhi2a0aljlxzdfhyaji4h1mkpz6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-linux-amd64.tar.gz"; + sha256 = "0hnaanqg991xy4jmk09rcd5adzx760707133yaax0nx6r1g0lbdc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-linux-amd64.tar.gz"; - sha256 = "1ykcz0idzfh259sxspcqcsy6rgp57jv7zh84xv1r42d5c52ni02v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.5.0-linux-amd64.tar.gz"; + sha256 = "0x22g7rdywxk1crgcf424n6w2h1jslk4fhhh66g642d553jpz1ci"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-linux-amd64.tar.gz"; sha256 = "1xq92rsk7bimkr52c13mjypd0ygs7qc9ijyi2ghnf0585d1z5bk5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.1-linux-amd64.tar.gz"; - sha256 = "00vvb17q05r5yn2i7yv3163gxvnakxkjl6a7n1dyb8yzr39ic7ff"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-linux-amd64.tar.gz"; + sha256 = "0f5sii66fffq5qrri8r1a3xzskvj9yx6chr7j2s34kgc11dqrbxc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.0-linux-amd64.tar.gz"; - sha256 = "1msc2f0ygqddb57fw8yyvb4lj3ql8mydwcw1z9pksjvi7f02c9s7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.3-linux-amd64.tar.gz"; + sha256 = "0a1rspln39zznn6fh3nwqnaczv9xssmdikpbq938h7n2x4kv28pd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.2-linux-amd64.tar.gz"; - sha256 = "16df311564z7v872amhvsvqixkj9i2r2ra1yak8yc47iqjdwv2jk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.3-linux-amd64.tar.gz"; + sha256 = "00vj8z57d9387h2spx9spf73wql27ld4vd88z5702nmbwkhsn1d1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz"; - sha256 = "02ma55cxc8hhcc9lybaz4dn7842jmq5cf01wyjd1xnrchzcska1q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-linux-amd64.tar.gz"; + sha256 = "1r4cvln9c9i2xvj8r6bb6l2ccy6457vhdj9ra35yq5zckwf0dri0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-amd64.tar.gz"; - sha256 = "0lj01hyjyq3qazkryvvxkx6nwai3bac9shqxb6hcqv4pfdjzzxhr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-linux-amd64.tar.gz"; + sha256 = "0nl5xyj4jij500vm6na653s8savr2nm0hzx2qn1brgfpxx9j4pvj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.13.3-linux-amd64.tar.gz"; - sha256 = "0qqfb0gxqz6rxi5m2q8m2k6s8yfdl9x97p5f3cfchmi2zvwyqysy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-linux-amd64.tar.gz"; + sha256 = "1dx4riyz1p8dz3biqqxkg6zv6y0jzikc20lk3wj7q2ifxy7rigia"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-linux-amd64.tar.gz"; @@ -121,12 +121,12 @@ sha256 = "1v59k0m4rrad5vbd2x4znb985cbwj9py6ki60x1skq704pmcli5g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.37.0-linux-amd64.tar.gz"; - sha256 = "1i8hqw2id0lbgck0wibwb4by07i0x4ssqbsaysxrbibvvzbxjp8p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.39.0-linux-amd64.tar.gz"; + sha256 = "1g5rx5vy8miwlz66dwv6nks9jk0pjyxb37w6wgnpcgw02m9famrl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.57.0-linux-amd64.tar.gz"; - sha256 = "1c0q68ivbx8rbqkw3yy9m8v10v6jc4hwywr1gqlfsbvjbg5zllx9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.58.1-linux-amd64.tar.gz"; + sha256 = "1k3xipaw1nrfc0vms20xcxnaz4f0wni3a3w85lwiyi4vx5pd0kn7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-linux-amd64.tar.gz"; @@ -137,24 +137,24 @@ sha256 = "06gvx51nl93rj244yximp6059yiyxh4jcdqqcrjic8r7wabzsiiw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.0-linux-amd64.tar.gz"; - sha256 = "1mjnfpkk8w13m5p2rkymmyd1nw0sdvg5izjfxpfs71nvy1xp9yxf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-linux-amd64.tar.gz"; + sha256 = "0b6nd5gk0d2vg6z0ql87zjyvl880h390g767d9vggwzlwljxzhsm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-linux-amd64.tar.gz"; sha256 = "1jwiidxbfg6r0nm4l6p09n5yqaybxdl300s88jxppjn7dwn9dgwq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-linux-amd64.tar.gz"; - sha256 = "12d8zs3j1ilbs840hwlmnch1jqahr44w668f012mypdl5cgm6mai"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-linux-amd64.tar.gz"; + sha256 = "044w1qwjadrz0ylr00qnwppvq6mc8c8z759b0wfn69a2r25az19f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-linux-amd64.tar.gz"; - sha256 = "0av9vs3l5jpmwxcgjaxp5jlnz4v0kdc4fr0fxqz0rdxsakd51lrs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.1-linux-amd64.tar.gz"; + sha256 = "1y8yfzmgxx2x15ljwjyc5kyrkmai1if59hz65avsf67615xisnyy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.3-linux-amd64.tar.gz"; - sha256 = "0d4zdfp62v5kd5k1bc1kivpapnj5v04lbrwnbjbm7ba6ab81i480"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-linux-amd64.tar.gz"; + sha256 = "0xn8vw19dp6hwm8w94p3lnmpy1zhdczxjphjy6m79pv1mszc153f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; @@ -163,52 +163,52 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.90.0-darwin-x64.tar.gz"; - sha256 = "037d30vb2fkcjpdqs57bcai1glsfds4494amgifm0fz44vcsn6h8"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.91.1-darwin-x64.tar.gz"; + sha256 = "0r0xybia32qqpggddkcc40qzykvib50ff03lygab5lyqb3n8dajz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-darwin-amd64.tar.gz"; - sha256 = "1jp28j1xzn0a5dn4ysa7cp9x7l9fzmbcylasmm2a5rdvvq627s1l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-amd64.tar.gz"; + sha256 = "1rvrln32jndp1yq05ybqim10m2wh2g9rwa5q5brxsrzn1gfa41jx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.0-darwin-amd64.tar.gz"; - sha256 = "05n88fabm55x538yqm16mhz8rgpdcxrnlcwv6aj0zb6fjn9c0jhi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-darwin-amd64.tar.gz"; + sha256 = "0i4kjngs8ly5cxikxc1jz2lcma31sx87vbdbny2j7xxz3fqsyi19"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.1-darwin-amd64.tar.gz"; - sha256 = "1va17d1bxkb8i1ycg8xi0slcrqg1rx40d2zz8jy4mjkxbwy9nnsy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.2-darwin-amd64.tar.gz"; + sha256 = "0rrs93qrqz4bs66ydjb2y4jl6l7pdycs4hqpgp110mipn54bkfix"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.3.0-darwin-amd64.tar.gz"; - sha256 = "0zzshzvyb8r98xlvn92qk64qjhxwx1403bpkvsk0y6gbp185p2y9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.1-darwin-amd64.tar.gz"; + sha256 = "0ki1iyw92baf63qd9r3hingmdqiidqzy8j7arcmd0jsvaqvarqqv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-amd64.tar.gz"; sha256 = "04imkdrj388nk88r734f0p0a6z1hffzmplwgmx55kfwqz3zpz4y5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.6.0-darwin-amd64.tar.gz"; - sha256 = "05fyb8irmilgd48m2zl9x9gncgg1gds5nw08fbndzarag11yyfs7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.7.0-darwin-amd64.tar.gz"; + sha256 = "158wzpj4qmazs4hypv7bdm0n1d0xaay94cmz9aa60yww9sj8nhkl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.43.0-darwin-amd64.tar.gz"; - sha256 = "02xccgq0jls7mivxz0yc6hbmrjnbpapwwmz4j96ssd9cw2pgkkz2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-darwin-amd64.tar.gz"; + sha256 = "1b01rnms4fzi0w4pmyxjrp06001fz99dpas4r06ri2mm21kdbyvf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-darwin-amd64.tar.gz"; - sha256 = "0rzwkwrjm5p59maz371ndf9mcsdlz98n756k125wylxbp5xygcyv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-darwin-amd64.tar.gz"; + sha256 = "16zc13z31p92775v3vsn6j6pmz1wcjqb8rhzxpnr03zbqviws7mi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.53.0-darwin-amd64.tar.gz"; - sha256 = "0bf6w7vdw68fmhkqhhsn664jbar1ly3d4qvzjlhzz09r9kw2h86r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.54.0-darwin-amd64.tar.gz"; + sha256 = "12i0flgcmz0nb7mq55sg5bl5pbh60n047fw0xkhk3mvzl0z7i47b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.0-darwin-amd64.tar.gz"; - sha256 = "09qffncb6fpawnv1svma1nwg5ckjylpg1vnrbc04ya3cpqpim79i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.1-darwin-amd64.tar.gz"; + sha256 = "08xvqljn0k1lm3yw4apc3h3dj6l086p7qaygv6354lgp63ab0as7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-darwin-amd64.tar.gz"; - sha256 = "090iifz0psm9iqh4qwvfsl7nrk5v7xqiryqnhibg5m643h1vinqg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-darwin-amd64.tar.gz"; + sha256 = "0wyjcpl5iw3f97k0s372lh4xrpdibsrczwdprl55w56wxd7kdjq1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-darwin-amd64.tar.gz"; @@ -227,48 +227,48 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.3.0-darwin-amd64.tar.gz"; - sha256 = "14gs2xv4sq98d12h2v17l68r083wwbm8dqxs5a0wqd84iss2r7hf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-darwin-amd64.tar.gz"; + sha256 = "0xdfxxlfxm44bkljc5c8h3ici7dlkbgbg6z2ns4870p15lhq34n5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.67.0-darwin-amd64.tar.gz"; sha256 = "0p30xhj6k46cdy84c7zr4hgdpi3rqvdjqjx8kr8a1ky29569ji4j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-darwin-amd64.tar.gz"; - sha256 = "0q5bzk5z3qd1mifv1m44cfbcv8bvipd4sxrgqpk71gsanslz72jk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-darwin-amd64.tar.gz"; + sha256 = "1547hc9jdg0j6n66sk5j7iid5m5pvkv8q9j09q9vkcrkj3kkjcvb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-darwin-amd64.tar.gz"; - sha256 = "0a3drcvqjnqqrlm55qxb1j5qn404595ywx6rnzqjcjmrhwg2yyh9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.5.0-darwin-amd64.tar.gz"; + sha256 = "1kipsvsji6s9j2644ka46rpg4mhscj3hb61b5g3ghfmm66hxijs6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-darwin-amd64.tar.gz"; sha256 = "18vqn7cs5l6fyxmplvcmb779sa91ka8vzz40giggdxzsdjjj9dpx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.1-darwin-amd64.tar.gz"; - sha256 = "1mpx6355bvp3dp8w6x9hrrswfid592jzp1srsv0acd4ypzskm8zv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-darwin-amd64.tar.gz"; + sha256 = "19zm781g8ii062dp48wf11pdyrddk10c5rf18xk4bpf2prbg5vsi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.0-darwin-amd64.tar.gz"; - sha256 = "0f75hi8kg3pc1gmj89lm37zf8vgk9xx2hblvq8vx6vh70pkivhlj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.3-darwin-amd64.tar.gz"; + sha256 = "0bm17zim436179azhpiwkxx10ici0va96lx1i1p6drhc0rvd0sq8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.2-darwin-amd64.tar.gz"; - sha256 = "1rkxyz1h337vz19qvpcirrldi578cmrgw240v6bg63qzsgxnj1gg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.3-darwin-amd64.tar.gz"; + sha256 = "02nwq7z29z3cskya70r9x3497wqbp4i97n1bh5fr0galp6w8fdi3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz"; - sha256 = "07sav5r6z3xlx953jyv3b3wq7q6nv3sbh44fx753yqfh7ahagpn5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-darwin-amd64.tar.gz"; + sha256 = "1w8q091igjzwlqp9ck23jxh87r5cnsg83jwlxr6ynddlp7w2c6yp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "0fhhc2k0g8mpxzcgci4jl3m59q3n8w3nka94l0n7r9cvs81099n6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "0q54fvqlldzy11833nislmlrcrkz25wsyqvkph41qdm0yv39ycx7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.13.3-darwin-amd64.tar.gz"; - sha256 = "11dh5jnpfiah7w1rg99ympm0fin4b2ld6rixggqxq04lqfqh8i2v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-darwin-amd64.tar.gz"; + sha256 = "04pgw5plavn4kvkapky26xx4pgdcf0c27il18g7hmfvnmagfcsiz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-darwin-amd64.tar.gz"; @@ -279,12 +279,12 @@ sha256 = "1jg3qdm331dvnq2igf6q0xd2ld21jnhm0h756pmxszngadfnmcdw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.37.0-darwin-amd64.tar.gz"; - sha256 = "1bgylspgdsfl4i2fnh328kcxysd3fqlc7xhh3irlf6vqfxak0njy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.39.0-darwin-amd64.tar.gz"; + sha256 = "19pm2qfjmdfz32py93xcmw85byyffgq1xpv6rdk31r25ys9qhdbl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.57.0-darwin-amd64.tar.gz"; - sha256 = "1cwkm8kpjwznvsf0v2h6qz8wbih59zxnw99g07jr86n5k790bxf9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.58.1-darwin-amd64.tar.gz"; + sha256 = "19i67kpf5ghw9w5mdww10njz7cf0v7975in0nrp2i6l61p9c9yl1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-darwin-amd64.tar.gz"; @@ -295,24 +295,24 @@ sha256 = "1pm5j9q4kvv70c6paficcfb664df6666mq559zvdklf5ndjpw5z9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.0-darwin-amd64.tar.gz"; - sha256 = "0122mpbgc2d4yhdvm1j45niz07d68drj80hxa3d1sa9pqzyllbky"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-darwin-amd64.tar.gz"; + sha256 = "0aicxgwxs7mp9y88m8am0wl34h6llxj4jzww18alawkvxm1msah8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-darwin-amd64.tar.gz"; sha256 = "0wph3f11dkvn956nmx9r57ynjaal6kj7qb08rwfiv792dlk5d5bc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-darwin-amd64.tar.gz"; - sha256 = "1ghzm11lvbvglfbxdc4bkhp390cs3pd2jgj9k8xka1gffy8cm1m7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-darwin-amd64.tar.gz"; + sha256 = "19wmv952wn2njbd1ppl1lfzf1f47wf11m4qiiqc3wyd1qc33qsn1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-darwin-amd64.tar.gz"; - sha256 = "1i6igx9yz0pa5brb056w0vzdp945xs723qmmmm84px06qd3przf2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.1-darwin-amd64.tar.gz"; + sha256 = "0ghxpf03h1gg1fc0wpzzdij9dydc9knvjyn9xvjhwr7ar3bvswq5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.3-darwin-amd64.tar.gz"; - sha256 = "1xpdniixahizpbijbp5px76sxw2yljks965kigrxlkqqgiv7n0ii"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-darwin-amd64.tar.gz"; + sha256 = "104yaqp0s06zdw43kkh5k81yprdyc8r6l0sxcvqdv9rmr6q3j076"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; @@ -321,52 +321,52 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.90.0-linux-arm64.tar.gz"; - sha256 = "07z1psrh4b2bn5k3kvdwd4ql3nslfnaginbmfiw4k0p51fh7y8j9"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.91.1-linux-arm64.tar.gz"; + sha256 = "00pl2340naa7jb0gg9fgnzl8y9n299crqfdvhik1ii1alk8jnc88"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-linux-arm64.tar.gz"; - sha256 = "09n456hm9d3bv7krlkw04wmra55xinb311051cghpyxsrwpv5qid"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-arm64.tar.gz"; + sha256 = "13sng11gimfx237kdkqg41ly66x6ri64ls2wgw4g9jr8r68z3ii5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.0-linux-arm64.tar.gz"; - sha256 = "08iz8fa5yfq0cscvqm8nl8z191lriimw8rbc03amh25amv8y3snh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-linux-arm64.tar.gz"; + sha256 = "0y1i2lwvy0wjvngpjf5rscidrlqb3mhhkhqvj227alz3c4xhf091"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.1-linux-arm64.tar.gz"; - sha256 = "01n6b9hwil9wni4p5vp4iymfsrbs1sa5ilg6i0cc8i2776c96qrh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.2-linux-arm64.tar.gz"; + sha256 = "1mncqhlr8ga43pkay8cn0nj9b3kzd8jb65wp02gqsgf8adracrks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.3.0-linux-arm64.tar.gz"; - sha256 = "15n3ivsgslq36n72hvv3r8jmg8lspalnrxfpd7azb21sz69ym4lm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.1-linux-arm64.tar.gz"; + sha256 = "0hrhy064j5mmjpvzrbg6vyvi9wjcsmll8zj8x0j7wnwkv69i80ah"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-linux-arm64.tar.gz"; sha256 = "11ph5yjy754sb55sncdlgibrmijg2jsylrjfpvy4mclrwg64cari"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.6.0-linux-arm64.tar.gz"; - sha256 = "1saq2z1yxs73c4rxgi34nmdapri90qhz109h4y03qak4sifj4hcg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.7.0-linux-arm64.tar.gz"; + sha256 = "1c66scrg8jy0qpm3kh0sfw0142fb1xf86c3yxhndhnxscnjz44i6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.43.0-linux-arm64.tar.gz"; - sha256 = "1p7a5v4gi0a8h3slpi7j46h6w1vmfqhfi2px0gw1bc8gjsj2j0ch"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-linux-arm64.tar.gz"; + sha256 = "0fkjdd51b3pa224ycf9fi1zdcrf6vcbp9vph1rgqynz9ha7axyiz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-linux-arm64.tar.gz"; - sha256 = "0c4m9y4hh6k4f9v4xidijpwyc2650v4180zkdy5cpl7shfdk3n75"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-linux-arm64.tar.gz"; + sha256 = "11gx8zlkakfbwf7vc4j29cd0bfakjf6flgp0a05d8ka5kjq3qkcx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.53.0-linux-arm64.tar.gz"; - sha256 = "074wrmzqan8mjv178bxfkhma2qx0qlfsy2s3vvjqpjvg2kp8yqli"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.54.0-linux-arm64.tar.gz"; + sha256 = "0pll6r5pz8ajh8m1f9lwy938jawhng4lz6byrxgy9ydkklz11ygd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.0-linux-arm64.tar.gz"; - sha256 = "1yhjdnc9n0531ckjmnazq3nc54l642g3p6kn3an08w2ykzdscf8x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.1-linux-arm64.tar.gz"; + sha256 = "0wvqwc7b90108j160c1xd6xr127jbjhjhfax7a2sff2x6f5xsfck"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-linux-arm64.tar.gz"; - sha256 = "1wavn4szckiranji27h84i9mpb589h87zmp9sakiqgn7c6cdhqpb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-linux-arm64.tar.gz"; + sha256 = "0980s2a1c3pkswf8ai91wb526hyghcbzjnykf5ivam4vy0mlc8k5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-linux-arm64.tar.gz"; @@ -385,48 +385,48 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.3.0-linux-arm64.tar.gz"; - sha256 = "0qyjnkddwkfipmv7gv2vyjg6mr2nf7bm54v2vz96akr7ysl7w2rl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-linux-arm64.tar.gz"; + sha256 = "11dfjx05inx1fdknzli0q7gma4hc1217jmfn4bx9ky635nqh5ckq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.67.0-linux-arm64.tar.gz"; sha256 = "14xpg193qf332sa9x4iw39i71k158f5393bqcqrjfccpkk1adwli"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-linux-arm64.tar.gz"; - sha256 = "0fxvivpscjlmcp4jdzvg4zhiah8g4zs5sa0ra0yxc9shs0v669p6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-linux-arm64.tar.gz"; + sha256 = "0gwdlk1m4f91fbqnlv3jb83fi66nay261180nr72bk4hc9757y8i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-linux-arm64.tar.gz"; - sha256 = "1zznxhp8njrm9kamg89r75rkzbd5mx66v9hxdwdwyijdsrb7rih4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.5.0-linux-arm64.tar.gz"; + sha256 = "03j4ka8jdyxzkbsd0bgiqnnz1a8472mb0v3mlfnyvi0c6gs4y7cq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-linux-arm64.tar.gz"; sha256 = "17bykmfj9kxw2c94wjxcfakd10apnc88axr3wx2pa2k5idxd3ih0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.1-linux-arm64.tar.gz"; - sha256 = "17zpwizdsavsnhq179hw67wppdm61hzl6qrycl4anf074h5fy9rw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-linux-arm64.tar.gz"; + sha256 = "1z67c7jwfs2z2hi0fqsxzsb426iv82n9sv3ik6smhq2agcxlaas2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.0-linux-arm64.tar.gz"; - sha256 = "03xsszzclhr34yj0axafnqvgw77z7m73r0nq8yr3hydzjwazkrl1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.3-linux-arm64.tar.gz"; + sha256 = "12987cir0ry23smdb1p8qkm0w9m70mn3pkrlfwwhd8wnswnfsybz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.2-linux-arm64.tar.gz"; - sha256 = "0mpwj7iykz4w1wh247qacam50qr9x03yrqbyf79n42pw3l4skyld"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.3-linux-arm64.tar.gz"; + sha256 = "1zi99z4s5kcm3fi5jxa4bpnxznd22vvgary63ydyn7k662dvpvfr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz"; - sha256 = "0073vppvkfqz02jwanycy49ria8in7bpikhkqjz84imrprj9l9ic"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-linux-arm64.tar.gz"; + sha256 = "1f1q34hc6bnqq60llm6gvwmkmvgh24hnxys4hwk79l11ryy5d6cz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-arm64.tar.gz"; - sha256 = "17iaf72dzy108v1njan21n72a5gzxbycq396hjh293a141kppn1m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-linux-arm64.tar.gz"; + sha256 = "0zns8xk4y992mp354lkp6ff96d4gifsw9cxkg0jla02lpaz2fiyn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.13.3-linux-arm64.tar.gz"; - sha256 = "1y5prgh9nq6jb4db5b7a4dpcilq2c9ivfl1b1z59096gx540yqar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-linux-arm64.tar.gz"; + sha256 = "0rpgr4ngw6ja6xlfwak8mvx3zbqhbzg474lm8sl5mx80z66r8zlj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-linux-arm64.tar.gz"; @@ -437,12 +437,12 @@ sha256 = "18wkr5sfa9v8b9b4c3hdgnq8wd8qpykcyqbcmiypykj8y954hxjk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.37.0-linux-arm64.tar.gz"; - sha256 = "1205k1yc0pax25fj5dgp39bxq7m7q6f60abqr7ka4sqx3f8fz4aa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.39.0-linux-arm64.tar.gz"; + sha256 = "0a8vzhiy7jdxyvfmqd6z9n7iqvpdxc51qcwy212r9vy84mqxjsig"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.57.0-linux-arm64.tar.gz"; - sha256 = "123aa4j74fs9idlyyaydzgsfaaxay4wj9s8y83zz1b0xlwfq11jd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.58.1-linux-arm64.tar.gz"; + sha256 = "1nv5vd4cv8bfvihv2m316pw39yip7i61xx29lxvyvi5pib2yl0h2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-linux-arm64.tar.gz"; @@ -453,24 +453,24 @@ sha256 = "1rlf5gl7a7ym8zl4h0v7i42a9830zi401axw032h0v4q6w4zki3n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.0-linux-arm64.tar.gz"; - sha256 = "104lp8pxm3z6dshz3jvn6bsniskw665jmnmfnr410kgx60hk4wip"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-linux-arm64.tar.gz"; + sha256 = "1zizrk7chxjda8lpkgrvs40f3il2z7xl79fcslq129adhqj2af3k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-linux-arm64.tar.gz"; sha256 = "0cq2mmzsjk4il1brqp1i8jjl9771krjiir5fk0bhhrzj08jvi0l3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-linux-arm64.tar.gz"; - sha256 = "15y18s4p9py16gzcb6l69g3qj857kr3jafjdhhafxjfzfi2rlvd7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-linux-arm64.tar.gz"; + sha256 = "0gx4n9palj6yana77hs3aiv96ck4vzvnqblb1h7h9z1jfmdl7m01"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-linux-arm64.tar.gz"; - sha256 = "0ifzw0az0xglk599f5kzyrss1lkk622lclpzqcvm89rl5ad6hglr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.1-linux-arm64.tar.gz"; + sha256 = "1qj7640s3kqiz3x30k7dvd4v2anzqm1mb9qf045igmmf2bm6q5fm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.3-linux-arm64.tar.gz"; - sha256 = "0xbbfcgsm0w1ik237wdhdvaikmy19k6bclxxg07x3vc03lyfbd7m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-linux-arm64.tar.gz"; + sha256 = "1ih335b7pdjxqvyabhlf9dxabri5w1kjf2x4c310rjglzvyvavr2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; @@ -479,52 +479,52 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.90.0-darwin-arm64.tar.gz"; - sha256 = "1vgm028gc05xjmdgdvpbf7x8r671xzk0wzli23qy513i4rk2hjdf"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.91.1-darwin-arm64.tar.gz"; + sha256 = "1vkxw96hnbkccl91qgis05rrjz4qfxgdrbk8zfffd38bn3407wcg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.1-darwin-arm64.tar.gz"; - sha256 = "09zcxyrpad8iz3yqvrd7g8x61pbk4gqfqa7jgiqnqxmrr1vf8idd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-arm64.tar.gz"; + sha256 = "125l81hghfkj4k4ygspv6fmifrqpn0r14c8pr85fkkninsp71jip"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.0-darwin-arm64.tar.gz"; - sha256 = "0npsl2lfz1fwrlsyyglazmcyjmfm538nazha64q3llib2ymn7y7v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-darwin-arm64.tar.gz"; + sha256 = "1lz73k8v5iixivydvfrwr239sw6i5qx4h7qkd0l3hvbih3v97v6a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.1-darwin-arm64.tar.gz"; - sha256 = "1jd1h6sazx6d6qbfd2qvq7aqsbqhszap5ccxsgsaqypzhdc3xqah"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.44.2-darwin-arm64.tar.gz"; + sha256 = "1prm3b7w0i751rpvwglfkm2wkq24318k2ra8z6rkjsdkcvxa1i5j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.3.0-darwin-arm64.tar.gz"; - sha256 = "01wfscnchz069akmm3nz2ifkl4il26k53i0hnz2i62y86x461fdn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.4.1-darwin-arm64.tar.gz"; + sha256 = "1lpb8l2q4rglynswh0rv5r5qkygw19jh8q951kmg72qwk6prwaly"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.0.0-darwin-arm64.tar.gz"; sha256 = "07f30h74hyg3j9dj78a0al5v9i5n105y52yn362mlyvfh807blml"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.6.0-darwin-arm64.tar.gz"; - sha256 = "1dpwdy7v7l5nw5zvibpc0i4j5kvxha6jifcqzwrgg2qz9r1sgqgn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.7.0-darwin-arm64.tar.gz"; + sha256 = "1n9j6kxb0kfskcah6ayjfdr2ra5sa5cbfnh7h0zyj0gzbr6x54v2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.43.0-darwin-arm64.tar.gz"; - sha256 = "0x9w3c34d96w793phwbcjwfkawsm1kqqcw98v109bnqjprlfz3xy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.44.0-darwin-arm64.tar.gz"; + sha256 = "1v9xk41876gcsgggr3igjj8n8ff3zd5fvqbp81s7g180z1pgsrkk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.13.0-darwin-arm64.tar.gz"; - sha256 = "18gzy9kpz74ycdl988r3mxzxakbd74vn2rl5y3hzlhgyd03vqmfm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-darwin-arm64.tar.gz"; + sha256 = "0asaq5gg22jgq5x2bn89m9qn3jm7cmdhkypdl5barkmccvsbpfg0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.53.0-darwin-arm64.tar.gz"; - sha256 = "07zb9z3n9k6alqx1q4d886z1zlb7mid5swd31gl0qx8szljjxv98"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.54.0-darwin-arm64.tar.gz"; + sha256 = "0vbhskqjrhvg0xgqxhmd0sy4vi6ilf5d2lc107rs9p85gm2sg82n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.0-darwin-arm64.tar.gz"; - sha256 = "0p8hsfr7gk2kinprg1cjbqp01j8f4l2d41jcf6ykzf22qd8gwczw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.13.1-darwin-arm64.tar.gz"; + sha256 = "0069p3sy06r0hhd6jpyn2r36x3za9f6w9i89gpiyc2qzh1hnwcbg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.9.0-darwin-arm64.tar.gz"; - sha256 = "0m5ikqssgj33is9lxplx8ljlmklh7p173gwfvld8izs37pb1xdyw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.10.0-darwin-arm64.tar.gz"; + sha256 = "0q4150r8c31c2bxa7hkc820bhrihxwxkjgrmn5wzgjpjbq3aw5ja"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-darwin-arm64.tar.gz"; @@ -543,48 +543,48 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.3.0-darwin-arm64.tar.gz"; - sha256 = "0nz8w50nfnnx9smf3lk7nqylx4bdpvxk1jr87y8ja1czmp34g2w9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-darwin-arm64.tar.gz"; + sha256 = "16m568zmhfh9y0ynjs789yiawn22r23i1zz9xsrq1kfx8raq94an"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.67.0-darwin-arm64.tar.gz"; sha256 = "0x6ispcwkx15x753zy6awwlykh66qfk5phwdzsy8gw3j1g033a85"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.21.0-darwin-arm64.tar.gz"; - sha256 = "0sg0wmfmn2ldcfmlwbwlpdqrp5ngzfyj5liz30n6xqhsm7jfifvp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-darwin-arm64.tar.gz"; + sha256 = "04svj7zrhwfy5hjccy2dn4a5il793fncj0b83bvkrvh4qcs8c8as"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.4.0-darwin-arm64.tar.gz"; - sha256 = "1jcz3ls4byhkndsssaf0mllckvfamaysqh745hn0msyjqm2q03h1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.5.0-darwin-arm64.tar.gz"; + sha256 = "15vh197lvrbb5x08xxkdsgmjaqq9qvvcm4ncj5xjrm4jaczbpd2a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.31.1-darwin-arm64.tar.gz"; sha256 = "0wcxrcpijn6jzz0l5azfqvh31xzg5q5bvk39iifczimdvw37xnva"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.1-darwin-arm64.tar.gz"; - sha256 = "1f4xnjwbp1qbx0hcym4gxynb4j1vxlj7iqh1naays3ypc4mgnms1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-darwin-arm64.tar.gz"; + sha256 = "0i0lhxzvxvgi695x9g1nnqrzlipsydjsc3xz8zd7n9438pav3cmc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.0-darwin-arm64.tar.gz"; - sha256 = "0mxfcj8b5kjz64g5hmnynqsvay3vpsajhi4ggx09lj9w185ack1d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.3-darwin-arm64.tar.gz"; + sha256 = "0fq8wsrc3pmjpp69ji3bswli532jkkgabr4m2ksgfbqr03qzycnr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.2-darwin-arm64.tar.gz"; - sha256 = "0ggmw0xc132rhcz8vdjyhdmnjcl47dhc89wn67wyr3zqfh2ma596"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.8.3-darwin-arm64.tar.gz"; + sha256 = "0fy2z52055p6cv0jac3rflz9y0sn69b27rp15xab3bd7zq1rs2ql"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz"; - sha256 = "0z0ands2dp6jjy9rbb9rmijlp56m4mrw79f8513kj6nqp1dyalr1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-darwin-arm64.tar.gz"; + sha256 = "0nx02c9fkfrdmgf9jmlhb0h4whqgx8bw4snhz4m9chxygknyg2s2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-arm64.tar.gz"; - sha256 = "0kym9f36h8b7s1smlmgazbzv8jjfpwxk6wv036bhx2xm3ysc7rgp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-darwin-arm64.tar.gz"; + sha256 = "0zpj3qcavx9hby54lbx81sh6fw7gsfjb94jh7xi49n937gra3snc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.13.3-darwin-arm64.tar.gz"; - sha256 = "1xl3i1py3m2fr4haww7jzyj064hcdrb86amnhrjs5ccps02r6gk3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-darwin-arm64.tar.gz"; + sha256 = "0vq8xvx55avph8fr1jykmilivxpmc8zvckmsia1ammqg867ivrlj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-darwin-arm64.tar.gz"; @@ -595,12 +595,12 @@ sha256 = "08llqzf509ds0nbcllpq5k3zl6l656yxx0bx0z9pibd9iwzjy3wj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.37.0-darwin-arm64.tar.gz"; - sha256 = "0i3h26kmkybkni70rb8b19wya7gsq8276zm8sqvy29lysnngl23s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.39.0-darwin-arm64.tar.gz"; + sha256 = "1vk4kdxxx2rk3rhqwgw97xyfl53kxzc209xx8wh1fd3wd676rc2q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.57.0-darwin-arm64.tar.gz"; - sha256 = "1vlbr7yap89bmj7r86jr7nik3mlhr437qbwg3scbc0j72v4463ny"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.58.1-darwin-arm64.tar.gz"; + sha256 = "1gf4p1x0mxv2zjz266inkz468p125wn68ls08az7naf4qmh4j50w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.19.0-darwin-arm64.tar.gz"; @@ -611,24 +611,24 @@ sha256 = "09agrp3sb7mzhwaja4rvz0p25rpsb2n4v3s2kyzcx3pyfyhigvfn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.0-darwin-arm64.tar.gz"; - sha256 = "00svwn4p6gmmk9y53w9k4zl425lv13wmm7v86y627fq7nv8pwkd0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-darwin-arm64.tar.gz"; + sha256 = "0sfbb1m874p04n2qg5w9502r1s2gxdd3lbn9k6xqzdcqi0991vrw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.16.1-darwin-arm64.tar.gz"; sha256 = "1mk1034lp6x9gnal12gbmkfpvjv67a7lqfm38nd4slcnvc5p9x8w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.1-darwin-arm64.tar.gz"; - sha256 = "05z2z3kp68qv513rvva0zifkwx0440dbdsp87ip84gx7qc5ibs1h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-darwin-arm64.tar.gz"; + sha256 = "0xlxx5i1ph57vn5q00hv8s0d5vj5jy3hrrkm7qvmjf47d7flqqv8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.0-darwin-arm64.tar.gz"; - sha256 = "1fvdbw76ax20z9dx3amlmr5b0r28i9d09khbpgdhl83d1j54z15s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.8.1-darwin-arm64.tar.gz"; + sha256 = "0nqyk1jn1d1s5s5kdzfzpqzz44gy6rif0l781jk10fq9lw7bvwld"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.3-darwin-arm64.tar.gz"; - sha256 = "0hw9k17b74b5mni9l9a0l9ab6q08kgmcqd9vyyib2b9p3r0wwdzh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-darwin-arm64.tar.gz"; + sha256 = "14plg6hinzcn1mnmfzpnl8b63j7zj7bkvy4fil1c3iscqj803ci6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/triton/default.nix b/pkgs/tools/admin/triton/default.nix index d5841e92457..fa08d4e4bfd 100644 --- a/pkgs/tools/admin/triton/default.nix +++ b/pkgs/tools/admin/triton/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "triton"; - version = "7.15.4"; + version = "7.16.0"; src = fetchFromGitHub { owner = "TritonDataCenter"; repo = "node-triton"; rev = version; - hash = "sha256-RjYJT8Iw9JZzvd2d9zh2CS27qUx12nDi12k+YuTh7tk="; + hash = "sha256-JjQAf1pbNraatWvrfys3ydqk3FPOoJ5XWJH/4qgfINk="; }; - npmDepsHash = "sha256-2ZTTgJ4LzmlfFoNNNPrrmna5pbREshdw5x9w5N7nasc="; + npmDepsHash = "sha256-E5yJwLSNLkK3OfwJrm59C4qfrd2y3nw/45B68MVBqV8="; dontBuild = true; diff --git a/pkgs/tools/admin/wander/default.nix b/pkgs/tools/admin/wander/default.nix index f1fd58877dd..ae044374874 100644 --- a/pkgs/tools/admin/wander/default.nix +++ b/pkgs/tools/admin/wander/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wander"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "robinovitch61"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EIMHCal4jt8tMEfx2Lol2/7IK8uROaNC1ABB+0d0YTg="; + sha256 = "sha256-zAvPtTUrSHeIMy9MgJviyMvMJ0Ny5Nkx6oLwWPSc9bE="; }; vendorHash = "sha256-SqDGXV8MpvEQFAkcE1NWvWjdzYsvbO5vA6k+hpY0js0="; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index d4147faf960..78adea9d222 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.18.2"; + version = "0.19.1"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-bTShJwzxff+R9GkR72qNzd22zY8LwUUsD8r30kZXAsI="; + hash = "sha256-GYVr/Wam1IGCSR2vHMAu5Fg/jRB333L6iNjltnRKh4E="; }; postPatch = let diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index f8c50fda29c..2c2ea77de6e 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -1,7 +1,7 @@ -{ lib, fetchFromGitHub, pythonPackages, opencv3 }: +{ lib, fetchFromGitHub, pythonPackages, opencv4 }: let - opencv3_ = pythonPackages.toPythonModule (opencv3.override { + opencv4_ = pythonPackages.toPythonModule (opencv4.override { inherit pythonPackages; enablePython = true; enableFfmpeg = true; @@ -19,7 +19,7 @@ in pythonPackages.buildPythonApplication rec { sha256 = "0qzrxqhsxn0h71nfrsi9g78hx3pqm3b8sr6fjq01k4k6dd2nwfam"; }; - propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ]; + propagatedBuildInputs = with pythonPackages; [ opencv4_ midiutil pygame pyopengl ]; installPhase = '' install -Dm755 v2m.py $out/bin/v2m.py diff --git a/pkgs/tools/audio/wyoming/piper-entrypoint.patch b/pkgs/tools/audio/wyoming/piper-entrypoint.patch deleted file mode 100644 index 4f7d09fd40c..00000000000 --- a/pkgs/tools/audio/wyoming/piper-entrypoint.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/setup.py b/setup.py -index 05e42c1..8347acb 100644 ---- a/setup.py -+++ b/setup.py -@@ -41,4 +41,9 @@ setup( - "Programming Language :: Python :: 3.10", - ], - keywords="rhasspy wyoming piper", -+ entry_points={ -+ 'console_scripts': [ -+ 'wyoming-piper = wyoming_piper:__main__.run' -+ ] -+ } - ) -diff --git a/wyoming_piper/__main__.py b/wyoming_piper/__main__.py -index ab1580b..4c0a143 100755 ---- a/wyoming_piper/__main__.py -+++ b/wyoming_piper/__main__.py -@@ -143,8 +143,12 @@ def get_description(voice_info: Dict[str, Any]): - - # ----------------------------------------------------------------------------- - -+def run(): -+ asyncio.run(main()) -+ -+ - if __name__ == "__main__": - try: -- asyncio.run(main()) -+ run() - except KeyboardInterrupt: - pass diff --git a/pkgs/tools/audio/wyoming/piper.nix b/pkgs/tools/audio/wyoming/piper.nix index fbc52a88aa2..f53f684f6fa 100644 --- a/pkgs/tools/audio/wyoming/piper.nix +++ b/pkgs/tools/audio/wyoming/piper.nix @@ -1,24 +1,35 @@ { lib -, python3 -, fetchPypi +, python3Packages +, fetchFromGitHub +, fetchpatch }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "wyoming-piper"; - version = "1.3.2"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; - src = fetchPypi { - pname = "wyoming_piper"; - inherit version; - hash = "sha256-WyoHwIF3xC5nOa7iQ8/esfdwahbU6YJzK5G2Vi3mV4M="; + src = fetchFromGitHub { + owner = "rhasspy"; + repo = "wyoming-piper"; + # https://github.com/rhasspy/wyoming-piper/issues/3 + rev = "560927437c72eca4d334ca503d15863f0b42980d"; + hash = "sha256-Q4S96zs856zXVAGo4mB466an60naHiS2S/qxYxPE4sI="; }; patches = [ - ./piper-entrypoint.patch + (fetchpatch { + # add console script + url = "https://github.com/rhasspy/wyoming-piper/commit/4c27fbd067fd543adede4626fc5868a3f2458734.patch"; + hash = "sha256-YPjDjeY9RLsgCtbBZoNgPyQTv3rbCJGcqTNSSwiqqEE="; + }) ]; - propagatedBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + + propagatedBuildInputs = with python3Packages; [ wyoming ]; @@ -29,8 +40,9 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/rhasspy/wyoming-openwakeword/v${version}/master/CHANGELOG.md"; description = "Wyoming Server for Piper"; - homepage = "https://pypi.org/project/wyoming-piper/"; + homepage = "https://github.com/rhasspy/wyoming-openwakeword"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index abb8f695ebc..7b652bd68aa 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-ywWG/H2ilt36mjlDSgIzYpardCFXpmbLiml6wy47XuA="; }; + postPatch = '' + substituteInPlace Makefile --replace "pkg-config" "$PKG_CONFIG" + ''; + makeFlags = [ "BIN=$(out)/bin" "MAN=$(out)/share/man/man1" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index f32d026ac1c..b13f216b8db 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -1,6 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, libgcrypt -, pkg-config, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite -, util-linux, testers, duperemove }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch2 +, libgcrypt +, pkg-config +, glib +, linuxHeaders ? stdenv.cc.libc.linuxHeaders +, sqlite +, util-linux +, testers +, duperemove +}: stdenv.mkDerivation rec { pname = "duperemove"; @@ -13,6 +23,15 @@ stdenv.mkDerivation rec { hash = "sha256-D3+p8XgokKIHEwZnvOkn7cionVH1gsypcURF+PBpugY="; }; + patches = [ + # Use variable instead of hardcoding pkg-config + # https://github.com/markfasheh/duperemove/pull/315 + (fetchpatch2 { + url = "https://github.com/markfasheh/duperemove/commit/0e1c62d79a9a79d7bb3e80f1bd528dbf7cb75e22.patch"; + hash = "sha256-YMMu6LCkBlipEJALukQMwIMcjQEAG5pjGEGeTW9OEJk="; + }) + ]; + postPatch = '' substituteInPlace util.c --replace \ "lscpu" "${lib.getBin util-linux}/bin/lscpu" diff --git a/pkgs/tools/filesystems/littlefs-fuse/default.nix b/pkgs/tools/filesystems/littlefs-fuse/default.nix index 637e24483d8..736b370fb76 100644 --- a/pkgs/tools/filesystems/littlefs-fuse/default.nix +++ b/pkgs/tools/filesystems/littlefs-fuse/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "littlefs-fuse"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "littlefs-project"; repo = pname; rev = "v${version}"; - hash = "sha256-ybaZbAomrIaEdYfQtbZirkozRarEUxjsf6hgTMu5uIY="; + hash = "sha256-8TrCAByblff2Vkk0MvnIYyAMoFW3s3fm3rLXrEjWoys="; }; buildInputs = [ fuse ]; installPhase = '' diff --git a/pkgs/tools/filesystems/stratisd/Cargo.lock b/pkgs/tools/filesystems/stratisd/Cargo.lock index 1d258d78418..7fbf8fc968f 100644 --- a/pkgs/tools/filesystems/stratisd/Cargo.lock +++ b/pkgs/tools/filesystems/stratisd/Cargo.lock @@ -1149,9 +1149,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.20" +version = "0.37.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" dependencies = [ "bitflags 1.3.2", "errno 0.3.1", @@ -1269,7 +1269,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stratisd" -version = "3.6.0" +version = "3.6.1" dependencies = [ "assert_cmd", "assert_matches", diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index cea2d392ad8..ea519112b1c 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-IDCAhAioFFN4FqgdB6Bp38RG1G3n3NWQTIxK4/1TTFs="; + hash = "sha256-qpuJzsN6AXqvKtKBDZZEmviWBpPR0qNuq+3tIHGSWLs="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index 0a2ebd77099..fdff56a446d 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -17,7 +17,6 @@ , libtiff , ninja , nix-update -, opencv3 , openexr , pkg-config , qtbase @@ -78,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: { libjpeg libtiff libpng - opencv3 openexr graphicsmagick curl diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 56fe4e122e5..f936ab83fb5 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -1,4 +1,4 @@ -{ cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers, OpenCL +{ cmake, fetchFromGitHub, makeWrapper, opencv4, lib, stdenv, ocl-icd, opencl-headers, OpenCL , config , cudaSupport ? config.cudaSupport, cudatoolkit ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - opencv3 + opencv4 ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional stdenv.isDarwin OpenCL ++ lib.optionals stdenv.isLinux [ ocl-icd opencl-headers ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index b41dd761661..52b50b7cbb4 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.24.2"; + version = "2.24.4"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-h/8fFo7X5p6loDKxcPjOYWg1P0m0tVqR2IX/QSfvrzQ="; + hash = "sha256-f/KtHm8R1MJORWKmv487hm80MeX2l0Ybd1ZjKHGFq0A="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/tools/llm/heygpt/default.nix b/pkgs/tools/llm/heygpt/default.nix index 053f5b90e8b..3ec475c7647 100644 --- a/pkgs/tools/llm/heygpt/default.nix +++ b/pkgs/tools/llm/heygpt/default.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "heygpt"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "fuyufjh"; repo = pname; rev = "v${version}"; - hash = "sha256-Gtbb0G7tV+cjbq/74dnZKIwWZgNfSJl0My6F4OmAdhU="; + hash = "sha256-gTyjj7NND5IYtnXhc454cWSzhAE+DwfPRGEWrHH+GNM="; }; - cargoSha256 = "sha256-ON6+gU+KsI2QFQjwxPRcbMClaAGrjVJ33mVuf0jSro8="; + cargoHash = "sha256-yKHAZpELuUD7wlM3Mi7XvxbKgdU1QxD9hsvIFcj3twE="; nativeBuildInputs = [openssl]; diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 6276d50c73d..891bea3fe47 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, cmake, pkg-config, perl, go, python3 +, cmake, ninja, pkg-config, perl, go, python3 , protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 }: @@ -9,33 +9,17 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "34.0.1"; + version = "34.0.4"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - hash = "sha256-YCNOy8oZoXp+L0akWBlg1kW3xVuHDZJKIUlMdqb1SOw="; + hash = "sha256-eiL/nOqB/0849WBoeFjo+PtzNiRBJZfjzBqwJi+No6E="; }; - patches = [ - # Fix building with newer protobuf versions. - (fetchurl { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/android-tools/-/raw/295ad7d5cb1e3b4c75bd40281d827f9168bbaa57/protobuf-23.patch"; - hash = "sha256-KznGgZdYT6e5wG3gtfJ6i93bYfp/JFygLW/ZzvXUA0Y="; - }) - ]; - - # Fix linking with private abseil-cpp libraries. - postPatch = '' - sed -i '/^find_package(Protobuf REQUIRED)$/i find_package(protobuf CONFIG)' vendor/CMakeLists.txt - ''; - - nativeBuildInputs = [ cmake pkg-config perl go ]; + nativeBuildInputs = [ cmake ninja pkg-config perl go ]; buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; propagatedBuildInputs = [ pythonEnv ]; - # Don't try to fetch any Go modules via the network: - GOFLAGS = [ "-mod=vendor" ]; - preConfigure = '' export GOCACHE=$TMPDIR/go-cache ''; diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix index 27e38475978..4a0a4fe0a99 100644 --- a/pkgs/tools/misc/boxxy/default.nix +++ b/pkgs/tools/misc/boxxy/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-vggerp66ALH7aqC6daH1a82ajJg5ZmEZTqC98IHhzFU="; + hash = "sha256-BxI2Ju1I1IytCjx6vUoIy1jzebSeRmoObDEtN/sBEDg="; }; - cargoHash = "sha256-nKuxeVFCc4Etl5x5vgpCXbU7WkLVaL9wRCVSWhffPzU="; + cargoHash = "sha256-ZEQsCm13MoFtpIjjtD5UANH5zrPDX4IjEmqJLwnftps="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 39790d65381..de0fd1a1155 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.26.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-IqDcE6P4DSH/A4TKzPoLZsO00t0zGPCutM0yVI41nrM="; + hash = "sha256-yZsb/G+8XoJS4Fg6WFuEk1v3Ht5i3G3p+sKi+Z3jeGU="; }; - cargoHash = "sha256-Lo/O/q2kGioWxkRJ/c9jWAHSm2Y839RsK4NM4qP576c="; + cargoHash = "sha256-xHmrFIXXkuhYGApgNoJxcL1Kpf8ellwQgiH8AEZvDRU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 0a5bc1cec7c..903f923b5d8 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -4,9 +4,8 @@ , autoreconfHook , pkg-config , glib -, i2c-tools +, jansson , udev -, kmod , libgudev , libusb1 , libdrm @@ -15,23 +14,23 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.4.2"; + version = "2.0.0"; src = fetchurl { url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz"; - hash = "sha256-wGwTZheRHi5pGf6WB9hGd8m/pLOmnlYYrS5dd+QItAQ="; + hash = "sha256-CunFRQHKk3q8CU60TSRnRoCW7+9X1+JpJHm773HhmZs="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib - i2c-tools - kmod + jansson libdrm libgudev libusb1 udev + xorg.libXext xorg.libXrandr ]; diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 958738478ba..ef6e0f1de6e 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.4"; + version = "2023.10.5"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rDq6uudT1kW97TiE9FswfgzLlNPTo8+YjD7HEvbrMn0="; + hash = "sha256-I/VA1/vw0WrTsLC1F3IrKYf8lmTJHLG/RYj3VcJx+Zc="; }; postPatch = '' diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 28e4a4df847..77eeaeaf670 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-v/dFynTESqRWAxu5Wz0/EroXuwmNj3EEPJxzpfTGKtk="; + hash = "sha256-H2iIL41h3o8184S/XMYAuIDPVJPm+zSI/YX8FT8vLio="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 563b35d665b..01f35bd8c65 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.33.1"; + version = "0.34.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - hash = "sha256-MnsA7zZ3T0L80dgCUj4F/F9IKTzADs65esM1DdgQeSU="; + hash = "sha256-JgeajCubRz9hR6uvRAw1HXdKa6Ua+l/Im/bYXdx1gL0="; }; - cargoHash = "sha256-xBoTzDeMmkSExOjD588l1vy73lbkzb60V4Fd4zhrU8c="; + cargoHash = "sha256-mEgFfg8I+JJuUEvj+sia2aL3BVg3HteQorZ2EOiLo64="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit diff --git a/pkgs/tools/misc/fw/default.nix b/pkgs/tools/misc/fw/default.nix index 7cb9be3ccb5..0c79edc0429 100644 --- a/pkgs/tools/misc/fw/default.nix +++ b/pkgs/tools/misc/fw/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fw"; - version = "2.17.1"; + version = "2.18.0"; src = fetchFromGitHub { owner = "brocode"; repo = "fw"; rev = "v${version}"; - hash = "sha256-8Jq7VjTKwq8n9lrwTzazkkrq8/mNacFTwz/M+eAwBWM="; + hash = "sha256-8PcIaSXmk6/p5N6L2/nLrFS6JUZRRJsN2mKQYtevS6s="; }; - cargoHash = "sha256-tIrACx4KRjfxLyxTiP32PpdN8NegaHBIkINsPGgygVQ="; + cargoHash = "sha256-l6mRjVk3qNAxfNqcKGo2dceD2Xb+hk+xMvdh/U1jZXw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/gh-actions-cache/default.nix b/pkgs/tools/misc/gh-actions-cache/default.nix index 4c80d032ab1..8bc735f4e52 100644 --- a/pkgs/tools/misc/gh-actions-cache/default.nix +++ b/pkgs/tools/misc/gh-actions-cache/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gh-actions-cache"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "actions"; repo = "gh-actions-cache"; rev = "v${version}"; - hash = "sha256-5iCj6z4HCMVFeplb3dGP/V60z6zMUnUPVBMnPi4yU1Q="; + hash = "sha256-GVha3xxLTBTiKfAjGb2q9btsGYzWQivGLyZ4Gg0s/N0="; }; - vendorHash = "sha256-i9akQ0IjH9NItjYvMWLiGnFQrfZhA7SOvPZiUvdtDrk="; + vendorHash = "sha256-4/Zt+ga3abEPtR0FjWIsDpOiG1bfVtVuLuXP8aHbzqk="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 26c0acdef4d..7fc02624db6 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.29"; + version = "0.10.30"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-xtxTIC7DNTvcDMXtFJOJkJGn78HdzCWVrBMS5Ksmtcc="; + sha256 = "sha256-YHhaOf2MNrFHv29pEnhkOjFH30Mi5Oi6gYkSH6PZhU4="; }; - vendorHash = "sha256-ZKRtUlrEk/W2qZSbsh0ddwmspH6quzzY0cFSQmO0i10="; + vendorHash = "sha256-yjPtNTfkL8+fkmXW98SnpboMqdsjQYCif65sn0jjLgc="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/tools/misc/mapcidr/default.nix index 00abf2e5630..2cb179fac94 100644 --- a/pkgs/tools/misc/mapcidr/default.nix +++ b/pkgs/tools/misc/mapcidr/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mapcidr"; - version = "1.1.11"; + version = "1.1.14"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gi1saAav8VrlssXW8ezLAze2kp1hnATd3RCIZUspEcM="; + hash = "sha256-Vhh/OS61dfArsowXMogr/bu/gg354nte9PuobD9lCaU="; }; - vendorHash = "sha256-9mX+EUeLp4zpVHAzdlmrr31vjWjG1VjHwSDwbTxMufM="; + vendorHash = "sha256-wqbAOoRQEE7CDmaH5MRzsSKOdyrxwBY/1wDz3MCfsBc="; modRoot = "."; subPackages = [ diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index cf2b84a9c50..9b223c12f8f 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils, buildPackages }: +{ fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils, gawk, buildPackages }: stdenv.mkDerivation rec { pname = "parallel"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/parallel \ - --prefix PATH : "${lib.makeBinPath [ procps perl coreutils ]}" + --prefix PATH : "${lib.makeBinPath [ procps perl coreutils gawk ]}" ''; doCheck = true; diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/tools/misc/twm/default.nix index 68a58d04602..3f08d53fd45 100644 --- a/pkgs/tools/misc/twm/default.nix +++ b/pkgs/tools/misc/twm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "twm"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "vinnymeller"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q8WdNmO5uSm4PvitBXQ7YEkjJhlCz4qfJO/F6+XckXY="; + sha256 = "sha256-icJQSPt3733H5pIdnpC/Vx+u6LgwokCdbvE3wvDkIlw="; }; - cargoHash = "sha256-fxDUUfC7mBgVHN+M6pb5leRp28wzO69ZdStdYmQFxQE="; + cargoHash = "sha256-DxT3Wsiy4zVlTSJwHqV/McSi/pc9pB0wyWY54fj1zVE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix index abc36f63bd0..66e4ca5125c 100644 --- a/pkgs/tools/misc/wakapi/default.nix +++ b/pkgs/tools/misc/wakapi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wakapi"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-uTDvipz08hrdFB/gAoxVp4Eesh57HOFUG4AD/5T33H8="; + sha256 = "sha256-BRIcStqRzwoFG9HkWBpfumeCzbrSI0Hg//a0iDQtNw8="; }; vendorHash = "sha256-SqkE4vTT+QoLhKrQcGa2L5WmD+fCX7vli4FjgwLnqjg="; @@ -16,6 +16,9 @@ buildGoModule rec { # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; + # Fix up reported version + postPatch = ''echo ${version} > version.txt''; + ldflags = [ "-s" "-w" diff --git a/pkgs/tools/networking/findomain/Cargo.lock b/pkgs/tools/networking/findomain/Cargo.lock index 07b8e2894bb..81f9d4667a6 100644 --- a/pkgs/tools/networking/findomain/Cargo.lock +++ b/pkgs/tools/networking/findomain/Cargo.lock @@ -609,7 +609,7 @@ dependencies = [ [[package]] name = "findomain" -version = "9.0.1" +version = "9.0.3" dependencies = [ "addr", "anyhow", diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 1f5d4c8b01a..636dcc70946 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "9.0.2"; + version = "9.0.3"; src = fetchFromGitHub { owner = "findomain"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CFnjZHTga70+b7XUdxGC/ycqY2snkLvFKPApTRlN11s="; + hash = "sha256-M6i62JI4HjaM0C2rSK8P5O19JeugFP5xIy1E6vE8KP4="; }; cargoLock = { diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 8675e3e6959..a1db32558aa 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "3.19.0"; + version = "3.20.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-zDLL+3k6/Jgq/pflpmjuLcfPzvDl0LQLQklW+kOvtQg="; + sha256 = "sha256-kdeDV8IWbfeC6KDgJtOl1NX6jwvxiaIdGAYtrDuYFdI="; }; - vendorHash = "sha256-8qEGp95y8iBIJXCTh2Pa/JwiruZVVIjHLwaZqwFZMl8="; + vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index 7919698f53d..f79092164c7 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.59.1"; + version = "1.59.2"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-4bou7oFQOgyxjFqJdmiFT8xEMCsOap9v34W6SPrT4WQ="; + hash = "sha256-ZWVXoup+gpELOsdCg36swiJFeDdioR/cHkDV68OWsso="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix index a00f851c24d..d1b0ad03c30 100644 --- a/pkgs/tools/networking/kapp/default.nix +++ b/pkgs/tools/networking/kapp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kapp"; - version = "0.59.0"; + version = "0.59.1"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "kapp"; rev = "v${version}"; - sha256 = "sha256-I+BXKJvilrYvSi2xevZKFE49emghg19dCpW/bbIcZ8o="; + sha256 = "sha256-0fvcBJzJB3o9gQiFfm9+qGTWcoJY2X4AR2XR8RRjerg="; }; vendorHash = null; diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index d02acb3100a..fb373fb5029 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -10,6 +10,7 @@ , libxslt , curl , libevent +, fetchpatch }: stdenv.mkDerivation rec { @@ -23,6 +24,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-PAX2MUyBWWU8kGkaeoCJteidgszh7ipwDJbrLXzVsn0="; }; + patches = [ + (fetchpatch { + name = "update-waf-to-2-0-24.patch"; + url = "https://github.com/saldl/saldl/commit/360c29d6c8cee5f7e608af42237928be429c3407.patch"; + hash = "sha256-RBMnsUtd0BaZe/EXypDCK4gpUU0dgucWmOcJRn5/iTA="; + }) + ]; + nativeBuildInputs = [ pkg-config wafHook diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 460f6f4e039..d010e520be2 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,23 +11,22 @@ buildGoModule rec { pname = "sing-box"; - version = "1.5.4"; + version = "1.6.0"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-XOp8kdF5UcmWrU43WfHk0EI8E+dPxgR2Ck5yC2ANcWI="; + hash = "sha256-buYI/WCVwjN5iSmyT1sM969oFuOPxaEjK5CwrLuX7/o="; }; - vendorHash = "sha256-ng+6fxmwjRIXuH6xDY9JFefMtlMJqaNlfCET9YRuK3k="; + vendorHash = "sha256-gEUYR7nfmaAcm9qJt8q0IFd/EECHbxuWYZIU+nVs100="; tags = [ "with_quic" "with_grpc" "with_dhcp" "with_wireguard" - "with_shadowsocksr" "with_ech" "with_utls" "with_reality_server" diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index e7589862e51..8db0ed674b4 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wavemon"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "uoaerg"; repo = "wavemon"; rev = "v${version}"; - sha256 = "0s3yz15vzx90fxyb8bgryksn0cr2gpz9inbcx4qjrgs7zfbm4pgh"; + sha256 = "sha256-MvIFuPATI0Y7aIYZkb2Yr+iCco4gILHhDU5FWeMCk5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch b/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch deleted file mode 100644 index b4edc6a8387..00000000000 --- a/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN a/src/defaults/defaults_linux.go b/src/defaults/defaults_linux.go ---- a/src/defaults/defaults_linux.go 2019-06-17 10:23:09.495613784 -0700 -+++ b/src/defaults/defaults_linux.go 2019-07-01 10:17:11.295669440 -0700 -@@ -7,7 +7,7 @@ - func GetDefaults() platformDefaultParameters { - return platformDefaultParameters{ - // Admin -- DefaultAdminListen: "unix:///var/run/yggdrasil.sock", -+ DefaultAdminListen: "unix:///var/run/yggdrasil/yggdrasil.sock", - - // Configuration (used for yggdrasilctl) - DefaultConfigFile: "/etc/yggdrasil.conf", diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index bc6c2be1060..dff2375199e 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -31,13 +31,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.9.3"; + version = "2.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CxGVtR6WMLWgsGPyffywEgy26ihPGkzZdaOibwhW0lM="; + hash = "sha256-ziJJWVr59hsJJqCJljLfSbHHESYegFak+uFLU/k9kZM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix index b9ac5d4ada0..e737173a857 100644 --- a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix +++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "poetry-plugin-up"; - version = "0.4.0"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "MousaZeidBaker"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ENw+6DdQkRLnAlIuIEdZzIsFP7ILqA9WatlVZYNJSxw="; + hash = "sha256-RjyRnCrHLKBJm8WMzQd0WcfpO8Ve+ydvUTN4EnVunlI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 2188cf99a3c..3f0daa8d945 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - hash = "sha256-l6GS3/4UFIC1bKvxBj15qfxVzVkgMkH6Qb/HqYpUgCA="; + hash = "sha256-mhT+hwy7j1959mi3idyg8lzGviKr4y9PfTZ35O45NbA="; }; patches = [ diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 4212d86afb9..a227705ec8d 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-26"; + version = "2023-11-02"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-P+T3TM2MeHaN+ApgOMEFmyWv+AzQshVUfhbI+n/vozs="; + hash = "sha256-7j2HIYEYs1OcB919S3lLGYNsJzbkE3jIqq2MNCHG3lY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 4bcc379c5c9..ec29abdb614 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-DayYelnimsIvM5zkUoCQcS3TiZi81MDjvys/5M2xc48="; + hash = "sha256-oLx8fyFmK6SyFLw4yDwa+z5CpuAqebQdEH3JCbt9cg0="; }; - vendorHash = "sha256-aUQc8dv3IHTIgeg8YHcoMbT2EzBoqCj4ST2113tg73Q="; + vendorHash = "sha256-QggYz5vAzhqagYIRCa7R09px8qXaqsTcj659XIV/LR4="; subPackages = [ "cmd/httpx" diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index ebc1ca5922e..79cb5f4def8 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.42"; + version = "1.0.43"; format = "setuptools"; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-kXXZU4/nWUKAFJbcp9PFyPUxd+fRXJb6JbS/fybHh3g="; + hash = "sha256-JuhpfgKk+qb5halKpjlSWJGtuNA/QgELJnFqka33nlU="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 719091e6d9a..99481a946b5 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.39" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.40" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d9488beb178..0441b9c8268 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 77fb7ae14f17fd7f4851bca87e0c28c704797591 - ref: refs/tags/6.3.39 + revision: e4a23dc9d09f5b6b1b82768770e8063014a940bb + ref: refs/tags/6.3.40 specs: - metasploit-framework (6.3.39) + metasploit-framework (6.3.40) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -462,4 +462,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.4.19 + 2.4.20 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index d50d8760e21..433d49e237b 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.39"; + version = "6.3.40"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-EKLzIhrNiTUM3OtezPJL8g70BmR+vEyNcllyme5hH8o="; + sha256 = "sha256-vGCAkXLpsUvSXDf1H3pNStEYUZwFBxJnA7kdNJjqYwo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 631d9f8c4dd..f5d060dd965 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -654,12 +654,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "77fb7ae14f17fd7f4851bca87e0c28c704797591"; - sha256 = "1jhzc7p9jwjrfa6lrg3ych3g83pj9grcqppbvh63b2fd38ig78hh"; + rev = "e4a23dc9d09f5b6b1b82768770e8063014a940bb"; + sha256 = "02k3xac387dr0dki41q5ki8iilaa9mx1zx9pbk94pcg9fa8q0q5w"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.39"; + version = "6.3.40"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index bbed9910f25..af052e3831e 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.7.7"; + version = "0.7.8"; format = "pyproject"; src = fetchFromGitHub { owner = "SigmaHQ"; - repo = pname; + repo = "sigma-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Qqe9nJZfCb7xh93ERrV3XpqdtfeRECt7RDca9eQU3eQ="; + hash = "sha256-HvT2B0pahQbwa0atN2o9rc93QkCIaPttV859wOyHQzY="; }; postPatch = '' @@ -50,6 +50,11 @@ python3.pkgs.buildPythonApplication rec { "test_plugin_install_notexisting" "test_plugin_install" "test_plugin_uninstall" + # Tests require network access + "test_check_with_issues" + "test_plugin_show_identifier" + "test_plugin_show_nonexisting" + "test_plugin_show_uuid" ]; pythonImportsCheck = [ @@ -59,6 +64,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Sigma command line interface"; homepage = "https://github.com/SigmaHQ/sigma-cli"; + changelog = "https://github.com/SigmaHQ/sigma-cli/releases/tag/v${version}"; license = with licenses; [ lgpl21Plus ]; maintainers = with maintainers; [ fab ]; mainProgram = "sigma"; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index e510bf2e2b2..424f5811a48 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.61.0"; + version = "3.62.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-thUDdfNSQHybP5y03Jh94u8lHlj0FSuJP+U+d1OqKI8="; + hash = "sha256-dDz8czTYRxmhyFaYuSoqnBwT7lMZDENBuH+F0HpaouE="; }; - vendorHash = "sha256-KEU2G5x2d0N+H8p9MXL9yzK1lC0YqWuuxcLw/cboUzs="; + vendorHash = "sha256-+Boe/bzCsmihspGqmiJ3jOcRJ9KPjkzu6MBmgtAgwjE="; ldflags = [ "-s" diff --git a/pkgs/tools/security/xsubfind3r/default.nix b/pkgs/tools/security/xsubfind3r/default.nix index 9ca2d3457a0..6ec445696bf 100644 --- a/pkgs/tools/security/xsubfind3r/default.nix +++ b/pkgs/tools/security/xsubfind3r/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "xsubfind3r"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "hueristiq"; repo = "xsubfind3r"; rev = "refs/tags/${version}"; - hash = "sha256-DY9/qcE8Ryue6NEWglM1F+xd669DPBIgt743ta+O//4="; + hash = "sha256-Xlxn9IZ9TTDzkEkyBoBwrS9AdQX21mmHngm03w+c4UM="; }; - vendorHash = "sha256-dFjyeIiDGdGTlZoZvsW9cwb+urS0NRxBMFf3+Y+rsAE="; + vendorHash = "sha256-DkYQkuhBAYnGx9gxi2X/Coh0FYV+z5/4IX1zTfUM6uI="; ldflags = [ "-s" diff --git a/pkgs/tools/system/ttop/default.nix b/pkgs/tools/system/ttop/default.nix index 6fcef00ec2f..ceea0e215b1 100644 --- a/pkgs/tools/system/ttop/default.nix +++ b/pkgs/tools/system/ttop/default.nix @@ -2,14 +2,14 @@ nimPackages.buildNimPackage (finalAttrs: { pname = "ttop"; - version = "1.2.6"; + version = "1.2.7"; nimBinOnly = true; src = fetchFromGitHub { owner = "inv2004"; repo = "ttop"; rev = "v${finalAttrs.version}"; - hash = "sha256-rTvEL9MkRJuynu50g8TXitYKnfXsa6PpkfEDaX0nfJs="; + hash = "sha256-oPdaUqh6eN1X5kAYVvevOndkB/xnQng9QVLX9bu5P5E="; }; buildInputs = with nimPackages; [ asciigraph illwill jsony parsetoml zippy ]; diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index 6a004253a4f..2f7b25d5fa2 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ispell"; - version = "3.4.05"; + version = "3.4.06"; src = fetchurl { url = "https://www.cs.hmc.edu/~geoff/tars/${pname}-${version}.tar.gz"; - sha256 = "sha256-zwxt7eP9JfraQ3XYasr+WDy5bY/lRt50apLrtt+JVgI="; + sha256 = "sha256-F8kWM9TIB1rMUDFjoWRj/FSrHHRTKArTnNPbdceD66Y="; }; buildInputs = [ bison ncurses ]; diff --git a/pkgs/tools/text/ripgrep-all/Cargo.lock b/pkgs/tools/text/ripgrep-all/Cargo.lock new file mode 100644 index 00000000000..381a1e62b84 --- /dev/null +++ b/pkgs/tools/text/ripgrep-all/Cargo.lock @@ -0,0 +1,2195 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +dependencies = [ + "backtrace", +] + +[[package]] +name = "async-compression" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +dependencies = [ + "bzip2", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "xz2", + "zstd 0.11.2+zstd.1.5.2", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "async-compression" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11" +dependencies = [ + "brotli", + "bzip2", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", + "tokio", + "xz2", + "zstd 0.12.3+zstd.1.5.2", + "zstd-safe 6.0.5+zstd.1.5.4", +] + +[[package]] +name = "async-recursion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[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.16", +] + +[[package]] +name = "async-trait" +version = "0.1.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[package]] +name = "async_zip" +version = "0.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2105142db9c6203b9dadc83b0553394589a6cb31b1449a3b46b42f47c3434d0" +dependencies = [ + "async-compression 0.3.15", + "chrono", + "crc32fast", + "log", + "pin-project", + "thiserror", + "tokio", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.6.2", + "object", + "rustc-demangle", +] + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" + +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[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 = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "winapi", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim 0.8.0", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "clap" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +dependencies = [ + "anstream", + "anstyle", + "bitflags 1.3.2", + "clap_lex", + "strsim 0.10.0", + "terminal_size", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[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-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ctor" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" +dependencies = [ + "quote", + "syn 2.0.16", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "directories-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dyn-clonable" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e9232f0e607a262ceb9bd5141a3dfb3e4db6994b31989bbfd845878cba59fd4" +dependencies = [ + "dyn-clonable-impl", + "dyn-clone", +] + +[[package]] +name = "dyn-clonable-impl" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "dyn-clone" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" + +[[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 = "encoding_rs_io" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[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 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "filetime" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide 0.7.1", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[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.16", +] + +[[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-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +dependencies = [ + "typenum", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "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 = "hashlink" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" +dependencies = [ + "hashbrown 0.13.2", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "iana-time-zone" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +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 = "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 = "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 0.3.1", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json_comments" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ee439ee368ba4a77ac70d04f14015415af8600d6c894dc1f11bd79758c57d5" + +[[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.144" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" + +[[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 = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "lzma-sys" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "memchr" +version = "2.5.0" +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 = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.45.0", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" +dependencies = [ + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +dependencies = [ + "autocfg", + "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.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "windows-sys 0.45.0", +] + +[[package]] +name = "paste" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" + +[[package]] +name = "path-clean" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[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.16", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "pretty-bytes" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009d6edd2c1dbf2e1c0cd48a2f7766e03498d49ada7109a01c6911815c685316" +dependencies = [ + "atty", + "getopts", +] + +[[package]] +name = "pretty_assertions" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +dependencies = [ + "ctor 0.1.26", + "diff", + "output_vt100", + "yansi", +] + +[[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.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "ripgrep_all" +version = "1.0.0-alpha.5" +dependencies = [ + "anyhow", + "async-compression 0.4.0", + "async-recursion", + "async-stream", + "async-trait", + "async_zip", + "bincode", + "bytes", + "clap 4.3.0", + "crossbeam", + "crossbeam-channel", + "ctor 0.2.0", + "derive_more", + "directories-next", + "dyn-clonable", + "dyn-clone", + "encoding_rs", + "encoding_rs_io", + "env_logger", + "glob", + "json_comments", + "lazy_static", + "log", + "memchr", + "paste", + "path-clean", + "pretty-bytes", + "pretty_assertions", + "regex", + "rusqlite", + "schemars", + "serde", + "serde_json", + "size_format", + "structopt", + "tempfile", + "tokio", + "tokio-rusqlite", + "tokio-stream", + "tokio-tar", + "tokio-test", + "tokio-util", + "tree_magic_mini", +] + +[[package]] +name = "rusqlite" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +dependencies = [ + "bitflags 2.3.1", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[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.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "schemars" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +dependencies = [ + "dyn-clone", + "indexmap", + "schemars_derive", + "serde", + "serde_json", +] + +[[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.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" + +[[package]] +name = "serde" +version = "1.0.163" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.163" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[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.96" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[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 = "size_format" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed5f6ab2122c6dec69dca18c72fa4590a27e581ad20d44960fe74c032a0b23b" +dependencies = [ + "generic-array", + "num", +] + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap 2.34.0", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck", + "proc-macro-error", + "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.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +dependencies = [ + "rustix", + "windows-sys 0.48.0", +] + +[[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.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[package]] +name = "tokio" +version = "1.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +dependencies = [ + "autocfg", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", +] + +[[package]] +name = "tokio-rusqlite" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aa66395f5ff117faee90c9458232c936405f9227ad902038000b74b3bc1feac" +dependencies = [ + "crossbeam-channel", + "rusqlite", + "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", + "tokio-util", +] + +[[package]] +name = "tokio-tar" +version = "0.3.1" +source = "git+https://github.com/vorot93/tokio-tar#3b753b6fc2304cdd38fad04002e41e29d4edce0a" +dependencies = [ + "filetime", + "futures-core", + "libc", + "redox_syscall 0.2.16", + "tokio", + "tokio-stream", + "xattr", +] + +[[package]] +name = "tokio-test" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[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-io", + "futures-sink", + "futures-util", + "hashbrown 0.12.3", + "pin-project-lite", + "slab", + "tokio", + "tracing", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tree_magic_mini" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91adfd0607cacf6e4babdb870e9bec4037c1c4b151cfd279ccefc5e0c7feaa6d" +dependencies = [ + "bytecount", + "fnv", + "lazy_static", + "nom", + "once_cell", + "petgraph", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "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 = "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.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.16", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.16", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" + +[[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" +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 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]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.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]] +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.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 = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "xz2" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" +dependencies = [ + "lzma-sys", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[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 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +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.5+zstd.1.5.4", +] + +[[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-safe" +version = "6.0.5+zstd.1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +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/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index d25d068b7e0..d4144698c40 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -1,51 +1,42 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg -, pandoc, poppler_utils, ripgrep, Security, imagemagick, tesseract3 +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, makeWrapper +, ffmpeg +, pandoc +, poppler_utils +, ripgrep +, Security +, zip }: rustPlatform.buildRustPackage rec { pname = "ripgrep-all"; - version = "0.9.6"; + version = "1.0.0-alpha.5"; src = fetchFromGitHub { owner = "phiresky"; repo = pname; rev = "v${version}"; - sha256 = "1wjpgi7m3lxybllkr3r60zaphp02ykq2syq72q9ail2760cjcir6"; + sha256 = "sha256-fpDYzn4oAz6GJQef520+Vi2xI09xFjpWdAlFIAVzcoA="; }; - cargoSha256 = "1l71xj5crfb51wfp2bdvdqp1l8kg182n5d6w23lq2wjszaqcj7cw"; - nativeBuildInputs = [ makeWrapper ]; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tokio-tar-0.3.1" = "sha256-gp4UM6YV7P9k1FZxt3eVjyC4cK1zvpMjM5CPt2oVBEA="; + }; + }; + + nativeBuildInputs = [ makeWrapper poppler_utils ]; buildInputs = lib.optional stdenv.isDarwin Security; postInstall = '' wrapProgram $out/bin/rga \ - --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep imagemagick tesseract3 ]}" - ''; - - # Use upstream's example data to run a couple of queries to ensure the dependencies - # for all of the adapters are available. - installCheckPhase = '' - set -e - export PATH="$PATH:$out/bin" - - test1=$(rga --rga-no-cache "hello" exampledir/ | wc -l) - test2=$(rga --rga-no-cache --rga-adapters=tesseract "crate" exampledir/screenshot.png | wc -l) - - if [ $test1 != 26 ] - then - echo "ERROR: test1 failed! Could not find the word 'hello' 26 times in the sample data." - exit 1 - fi - - if [ $test2 != 1 ] - then - echo "ERROR: test2 failed! Could not find the word 'crate' in the screenshot." - exit 1 - fi + --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep zip ]}" ''; - doInstallCheck = true; - meta = with lib; { description = "Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, and more"; longDescription = '' diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/tools/text/scraper/default.nix index 7c5b1a89b25..05c4957f27d 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.18.0"; + version = "0.18.1"; src = fetchCrate { inherit pname version; - hash = "sha256-/OVUtRQH6Sc0TggN8UEA1GhVD4dXv8h5MFAXswgwSFE="; + hash = "sha256-fnX2v7VxVFgn9UT1+qWBvN+oDDI2DbK6UFKmby5aB5c="; }; - cargoHash = "sha256-zi6Jgibrx5kckqTj4nHBtiCFuHYmz4cyMwFkNQ6VXjc="; + cargoHash = "sha256-HeT3U4H/OM/91BdXTvZq+gpmOnt/P4wTlqc2dl4erlQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/typesetting/biber-ms/default.nix b/pkgs/tools/typesetting/biber-ms/default.nix index 53bd708c23b..f5c161fe2cb 100644 --- a/pkgs/tools/typesetting/biber-ms/default.nix +++ b/pkgs/tools/typesetting/biber-ms/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchurl, perlPackages, shortenPerlShebang, texlive }: let - biberSource = lib.head (builtins.filter (p: p.tlType == "source") texlive.biber-ms.pkgs); + biberSource = texlive.pkgs.biber-ms.texsource; # missing test file multiscriptBltxml = (fetchFromGitHub { owner = "plk"; @@ -12,8 +12,7 @@ let in perlPackages.buildPerlModule { - pname = "biber-ms"; - inherit (biberSource) version; + inherit (biberSource) pname version; src = "${biberSource}/source/bibtex/biber-ms/biblatex-biber-ms.tar.gz"; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index bf4740802be..b09a4b092f9 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, perlPackages, shortenPerlShebang, texlive }: let - biberSource = lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs); + biberSource = texlive.pkgs.biber.texsource; in perlPackages.buildPerlModule { - pname = "biber"; - inherit (biberSource) version; + inherit (biberSource) pname version; src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz"; diff --git a/pkgs/tools/typesetting/hayagriva/default.nix b/pkgs/tools/typesetting/hayagriva/default.nix index 522dbad6d51..6723e1acecd 100644 --- a/pkgs/tools/typesetting/hayagriva/default.nix +++ b/pkgs/tools/typesetting/hayagriva/default.nix @@ -5,17 +5,25 @@ rustPlatform.buildRustPackage rec { pname = "hayagriva"; - version = "0.3.2"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - hash = "sha256-4HX0X8HDn0/D9mcruCVKeIs9ryCxYagW5eJ/DSqtprY="; + hash = "sha256-d4T+GF0bdMjpjwcN56yYpEw4aZCvJ19P1cbPuVhFR0A="; }; - cargoHash = "sha256-JvRWdoZ5/jG09ex7avkE3JUcdMGIsfirSx9PDyAtVfU="; + cargoHash = "sha256-mRKvCnW4XVXYzOKQ5rASwiwpLdqpEgGlq8W4gB7hHco="; buildFeatures = [ "cli" ]; + checkFlags = [ + # requires internet access + "--skip=try_archive" + + # requires a separate large repository + "--skip=csl::tests::test_csl" + ]; + meta = with lib; { description = "Work with references: Literature database management, storage, and citation formatting"; homepage = "https://github.com/typst/hayagriva"; diff --git a/pkgs/tools/typesetting/tex/mftrace/default.nix b/pkgs/tools/typesetting/tex/mftrace/default.nix index 4b8a0350c8b..7acc7c81b28 100644 --- a/pkgs/tools/typesetting/tex/mftrace/default.nix +++ b/pkgs/tools/typesetting/tex/mftrace/default.nix @@ -43,11 +43,7 @@ stdenv.mkDerivation (finalAttrs: rec { # experimental texlive.combine support # (note that only the bin/ folder will be combined into texlive) - passthru = { - tlType = "bin"; - tlDeps = with texlive; [ kpathsea t1utils metafont ]; - pkgs = [ finalAttrs.finalPackage ]; - }; + passthru.tlDeps = with texlive; [ kpathsea t1utils metafont ]; meta = with lib; { description = "Scalable PostScript Fonts for MetaFont"; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index ff4adcb78d2..402c0c247e9 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -355,7 +355,7 @@ pygmentex = python3Packages.buildPythonApplication rec { inherit (src) version; format = "other"; - src = assertFixedHash pname (lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs)); + src = assertFixedHash pname texlive.pkgs.pygmentex.tex; propagatedBuildInputs = with python3Packages; [ pygments chardet ]; @@ -436,7 +436,7 @@ xdvi = stdenv.mkDerivation { xpdfopen = stdenv.mkDerivation { pname = "texlive-xpdfopen.bin"; - inherit (lib.head texlive.xpdfopen.pkgs) version; + inherit (texlive.pkgs.xpdfopen) version; inherit (common) src; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 8a326572716..99eb67aa6ff 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -1,55 +1,125 @@ -{ lib, buildEnv, runCommand, writeText, makeWrapper, libfaketime, makeFontsConf -, perl, bash, coreutils, gnused, gnugrep, gawk, ghostscript -, bin, tl }: -# combine = -args@{ - pkgFilter ? (pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "core" - || pkg.hasManpages or false) -, extraName ? "combined" -, extraVersion ? "" -, ... +{ + # texlive package set + tl +, bin + +, lib +, buildEnv +, libfaketime +, makeFontsConf +, makeWrapper +, runCommand +, writeShellScript +, writeText +, toTLPkgSets +, bash +, perl + + # common runtime dependencies +, coreutils +, gawk +, gnugrep +, gnused +, ghostscript }: + +lib.fix (self: { + withDocs ? false +, withSources ? false +, requiredTeXPackages ? ps: [ ps.scheme-infraonly ] + +### texlive.combine backward compatibility +, __extraName ? "combined" +, __extraVersion ? "" +# emulate the old texlive.combine (e.g. add man pages to main output) +, __combine ? false +# adjust behavior further if called from the texlive.combine wrapper +, __fromCombineWrapper ? false +}@args: + let - # combine a set of TL packages into a single TL meta-package - combinePkgs = pkgList: lib.catAttrs "pkg" ( - let - # a TeX package is an attribute set { pkgs = [ ... ]; ... } where pkgs is a list of derivations - # the derivations make up the TeX package and optionally (for backward compatibility) its dependencies - tlPkgToSets = { pkgs, ... }: map ({ tlType, version ? "", outputName ? "", ... }@pkg: { - # outputName required to distinguish among bin.core-big outputs - key = "${pkg.pname or pkg.name}.${tlType}-${version}-${outputName}"; - inherit pkg; - }) pkgs; - pkgListToSets = lib.concatMap tlPkgToSets; in - builtins.genericClosure { - startSet = pkgListToSets pkgList; - operator = { pkg, ... }: pkgListToSets (pkg.tlDeps or []); - }); + ### texlive.combine backward compatibility + # if necessary, convert old style { pkgs = [ ... ]; } packages to attribute sets + ensurePkgSets = ps: if ! __fromCombineWrapper && builtins.any (p: p ? pkgs && builtins.all (p: p ? tlType) p.pkgs) ps + then let oldStyle = builtins.partition (p: p ? pkgs && builtins.all (p: p ? tlType) p.pkgs) ps; + in oldStyle.wrong ++ lib.concatMap toTLPkgSets oldStyle.right + else ps; - pkgSet = removeAttrs args [ "pkgFilter" "extraName" "extraVersion" ]; pkgList = rec { - combined = combinePkgs (lib.attrValues pkgSet); - all = lib.filter pkgFilter combined; - splitBin = builtins.partition (p: p.tlType == "bin") all; - bin = splitBin.right; - nonbin = splitBin.wrong; - tlpkg = lib.filter (pkg: pkg.tlType == "tlpkg") combined; + # resolve dependencies of the packages that affect the runtime + all = + let + # order of packages is irrelevant + packages = builtins.sort (a: b: a.pname < b.pname) (ensurePkgSets (requiredTeXPackages tl)); + runtime = builtins.partition + (p: p.outputSpecified or false -> builtins.elem (p.tlOutputName or p.outputName) [ "out" "tex" "tlpkg" ]) + packages; + keySet = p: { + key = ((p.name or "${p.pname}-${p.version}") + "-" + p.tlOutputName or p.outputName or ""); + inherit p; + tlDeps = p.tlDeps or (p.requiredTeXPackages or (_: [ ]) [ ]); + }; + in + # texlive.combine: the wrapper already resolves all dependencies + if __fromCombineWrapper then requiredTeXPackages null else + builtins.catAttrs "p" (builtins.genericClosure { + startSet = map keySet runtime.right; + operator = p: map keySet p.tlDeps; + }) ++ runtime.wrong; + + # group the specified outputs + specified = builtins.partition (p: p.outputSpecified or false) all; + specifiedOutputs = builtins.groupBy (p: p.tlOutputName or p.outputName) specified.right; + otherOutputNames = builtins.catAttrs "key" (builtins.genericClosure { + startSet = map (key: { inherit key; }) (lib.concatLists (builtins.catAttrs "outputs" specified.wrong)); + operator = _: [ ]; + }); + otherOutputs = lib.genAttrs otherOutputNames (n: builtins.catAttrs n specified.wrong); + outputsToInstall = builtins.catAttrs "key" (builtins.genericClosure { + startSet = map (key: { inherit key; }) + ([ "out" ] ++ lib.optional (splitOutputs ? man) "man" + ++ lib.concatLists (builtins.catAttrs "outputsToInstall" (builtins.catAttrs "meta" specified.wrong))); + operator = _: [ ]; + }); + + # split binary and tlpkg from tex, texdoc, texsource + bin = if __fromCombineWrapper + then builtins.filter (p: p.tlType == "bin") all # texlive.combine: legacy filter + else otherOutputs.out or [ ] ++ specifiedOutputs.out or [ ]; + tlpkg = if __fromCombineWrapper + then builtins.filter (p: p.tlType == "tlpkg") all # texlive.combine: legacy filter + else otherOutputs.tlpkg or [ ] ++ specifiedOutputs.tlpkg or [ ]; + + nonbin = if __fromCombineWrapper then builtins.filter (p: p.tlType != "bin" && p.tlType != "tlpkg") all # texlive.combine: legacy filter + else (if __combine then # texlive.combine: emulate old input ordering to avoid rebuilds + lib.concatMap (p: lib.optional (p ? tex) p.tex + ++ lib.optional ((withDocs || p ? man) && p ? texdoc) p.texdoc + ++ lib.optional (withSources && p ? texsource) p.texsource) specified.wrong + else otherOutputs.tex or [ ] + ++ lib.optionals withDocs (otherOutputs.texdoc or [ ]) + ++ lib.optionals withSources (otherOutputs.texsource or [ ])) + ++ specifiedOutputs.tex or [ ] ++ specifiedOutputs.texdoc or [ ] ++ specifiedOutputs.texsource or [ ]; + + # outputs that do not become part of the environment + nonEnvOutputs = lib.subtractLists [ "out" "tex" "texdoc" "texsource" "tlpkg" ] otherOutputNames; }; + # list generated by inspecting `grep -IR '\([^a-zA-Z]\|^\)gs\( \|$\|"\)' "$TEXMFDIST"/scripts` # and `grep -IR rungs "$TEXMFDIST"` # and ignoring luatex, perl, and shell scripts (those must be patched using postFixup) needsGhostscript = lib.any (p: lib.elem p.pname [ "context" "dvipdfmx" "latex-papersize" "lyluatex" ]) pkgList.bin; - name = "texlive-${extraName}-${bin.texliveYear}${extraVersion}"; + name = if __combine then "texlive-${__extraName}-${bin.texliveYear}${__extraVersion}" # texlive.combine: old name name + else "texlive-${bin.texliveYear}-env"; texmfdist = (buildEnv { name = "${name}-texmfdist"; # remove fake derivations (without 'outPath') to avoid undesired build dependencies - paths = lib.catAttrs "outPath" pkgList.nonbin; + paths = builtins.catAttrs "outPath" pkgList.nonbin; # mktexlsr - nativeBuildInputs = [ (lib.last tl."texlive.infra".pkgs) ]; + nativeBuildInputs = [ tl."texlive.infra" ]; postBuild = # generate ls-R database '' @@ -61,7 +131,7 @@ let name = "${name}-tlpkg"; # remove fake derivations (without 'outPath') to avoid undesired build dependencies - paths = lib.catAttrs "outPath" pkgList.tlpkg; + paths = builtins.catAttrs "outPath" pkgList.tlpkg; }).overrideAttrs (_: { allowSubstitutes = true; }); # the 'non-relocated' packages must live in $TEXMFROOT/texmf-dist @@ -74,7 +144,7 @@ let ln -s "$tlpkg" "$out"/tlpkg ''; - # expose info and man pages in usual /share/{info,man} location + # texlive.combine: expose info and man pages in usual /share/{info,man} location doc = buildEnv { name = "${name}-doc"; @@ -87,14 +157,67 @@ let ]; }; -in (buildEnv { + meta = { + description = "TeX Live environment" + + lib.optionalString withDocs " with documentation" + + lib.optionalString (withDocs && withSources) " and" + + lib.optionalString withSources " with sources"; + platforms = lib.platforms.all; + longDescription = "Contains the following packages and their transitive dependencies:\n - " + + lib.concatMapStringsSep "\n - " + (p: p.pname + (lib.optionalString (p.outputSpecified or false) " (${p.tlOutputName or p.outputName})")) + (requiredTeXPackages tl); + }; + + # emulate split output derivation + splitOutputs = { + out = out // { outputSpecified = true; }; + texmfdist = texmfdist // { outputSpecified = true; }; + texmfroot = texmfroot // { outputSpecified = true; }; + } // (lib.genAttrs pkgList.nonEnvOutputs (outName: (buildEnv { + inherit name; + paths = builtins.catAttrs "outPath" + (pkgList.otherOutputs.${outName} or [ ] ++ pkgList.specifiedOutputs.${outName} or [ ]); + # force the output to be ${outName} or nix-env will not work + nativeBuildInputs = [ (writeShellScript "force-output.sh" '' + export out="''${${outName}-}" + '') ]; + inherit meta passthru; + }).overrideAttrs { outputs = [ outName ]; } // { outputSpecified = true; })); + + passthru = lib.optionalAttrs (! __combine) (splitOutputs // { + all = builtins.attrValues splitOutputs; + outputs = [ "out" ] ++ pkgList.nonEnvOutputs; + }) // { + # This is set primarily to help find-tarballs.nix to do its job + requiredTeXPackages = builtins.filter lib.isDerivation (pkgList.bin ++ pkgList.nonbin + ++ lib.optionals (! __fromCombineWrapper) + (lib.concatMap (n: (pkgList.otherOutputs.${n} or [ ] ++ pkgList.specifiedOutputs.${n} or [ ]))) pkgList.nonEnvOutputs); + # useful for inclusion in the `fonts.packages` nixos option or for use in devshells + fonts = "${texmfroot}/texmf-dist/fonts"; + # support variants attrs, (prev: attrs) + __overrideTeXConfig = newArgs: + let appliedArgs = if builtins.isFunction newArgs then newArgs args else newArgs; in + self (args // { __fromCombineWrapper = false; } // appliedArgs); + withPackages = reqs: self (args // { requiredTeXPackages = ps: requiredTeXPackages ps ++ reqs ps; __fromCombineWrapper = false; }); + }; + + out = (if (! __combine) + # meta.outputsToInstall = [ "out" "man" ] is invalid within buildEnv: + # checkMeta will notice that there is no actual "man" output, and fail + # so we set outputsToInstall from the outside, where it is safe + then lib.addMetaAttrs { inherit (pkgList) outputsToInstall; } + else x: x) # texlive.combine: man pages used to be part of out +# no indent for git diff purposes +((buildEnv { inherit name; ignoreCollisions = false; # remove fake derivations (without 'outPath') to avoid undesired build dependencies - paths = lib.catAttrs "outPath" pkgList.bin ++ [ doc ]; + paths = builtins.catAttrs "outPath" pkgList.bin + ++ lib.optional __combine doc; pathsToLink = [ "/" "/share/texmf-var/scripts" @@ -107,18 +230,13 @@ in (buildEnv { nativeBuildInputs = [ makeWrapper libfaketime - (lib.last tl."texlive.infra".pkgs) # mktexlsr - (lib.last tl.texlive-scripts.pkgs) # fmtutil, updmap - (lib.last tl.texlive-scripts-extra.pkgs) # texlinks + tl."texlive.infra" # mktexlsr + tl.texlive-scripts # fmtutil, updmap + tl.texlive-scripts-extra # texlinks perl ]; - passthru = { - # This is set primarily to help find-tarballs.nix to do its job - packages = pkgList.all; - # useful for inclusion in the `fonts.packages` nixos option or for use in devshells - fonts = "${texmfroot}/texmf-dist/fonts"; - }; + inherit meta passthru; postBuild = # environment variables (note: only export the ones that are used in the wrappers) @@ -131,7 +249,7 @@ in (buildEnv { export TEXMFCNF="$TEXMFSYSVAR/web2c" '' + # wrap executables with required env vars as early as possible - # 1. we want texlive.combine to use the wrapped binaries, to catch bugs + # 1. we use the wrapped binaries in the scripts below, to catch bugs # 2. we do not want to wrap links generated by texlinks '' enable -f '${bash}/lib/bash/realpath' realpath @@ -195,16 +313,16 @@ in (buildEnv { '' + # now filter hyphenation patterns and formats (let - hyphens = lib.filter (p: p.hasHyphens or false && p.tlType == "run") pkgList.splitBin.wrong; + hyphens = lib.filter (p: p.hasHyphens or false && p.tlOutputName or p.outputName == "tex") pkgList.nonbin; hyphenPNames = map (p: p.pname) hyphens; - formats = lib.filter (p: p ? formats && p.tlType == "run") pkgList.splitBin.wrong; + formats = lib.filter (p: p ? formats && p.tlOutputName or p.outputName == "tex") pkgList.nonbin; formatPNames = map (p: p.pname) formats; # sed expression that prints the lines in /start/,/end/ except for /end/ section = start: end: "/${start}/,/${end}/{ /${start}/p; /${end}/!p; };\n"; script = writeText "hyphens.sed" ( # document how the file was generated (for language.dat) - "1{ s/^(% Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" + "1{ s/^(% Generated by .*)$/\\1, modified by ${if __combine then "texlive.combine" else "Nixpkgs"}/; p; }\n" # pick up the header + "2,/^% from/{ /^% from/!p; };\n" # pick up all sections matching packages that we combine @@ -214,7 +332,7 @@ in (buildEnv { ); scriptLua = writeText "hyphens.lua.sed" ( - "1{ s/^(-- Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" + "1{ s/^(-- Generated by .*)$/\\1, modified by ${if __combine then "texlive.combine" else "Nixpkgs"}/; p; }\n" + "2,/^-- END of language.us.lua/p;\n" + lib.concatMapStrings (pname: section "^-- from ${pname}:$" "^}$|^-- from") hyphenPNames + "$p;\n" @@ -225,7 +343,7 @@ in (buildEnv { fmtutilSed = writeText "fmtutil.sed" ( # document how file was generated - "1{ s/^(# Generated by .*)$/\\1, modified by texlive.combine/; }\n" + "1{ s/^(# Generated by .*)$/\\1, modified by ${if __combine then "texlive.combine" else "Nixpkgs"}/; }\n" # disable all formats, even those already disabled + "s/^([^#]|#! )/#! \\1/;\n" # enable the formats from the packages being installed @@ -312,4 +430,5 @@ in (buildEnv { ln -s "$TEXMFDIST" "$out"/share/texmf '' ; -}).overrideAttrs (_: { allowSubstitutes = true; }) +}).overrideAttrs (_: { allowSubstitutes = true; })); +in out) diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix index c1e98d710b9..efbb3a1fb56 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix @@ -15,17 +15,27 @@ , texliveBinaries }: +/* Convert an attribute set extracted from tlpdb.nix (with the deps attribute + already processed) to a fake multi-output derivation with possible outputs + [ "tex" "texdoc" "texsource" "tlpkg" "out" "man" "info" ] +*/ + +# TODO stabilise a generic interface decoupled from the finer details of the +# translation from texlive.tlpdb to tlpdb.nix { pname , revision , version ? toString revision +, extraRevision ? "" +, extraVersion ? "" , sha512 , mirrors -, extraVersion ? "" , fixedHashes ? { } , postUnpack ? "" +, postFixup ? "" , stripPrefix ? 1 , license ? [ ] , hasHyphens ? false +, hasInfo ? false , hasManpages ? false , hasRunfiles ? false , hasTlpkg ? false @@ -34,112 +44,165 @@ }@args: let - meta = { license = map (x: lib.licenses.${x}) license; }; - - commonPassthru = { - inherit pname revision version; - } // lib.optionalAttrs (args ? extraRevision) { - inherit (args) extraRevision; + # common metadata + name = "${pname}-${version}${extraVersion}"; + meta = { + license = map (x: lib.licenses.${x}) license; + # TeX Live packages should not be installed directly into the user profile + outputsToInstall = [ ]; }; + hasBinfiles = args ? binfiles && args.binfiles != [ ]; + hasDocfiles = sha512 ? doc; + hasSource = sha512 ? source; + + # emulate drv.all, drv.outputs lists + all = lib.optional hasBinfiles bin ++ + lib.optional hasRunfiles tex ++ + lib.optional hasDocfiles texdoc ++ + lib.optional hasSource texsource ++ + lib.optional hasTlpkg tlpkg ++ + lib.optional hasManpages man ++ + lib.optional hasInfo info; + outputs = lib.catAttrs "tlOutputName" all; + + mainDrv = if hasBinfiles then bin + else if hasRunfiles then tex + else if hasTlpkg then tlpkg + else if hasDocfiles then texdoc + else if hasSource then texsource + else tex; # fall back to attrset tex if there is no derivation + + # emulate multi-output derivation plus additional metadata + # (out is handled in mkContainer) + passthru = { + inherit all outputs pname; + revision = toString revision + extraRevision; + version = version + extraVersion; + outputSpecified = true; + inherit tex; + } // lib.optionalAttrs (args ? deps) { tlDeps = args.deps; } + // lib.optionalAttrs (args ? formats) { inherit (args) formats; } + // lib.optionalAttrs hasHyphens { inherit hasHyphens; } + // lib.optionalAttrs (args ? postactionScript) { inherit (args) postactionScript; } + // lib.optionalAttrs hasDocfiles { texdoc = texdoc; } + // lib.optionalAttrs hasSource { texsource = texsource; } + // lib.optionalAttrs hasTlpkg { tlpkg = tlpkg; } + // lib.optionalAttrs hasManpages { man = man; } + // lib.optionalAttrs hasInfo { info = info; }; + # build run, doc, source, tlpkg containers - mkContainer = tlType: passthru: sha512: + mkContainer = tlType: tlOutputName: sha512: let - # NOTE: the fixed naming scheme must match generated-fixed-hashes.nix + fixedHash = fixedHashes.${tlType} or null; # be graceful about missing hashes # the basename used by upstream (without ".tar.xz" suffix) + # tlpkg is not a true container but a subfolder of the run container urlName = pname + (lib.optionalString (tlType != "run" && tlType != "tlpkg") ".${tlType}"); - # name + version for the derivation - tlName = urlName + (lib.optionalString (tlType == "tlpkg") ".tlpkg") + "-${version}${extraVersion}"; - fixedHash = fixedHashes.${tlType} or null; # be graceful about missing hashes - - urls = args.urls or (if args ? url then [ args.url ] else - map (up: "${up}/archive/${urlName}.r${toString revision}.tar.xz") mirrors); + urls = map (up: "${up}/archive/${urlName}.r${toString revision}.tar.xz") mirrors; + # TODO switch to simpler "${name}-${tlOutputName}" (requires new fixed hashes) + container = runCommand "texlive-${pname}${lib.optionalString (tlType != "run") ".${tlType}"}-${version}${extraVersion}" + ({ + src = fetchurl { inherit urls sha512; }; + # save outputName as fixed output derivations cannot change nor override outputName + passthru = passthru // { inherit tlOutputName; }; + # TODO remove tlType from derivation (requires a rebuild) + inherit meta stripPrefix tlType; + } // lib.optionalAttrs (fixedHash != null) { + outputHash = fixedHash; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }) + ('' + mkdir "$out" + if [[ "$tlType" == "tlpkg" ]]; then + tar -xf "$src" \ + --strip-components=1 \ + -C "$out" --anchored --exclude=tlpkg/tlpobj --keep-old-files \ + tlpkg + else + tar -xf "$src" \ + --strip-components="$stripPrefix" \ + -C "$out" --anchored --exclude=tlpkg --keep-old-files + fi + '' + postUnpack); in - runCommand "texlive-${tlName}" - ({ - src = fetchurl { inherit urls sha512; }; - inherit meta passthru stripPrefix tlType; - } // lib.optionalAttrs (fixedHash != null) { - outputHash = fixedHash; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - }) - ('' - mkdir "$out" - if [[ "$tlType" == "tlpkg" ]]; then - tar -xf "$src" \ - --strip-components=1 \ - -C "$out" --anchored --exclude=tlpkg/tlpobj --keep-old-files \ - tlpkg - else - tar -xf "$src" \ - --strip-components="$stripPrefix" \ - -C "$out" --anchored --exclude=tlpkg --keep-old-files - fi - '' + postUnpack); - - tex = [ - ( - let passthru = commonPassthru - // lib.optionalAttrs (args ? deps) { tlDeps = args.deps; } - // lib.optionalAttrs (args ? formats) { inherit (args) formats; } - // lib.optionalAttrs hasHyphens { inherit hasHyphens; }; in - if hasRunfiles then mkContainer "run" passthru sha512.run - else (passthru // { tlType = "run"; }) - ) - ]; - - doc = let passthru = commonPassthru - // lib.optionalAttrs hasManpages { inherit hasManpages; }; in - lib.optional (sha512 ? doc) (mkContainer "doc" passthru sha512.doc); - - source = lib.optional (sha512 ? source) (mkContainer "source" commonPassthru sha512.source); - - tlpkg = let passthru = commonPassthru - // lib.optionalAttrs (args ? postactionScript) { postactionScript = args.postactionScript; }; in - lib.optional hasTlpkg (mkContainer "tlpkg" passthru sha512.run); - - bin = lib.optional (args ? binfiles && args.binfiles != [ ]) ( - let - # find interpreters for the script extensions found in tlpdb - extToInput = { - jar = jdk; - lua = texliveBinaries.luatex; - py = python3; - rb = ruby; - sno = snobol4; - tcl = tk; - texlua = texliveBinaries.luatex; - tlu = texliveBinaries.luatex; - }; - run = lib.head tex; - in - runCommand "texlive-${pname}.bin-${version}" - { - passthru = commonPassthru // { tlType = "bin"; }; - inherit meta; - # shebang interpreters and compiled binaries - buildInputs = let outName = builtins.replaceStrings [ "-" ] [ "_" ] pname; in - [ texliveBinaries.core.${outName} or null - texliveBinaries.${pname} or null - texliveBinaries.core-big.${outName} or null ] - ++ (args.extraBuildInputs or [ ]) ++ [ bash perl ] - ++ (lib.attrVals (args.scriptExts or [ ]) extToInput); - nativeBuildInputs = extraNativeBuildInputs; - # absolute scripts folder - scriptsFolder = lib.optionalString (run ? outPath) (run.outPath + "/scripts/" + args.scriptsFolder or pname); - # binaries info - inherit (args) binfiles; - binlinks = builtins.attrNames (args.binlinks or { }); - bintargets = builtins.attrValues (args.binlinks or { }); - # build scripts - patchScripts = ./patch-scripts.sed; - makeBinContainers = ./make-bin-containers.sh; - } - '' - . "$makeBinContainers" - ${args.postFixup or ""} - '' - ); + # remove the standard drv.out, optionally replace it with the bin container + builtins.removeAttrs container [ "out" ] // lib.optionalAttrs hasBinfiles { out = bin; }; + + tex = + if hasRunfiles then mkContainer "run" "tex" sha512.run + else passthru + // { inherit meta; tlOutputName = "tex"; } + // lib.optionalAttrs hasBinfiles { out = bin; }; + + texdoc = mkContainer "doc" "texdoc" sha512.doc; + + texsource = mkContainer "source" "texsource" sha512.source; + + tlpkg = mkContainer "tlpkg" "tlpkg" sha512.run; + + # build bin container + extToInput = { + # find interpreters for the script extensions found in tlpdb + jar = jdk; + lua = texliveBinaries.luatex; + py = python3; + rb = ruby; + sno = snobol4; + tcl = tk; + texlua = texliveBinaries.luatex; + tlu = texliveBinaries.luatex; + }; + + # TODO switch to simpler "${name}" (requires a rebuild) + bin = runCommand "texlive-${pname}.bin-${version}" + { + inherit meta; + passthru = passthru // { tlOutputName = "out"; }; + # shebang interpreters + buildInputs =let outName = builtins.replaceStrings [ "-" ] [ "_" ] pname; in + [ texliveBinaries.core.${outName} or null + texliveBinaries.${pname} or null + texliveBinaries.core-big.${outName} or null ] + ++ (args.extraBuildInputs or [ ]) ++ [ bash perl ] + ++ (lib.attrVals (args.scriptExts or [ ]) extToInput); + nativeBuildInputs = extraNativeBuildInputs; + # absolute scripts folder + scriptsFolder = lib.optionalString (tex ? outPath) (tex.outPath + "/scripts/" + args.scriptsFolder or pname); + # binaries info + inherit (args) binfiles; + binlinks = builtins.attrNames (args.binlinks or { }); + bintargets = builtins.attrValues (args.binlinks or { }); + # build scripts + patchScripts = ./patch-scripts.sed; + makeBinContainers = ./make-bin-containers.sh; + } + '' + . "$makeBinContainers" + ${args.postFixup or ""} + ''; + + # build man, info containers + # TODO switch to simpler "${name}-man" (requires a rebuild) + man = builtins.removeAttrs (runCommand "texlive-${pname}.man-${version}${extraVersion}" + { + inherit meta texdoc; + passthru = passthru // { tlOutputName = "man"; }; + } + '' + mkdir -p "$out"/share + ln -s {"$texdoc"/doc,"$out"/share}/man + '') [ "out" ] // lib.optionalAttrs hasBinfiles { out = bin; }; + + # TODO switch to simpler "${name}-info" (requires a rebuild) + info = builtins.removeAttrs (runCommand "texlive-${pname}.info-${version}${extraVersion}" + { + inherit meta texdoc; + passthru = passthru // { tlOutputName = "info"; }; + } + '' + mkdir -p "$out"/share + ln -s {"$texdoc"/doc,"$out"/share}/info + '') [ "out" ] // lib.optionalAttrs hasBinfiles { out = bin; }; in -{ pkgs = tex ++ doc ++ source ++ tlpkg ++ bin; } +builtins.removeAttrs mainDrv [ "outputSpecified" ] diff --git a/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix new file mode 100644 index 00000000000..165e7a22c66 --- /dev/null +++ b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix @@ -0,0 +1,42 @@ +# legacy texlive.combine wrapper +{ lib, toTLPkgList, toTLPkgSets, buildTeXEnv }: +args@{ + pkgFilter ? (pkg: pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "core" + || pkg.hasManpages or false) +, extraName ? "combined" +, extraVersion ? "" +, ... +}: +let + pkgSet = removeAttrs args [ "pkgFilter" "extraName" "extraVersion" ]; + + # combine a set of TL packages into a single TL meta-package + combinePkgs = pkgList: lib.catAttrs "pkg" ( + let + # a TeX package used to be an attribute set { pkgs = [ ... ]; ... } where pkgs is a list of derivations + # the derivations make up the TeX package and optionally (for backward compatibility) its dependencies + tlPkgToSets = drv: map ({ tlType, version ? "", outputName ? "", ... }@pkg: { + # outputName required to distinguish among bin.core-big outputs + key = "${pkg.pname or pkg.name}.${tlType}-${version}-${outputName}"; + inherit pkg; + }) (drv.pkgs or (toTLPkgList drv)); + pkgListToSets = lib.concatMap tlPkgToSets; in + builtins.genericClosure { + startSet = pkgListToSets pkgList; + operator = { pkg, ... }: pkgListToSets (pkg.tlDeps or []); + }); + combined = combinePkgs (lib.attrValues pkgSet); + + # convert to specified outputs + tlTypeToOut = { run = "tex"; doc = "texdoc"; source = "texsource"; bin = "out"; tlpkg = "tlpkg"; }; + toSpecified = { tlType, ... }@drv: drv // { outputSpecified = true; tlOutputName = tlTypeToOut.${tlType}; }; + all = lib.filter pkgFilter combined ++ lib.filter (pkg: pkg.tlType == "tlpkg") combined; + converted = builtins.map toSpecified all; +in +buildTeXEnv { + __extraName = extraName; + __extraVersion = extraVersion; + requiredTeXPackages = _: converted; + __combine = true; + __fromCombineWrapper = true; +} diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 60e7043e332..82327d29709 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -2,7 +2,7 @@ - source: ../../../../../doc/languages-frameworks/texlive.xml - current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive */ -{ stdenv, lib, fetchurl, runCommand, writeText, buildEnv +{ stdenv, lib, fetchurl, runCommand, writeShellScript, writeText, buildEnv , callPackage, ghostscript_headless, harfbuzz , makeWrapper, installShellFiles , python3, ruby, perl, tk, jdk, bash, snobol4 @@ -22,13 +22,6 @@ let tlpdb = overriddenTlpdb; }; - # function for creating a working environment from a set of TL packages - combine = import ./combine.nix { - inherit bin buildEnv lib makeWrapper writeText runCommand - perl libfaketime makeFontsConf bash tl coreutils gawk gnugrep gnused; - ghostscript = ghostscript_headless; - }; - tlpdb = import ./tlpdb.nix; tlpdbVersion = tlpdb."00texlive.config"; @@ -101,12 +94,108 @@ let // lib.optionalAttrs (args ? deps) { deps = map (n: tl.${n}) (args.deps or [ ]); }) ) overriddenTlpdb; + # function for creating a working environment + buildTeXEnv = import ./build-tex-env.nix { + inherit bin tl; + ghostscript = ghostscript_headless; + inherit lib buildEnv libfaketime makeFontsConf makeWrapper runCommand + writeShellScript writeText toTLPkgSets bash perl coreutils gawk gnugrep gnused; + }; + + ### texlive.combine compatibility layer: + # convert TeX packages to { pkgs = [ ... ]; } lists + # respecting specified outputs + toTLPkgList = drv: if drv.outputSpecified or false + then let tlType = drv.tlType or tlOutToType.${drv.tlOutputName or drv.outputName} or null; in + lib.optional (tlType != null) (drv // { inherit tlType; }) + else [ (drv.tex // { tlType = "run"; }) ] ++ + lib.optional (drv ? texdoc) (drv.texdoc // { tlType = "doc"; } // lib.optionalAttrs (drv ? man) { hasManpages = true; }) ++ + lib.optional (drv ? texsource) (drv.texsource // { tlType = "source"; }) ++ + lib.optional (drv ? tlpkg) (drv.tlpkg // { tlType = "tlpkg"; }) ++ + lib.optional (drv ? out) (drv.out // { tlType = "bin"; }); + tlOutToType = { out = "bin"; tex = "run"; texsource = "source"; texdoc = "doc"; tlpkg = "tlpkg"; }; + + # convert { pkgs = [ ... ]; } lists to TeX packages + # possibly more than one, if pkgs is also used to specify dependencies + tlTypeToOut = { run = "tex"; doc = "texdoc"; source = "texsource"; bin = "out"; tlpkg = "tlpkg"; }; + toSpecifiedNV = p: rec { + name = value.tlOutputName; + value = builtins.removeAttrs p [ "pkgs" ] + // { outputSpecified = true; tlOutputName = tlTypeToOut.${p.tlType}; }; + }; + toTLPkgSet = pname: drvs: + let set = lib.listToAttrs (builtins.map toSpecifiedNV drvs); + mainDrv = set.out or set.tex or set.tlpkg or set.texdoc or set.texsource; in + builtins.removeAttrs mainDrv [ "outputSpecified" ]; + toTLPkgSets = { pkgs, ... }: lib.mapAttrsToList toTLPkgSet + (builtins.groupBy (p: p.pname) pkgs); + + # export TeX packages as { pkgs = [ ... ]; } in the top attribute set + allPkgLists = lib.mapAttrs (n: drv: { pkgs = toTLPkgList drv; }) tl; + + # function for creating a working environment from a set of TL packages + # now a legacy wrapper around buildTeXEnv + combine = import ./combine-wrapper.nix { inherit buildTeXEnv lib toTLPkgList toTLPkgSets; }; + assertions = with lib; assertMsg (tlpdbVersion.year == version.texliveYear) "TeX Live year in texlive does not match tlpdb.nix, refusing to evaluate" && assertMsg (tlpdbVersion.frozen == version.final) "TeX Live final status in texlive does not match tlpdb.nix, refusing to evaluate"; + # Pre-defined evironment packages for TeX Live schemes, + # to make nix-env usage more comfortable and build selected on Hydra. + + # these license lists should be the sorted union of the licenses of the packages the schemes contain. + # The correctness of this collation is tested by tests.texlive.licenses + licenses = with lib.licenses; { + scheme-basic = [ free gfl gpl1Only gpl2 gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; + scheme-context = [ bsd2 bsd3 cc-by-sa-40 free gfl gfsl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus knuth lgpl2 lgpl21 + lppl1 lppl13c mit ofl publicDomain x11 ]; + scheme-full = [ artistic1-cl8 artistic2 asl20 bsd2 bsd3 bsdOriginal cc-by-10 cc-by-40 cc-by-sa-10 cc-by-sa-20 + cc-by-sa-30 cc-by-sa-40 cc0 fdl13Only free gfl gfsl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus isc knuth + lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; + scheme-gust = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-40 cc0 fdl13Only free gfl gfsl gpl1Only gpl2 + gpl2Plus gpl3 gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; + scheme-infraonly = [ gpl2 gpl2Plus lgpl21 ]; + scheme-medium = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 fdl13Only + free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl + publicDomain x11 ]; + scheme-minimal = [ free gpl1Only gpl2 gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; + scheme-small = [ asl20 cc-by-40 cc-by-sa-40 cc0 fdl13Only free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus knuth + lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; + scheme-tetex = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-10 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 + fdl13Only free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a + lppl13c mit ofl publicDomain x11]; + }; + + meta = { + description = "TeX Live environment"; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ veprbl ]; + license = licenses.scheme-infraonly; + }; + + combined = recurseIntoAttrs ( + lib.genAttrs [ "scheme-basic" "scheme-context" "scheme-full" "scheme-gust" "scheme-infraonly" + "scheme-medium" "scheme-minimal" "scheme-small" "scheme-tetex" ] + (pname: + (buildTeXEnv { + __extraName = "combined" + lib.removePrefix "scheme" pname; + __extraVersion = with version; if final then "-final" else ".${year}${month}${day}"; + requiredTeXPackages = ps: [ ps.${pname} ]; + # to maintain full backward compatibility, enable texlive.combine behavior + __combine = true; + }).overrideAttrs { + meta = meta // { + description = "TeX Live environment for ${pname}"; + license = licenses.${pname}; + }; + } + ) + ); + in - tl // { + allPkgLists // { + pkgs = tl; tlpdb = { # nested in an attribute set to prevent them from appearing in search @@ -116,55 +205,13 @@ in bin = assert assertions; bin // { # for backward compatibility - latexindent = lib.findFirst (p: p.tlType == "bin") tl.latexindent.pkgs; + latexindent = tl.latexindent; }; combine = assert assertions; combine; - # Pre-defined combined packages for TeX Live schemes, - # to make nix-env usage more comfortable and build selected on Hydra. - combined = with lib; - let - # these license lists should be the sorted union of the licenses of the packages the schemes contain. - # The correctness of this collation is tested by tests.texlive.licenses - licenses = with lib.licenses; { - scheme-basic = [ free gfl gpl1Only gpl2 gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; - scheme-context = [ bsd2 bsd3 cc-by-sa-40 free gfl gfsl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus knuth lgpl2 lgpl21 - lppl1 lppl13c mit ofl publicDomain x11 ]; - scheme-full = [ artistic1-cl8 artistic2 asl20 bsd2 bsd3 bsdOriginal cc-by-10 cc-by-40 cc-by-sa-10 cc-by-sa-20 - cc-by-sa-30 cc-by-sa-40 cc0 fdl13Only free gfl gfsl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus isc knuth - lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; - scheme-gust = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-40 cc0 fdl13Only free gfl gfsl gpl1Only gpl2 - gpl2Plus gpl3 gpl3Plus knuth lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; - scheme-infraonly = [ gpl2 gpl2Plus lgpl21 ]; - scheme-medium = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 fdl13Only - free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a lppl13c mit ofl - publicDomain x11 ]; - scheme-minimal = [ free gpl1Only gpl2 gpl2Plus knuth lgpl21 lppl1 lppl13c mit ofl publicDomain ]; - scheme-small = [ asl20 cc-by-40 cc-by-sa-40 cc0 fdl13Only free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus knuth - lgpl2 lgpl21 lppl1 lppl12 lppl13a lppl13c mit ofl publicDomain x11 ]; - scheme-tetex = [ artistic1-cl8 asl20 bsd2 bsd3 cc-by-40 cc-by-sa-10 cc-by-sa-20 cc-by-sa-30 cc-by-sa-40 cc0 - fdl13Only free gfl gpl1Only gpl2 gpl2Plus gpl3 gpl3Plus isc knuth lgpl2 lgpl21 lgpl3 lppl1 lppl12 lppl13a - lppl13c mit ofl publicDomain x11]; - }; - in recurseIntoAttrs ( - mapAttrs - (pname: attrs: - addMetaAttrs rec { - description = "TeX Live environment for ${pname}"; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ veprbl ]; - license = licenses.${pname}; - } - (combine { - ${pname} = attrs; - extraName = "combined" + lib.removePrefix "scheme" pname; - extraVersion = with version; if final then "-final" else ".${year}${month}${day}"; - }) - ) - { inherit (tl) - scheme-basic scheme-context scheme-full scheme-gust scheme-infraonly - scheme-medium scheme-minimal scheme-small scheme-tetex; - } - ); + combined = assert assertions; combined; + + # convenience alias + withPackages = (buildTeXEnv { }).withPackages; } diff --git a/pkgs/tools/typesetting/tex/texlive/generate-fixed-hashes.nix b/pkgs/tools/typesetting/tex/texlive/generate-fixed-hashes.nix index dedb877448a..532e3c5cfaf 100644 --- a/pkgs/tools/typesetting/tex/texlive/generate-fixed-hashes.nix +++ b/pkgs/tools/typesetting/tex/texlive/generate-fixed-hashes.nix @@ -1,13 +1,13 @@ with import ../../../../.. { }; with lib; let - isFod = p: p.tlType != "bin" && isDerivation p; + getFods = drv: lib.optional (isDerivation drv.tex) (drv.tex // { tlType = "run"; }) + ++ lib.optional (drv ? texdoc) (drv.texdoc // { tlType = "doc"; }) + ++ lib.optional (drv ? texsource) (drv.texsource // { tlType = "source"; }) + ++ lib.optional (drv ? tlpkg) (drv.tlpkg // { tlType = "tlpkg"; }); - # ugly hack to extract combine from collection-latexextra, since it is masked by texlive.combine - combine = lib.findFirst (p: (lib.head p.pkgs).pname == "combine") { pkgs = [ ]; } (lib.head texlive.collection-latexextra.pkgs).tlDeps; - all = filter (p: p ? pkgs) (attrValues (removeAttrs texlive [ "bin" "combine" "combined" "tlpdb" ])) ++ [ combine ]; - sorted = sort (a: b: (head a.pkgs).pname < (head b.pkgs).pname) all; - fods = filter isFod (concatMap (p: p.pkgs or [ ]) all); + sorted = sort (a: b: a.pname < b.pname) (attrValues texlive.pkgs); + fods = concatMap getFods sorted; computeHash = fod: runCommand "${fod.pname}-${fod.tlType}-fixed-hash" { buildInputs = [ nix ]; inherit fod; } @@ -15,18 +15,17 @@ with lib; let hash = fod: fod.outputHash or (builtins.readFile (computeHash fod)); - hashes = { pkgs }: - concatMapStrings ({ tlType, ... }@p: lib.optionalString (isFod p) (''${tlType}="${hash p}";'')) pkgs; + hashes = fods: + concatMapStrings ({ tlType, ... }@p: ''${tlType}="${hash p}";'') fods; - hashLine = { pkgs }@pkg: + hashLine = { pname, revision, extraRevision ? "", ... }@drv: let - fods = lib.filter isFod pkgs; - first = lib.head fods; + fods = getFods drv; # NOTE: the fixed naming scheme must match default.nix - fixedName = with first; "${pname}-${toString revision}${first.extraRevision or ""}"; + fixedName = "${pname}-${toString revision}${extraRevision}"; in - lib.optionalString (fods != [ ]) '' - ${strings.escapeNixIdentifier fixedName}={${hashes pkg}}; + optionalString (fods != [ ]) '' + ${strings.escapeNixIdentifier fixedName}={${hashes fods}}; ''; in { @@ -37,6 +36,6 @@ in fixedHashesNix = writeText "fixed-hashes.nix" '' { - ${lib.concatMapStrings hashLine sorted}} + ${concatMapStrings hashLine sorted}} ''; } diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed index 7c8520707a9..244f8fbcc15 100644 --- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed +++ b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed @@ -91,6 +91,7 @@ $a} t next-doc # loop if the previous lines matched / (texmf-dist|RELOC)\/doc\/man\//i\ hasManpages = true; + / (texmf-dist|RELOC)\/doc\/info\//i\ hasInfo = true; D # restart cycle } diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index 6b974c72143..e9b448dc430 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -126,7 +126,7 @@ in lib.recursiveUpdate orig rec { texlive-scripts.binlinks = { mktexfmt = "fmtutil"; - texhash = (lib.last tl."texlive.infra".pkgs) + "/bin/mktexlsr"; + texhash = tl."texlive.infra" + "/bin/mktexlsr"; }; texlive-scripts-extra.binlinks = { @@ -352,7 +352,7 @@ in lib.recursiveUpdate orig rec { mkdir -p support/texdoc touch support/texdoc/NEWS - TEXMFCNF="${lib.head tl.kpathsea.pkgs}/web2c" TEXMF="$out" TEXDOCS=. TEXMFVAR=. \ + TEXMFCNF="${tl.kpathsea.tex}/web2c" TEXMF="$out" TEXDOCS=. TEXMFVAR=. \ "${bin.luatex}"/bin/texlua "$out"/scripts/texdoc/texdoc.tlu \ -c texlive_tlpdb=texlive.tlpdb -lM texdoc @@ -362,7 +362,7 @@ in lib.recursiveUpdate orig rec { # install zsh completion postFixup = '' - TEXMFCNF="${lib.head tl.kpathsea.pkgs}"/web2c TEXMF="$scriptsFolder/../.." \ + TEXMFCNF="${tl.kpathsea.tex}"/web2c TEXMF="$scriptsFolder/../.." \ texlua "$out"/bin/texdoc --print-completion zsh > "$TMPDIR"/_texdoc substituteInPlace "$TMPDIR"/_texdoc \ --replace 'compdef __texdoc texdoc' '#compdef texdoc' \ @@ -381,14 +381,14 @@ in lib.recursiveUpdate orig rec { license = [ "gpl2Plus" ] ++ lib.toList bin.core.meta.license.shortName ++ orig."texlive.infra".license or [ ]; scriptsFolder = "texlive"; - extraBuildInputs = [ coreutils gnused gnupg (lib.last tl.kpathsea.pkgs) (perl.withPackages (ps: with ps; [ Tk ])) ]; + extraBuildInputs = [ coreutils gnused gnupg tl.kpathsea (perl.withPackages (ps: with ps; [ Tk ])) ]; # make tlmgr believe it can use kpsewhich to evaluate TEXMFROOT postFixup = '' substituteInPlace "$out"/bin/tlmgr \ --replace 'if (-r "$bindir/$kpsewhichname")' 'if (1)' sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath [ gnupg ]}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/tlmgr - sed -i '2iPATH="${lib.makeBinPath [ coreutils gnused (lib.last tl.kpathsea.pkgs) ]}''${PATH:+:$PATH}"' "$out"/bin/mktexlsr + sed -i '2iPATH="${lib.makeBinPath [ coreutils gnused tl.kpathsea ]}''${PATH:+:$PATH}"' "$out"/bin/mktexlsr ''; # add minimal texlive.tlpdb diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix index 87659160608..75501b60105 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix @@ -1707,6 +1707,7 @@ asymptote = { sha512.run = "4f97d0d87d1f29985c83c99629fc52e8e18f6eabf95d77aa888429187b49ed9525661d9c06b46a9b2295b03df412778ede1490fa9cd8ec680c3209a4ca6d0be0"; sha512.doc = "940297c3d69de7e01caa09ff44483f7334aba14705bdcdc83661ca9be2210133e094f99a8355b4b88d076355bb4f13f64c21700bff57f452dd5dbc8d2fddb432"; hasManpages = true; + hasInfo = true; hasRunfiles = true; license = [ "lgpl3" ]; version = "2.85"; @@ -15500,6 +15501,7 @@ dvipng = { sha512.run = "d24be610a63a9df22ebe6f53891519ab77900611d1159dec5e97b27160f3552b4cbce42b575a036125d2b15910a72cb5e3793a3409c5d0f4b1df0c2433e828f8"; sha512.doc = "976ff6c9628fe85adca2287f04d76f2c1605f243e28b4d32cb1ef9a90d30dcae0d202e6d5156914c204fd42b0a66460755a89f7dbdeb9ec1ccf6010cfe8daf78"; hasManpages = true; + hasInfo = true; license = [ "lgpl3" ]; version = "1.17"; }; @@ -15521,6 +15523,7 @@ dvips = { sha512.run = "a680a4685d3cbb429ad9dada0d48098f7755253ad1d7c808731f0f4fb4c37971cb937a9fa68bcecd892de93cc35a8086b742c86338460585c2912f36d00ade67"; sha512.doc = "a6acb780a45663fb21976622d7b6c3ea8d4adf1fe405ee97cd7c4cf09fa49b59069ba72b2aa14b53d3ba631b37c5cbd979929adaa274a0bec8b1272d85e1cd43"; hasManpages = true; + hasInfo = true; hasRunfiles = true; license = [ "free" ]; }; @@ -16610,6 +16613,7 @@ eplain = { sha512.run = "fda8158ae2bdc96187b6e6ace2a94be3e0f68201adbc02553b48a3848481352ac10ddd72babcbc2835e089ce751ade7dfa6cfd1c642c94155c2861db865f5c29"; sha512.doc = "60902b2422d2f5d7570a19daf7f586df7882505d7c156539699a0aa47a0f3bde5688dcbdc92c8a6a9878f11392bc9b9f147626aad230eecd2740d56f104928ed"; hasManpages = true; + hasInfo = true; sha512.source = "015de2eeeaec99bd15882a190f9ef3f2112520f8c591c7e6d2351c52d8690b024750adea426bcf95f438aaa20c97dd321881ac7212ff181e148337b57f6d386c"; hasRunfiles = true; license = [ "gpl2Plus" ]; @@ -16666,6 +16670,7 @@ epspdf = { revision = 66119; sha512.run = "f155834a9636991c8ae752f61f70bdf22ab3172270c85aebb05462cf26e44f6e81fb83842c8515bfa54e632a3beab8bb91cccf2b5eef459d77738443c77df56d"; sha512.doc = "5d06f8a4ef295e0fac8cd1dc73ff98e266dcf4394ed76223c92d20758fa8195ef5bea9bde49b1a247acfdf67aa7717092f978b55fc4fbc8665922487d57985d6"; + hasInfo = true; hasRunfiles = true; scriptExts = [ "tcl" @@ -18768,6 +18773,7 @@ fontname = { stripPrefix = 0; sha512.run = "424da4dbbc07c41840e6aeb6fabeef5d4778d206b9cb8a90e752ebeb65d962b96ad41a7e20c86a16665e2bf48ad795d85001da66ff41b01ae3c949c6eefa4593"; sha512.doc = "78199996913192f5f69423b6f412acc52b74f051b01d3e345b97b7f1d9ea4aea762a7b83488068f3091b41da69471d56b3f18ab4d299cc6adfe4e004072db303"; + hasInfo = true; hasRunfiles = true; license = [ "gpl1Only" ]; }; @@ -24499,6 +24505,7 @@ kpathsea = { sha512.run = "8a9f0dd49470bec5ba0f963a0385bea45141d6b805682bd65e95291b02158b9d2cedd5bd43592de7c447fe87f04efa00e4d1aa191a490147adcb57ec3922b5db"; sha512.doc = "51500943de0184fd9794dbf6af80aed2fc7bbaf2a7949facb1840ad0e32344d217aa4d58ee76e3934aec891858f789b3847b9027cb2bd75e5962be98ddd9d02f"; hasManpages = true; + hasInfo = true; hasRunfiles = true; license = [ "lgpl21" ]; }; @@ -25258,6 +25265,7 @@ latex2e-help-texinfo = { stripPrefix = 0; sha512.run = "34b91b19e1b71b1df6d0f57dda4d6976a93b16afac259656c9d4e331b0c23a9b0550563c1a10dd7a95640e3740b3b15597c1023f6c2721bf2a64800466b9cd09"; sha512.doc = "d4584d9259f3c1867e7445d4a219e4decc5ba3b305e20d1e780180a47fbad8df4d55552726d8288e78c8388823a2b652b81080c8139b00f4ea3ca10e5789375b"; + hasInfo = true; license = [ "free" ]; }; latex2e-help-texinfo-fr = { @@ -25265,6 +25273,7 @@ latex2e-help-texinfo-fr = { stripPrefix = 0; sha512.run = "96366ea420532f56ae076da48f5402c2ee78ca27fae8180795d6cd18aae118a8c7060208ff43ab64526addcdce9e4d90790583842b20c751f37865cf616e04e4"; sha512.doc = "52f6aea9ac2393a73d7dc7ce8ad4d6f08e0a224397199d5def97412502026717e8cb966552368899c50718a1049b1ad4610d2d23150a45bee55cc2c776003db7"; + hasInfo = true; license = [ "publicDomain" ]; }; latex2e-help-texinfo-spanish = { @@ -25272,6 +25281,7 @@ latex2e-help-texinfo-spanish = { stripPrefix = 0; sha512.run = "870c8f3af54ac42df5f4958669cf730cd16084c985f0b377c5aba9d526b8f7be14b367791d2c0a1f1a715739390ab63777ff2a92e7f9aad09897c8bbecff495e"; sha512.doc = "4c751a7305e089dab61bf991436ab1e612cfca0d17e416e21d659c04ef32eeb2d14dbeb09d63649a2b79f842766a218c43ae2c6fbeeba5549f039f991049a79d"; + hasInfo = true; license = [ "free" ]; }; latex2man = { @@ -25279,6 +25289,7 @@ latex2man = { sha512.run = "2617f6e8059f30c0098ea896cff69f585ea2ddbd3bbbd8066e7296dd833d3a246b8fefc0af71a92abf7e2051c754c0e3e6098175a4b181780563416bc9146b95"; sha512.doc = "390666cc56ad70342c9a24ca593fe65b3760674a882ed8bba383d193f2578285727a085f823afc03fa0dbc9966612caf9a29222fd2a9f39214f01aa268acdc50"; hasManpages = true; + hasInfo = true; hasRunfiles = true; license = [ "lppl1" ]; version = "1.29"; @@ -28873,6 +28884,7 @@ mf2pt1 = { revision = 61217; sha512.run = "ca93a3ae439f9cd8029720bd1d90fbe75a403e7ab4ebcbe1ba1e5a7a28aa9269197f90a4aee849fea59d734d5dc38f04eedc140ff1be64fd805a10ab5510a2f5"; sha512.doc = "6c10831fdcc48d25645be675fbf5da29da945bd79032c60e73e04a39d61c287a64e7b884381ac0b08e48f5dc9b6dec27efea874f6e13d6e4a5e3f32c22fa3ce2"; + hasInfo = true; hasRunfiles = true; license = [ "lppl13c" ]; version = "2.7"; @@ -40536,6 +40548,7 @@ tds = { stripPrefix = 0; sha512.run = "b03911aa9711eb5eeed77c026c4bbcf952da80322b855ac631e78c07a48ad2ff1a4afdd6e25a00257d1b70e054645f07f65c98fe74f6b1389be46625f5eb8487"; sha512.doc = "f4078e3b1693fedcbe139b67c50824845644a2b1e57dd27f9e46e44504d8fe8ac0ca706590e9149c06e71794a188b20777bfd6bf1afe85f16c806ba4f9b99cd8"; + hasInfo = true; license = [ "free" ]; version = "1.1"; }; @@ -41052,6 +41065,7 @@ texdraw = { stripPrefix = 0; sha512.run = "f4d160e494b1579743a83b2a0926df9e8dd69fdaa79d3f4f97e0ed5f4ece31ab380ff6994a1c9015e0af9b842bdfb9b066442ca4b3018df6659922af9f746b0b"; sha512.doc = "e177209a937fa1d9d683eb805e9e8929612b4b1ff750955d38ca681b657662712a59609990f77021063a223ce61a92fdd567eee91376ef4b67fd3a322db09463"; + hasInfo = true; hasRunfiles = true; license = [ "cc-by-40" ]; version = "v2r3"; @@ -41115,6 +41129,7 @@ texlive-en = { stripPrefix = 0; sha512.run = "f790f2a94e67573635afb5b4c2d375bede61eb3afe271169078fe905d326119234363ee896ecc93a9892d26e0a394fc350edbda810e218b0b06cc30681fd9cf0"; sha512.doc = "48ffb3b9053250f4425992c57869c6153601e9dfaa4931ac4ff3c12df44b148dce08496acbae495fd5f9fe37e11044a3fc0669c713515d2cc99506fd6be59859"; + hasInfo = true; }; texlive-es = { revision = 65640; diff --git a/pkgs/tools/typesetting/typst/Cargo.lock b/pkgs/tools/typesetting/typst/Cargo.lock index 71fb9e8f713..ae81d73200a 100644 --- a/pkgs/tools/typesetting/typst/Cargo.lock +++ b/pkgs/tools/typesetting/typst/Cargo.lock @@ -21,21 +21,33 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -57,9 +69,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -71,15 +83,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -95,15 +107,24 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", ] [[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] name = "arrayref" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -129,9 +150,9 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -141,11 +162,10 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "biblatex" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9fd60378277e44cd400ec5f35e768ce0d5a63d8d18ac7b1a9231196251dae5" +checksum = "2e41df82f0d1c4919d946bb0c7c3d179b6071246243d308a1bdee6cfecee3bc7" dependencies = [ - "chrono", "numerals", "paste", "strum", @@ -178,12 +198,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -191,9 +205,9 @@ 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" dependencies = [ "serde", ] @@ -221,9 +235,31 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytecheck" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "bytemuck" @@ -233,9 +269,9 @@ checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[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 = "bzip2" @@ -294,9 +330,9 @@ checksum = "aeea139b89efab957972956e5d3e4efb66a6c261f726abf6911040cc8ef700f7" [[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", @@ -328,7 +364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", - "half 1.8.2", + "half", ] [[package]] @@ -342,10 +378,20 @@ dependencies = [ ] [[package]] +name = "citationberg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c857faf24e89710f105b623c174508070a9e11e056a749f251ca4c56f59ad88" +dependencies = [ + "quick-xml 0.28.2", + "serde", +] + +[[package]] name = "clap" -version = "4.4.3" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", @@ -353,9 +399,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", @@ -365,36 +411,36 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.1" +version = "4.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" +checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clap_mangen" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf8e5f34d85d9e0bbe2491d100a7a7c1007bb2467b518080bfe311e8947197a9" +checksum = "d3be86020147691e1d2ef58f75346a3d4d94807bfc473e377d52f09f0f7d77f7" dependencies = [ "clap", "roff", @@ -462,10 +508,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + +[[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -523,12 +578,6 @@ dependencies = [ ] [[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -540,9 +589,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -552,9 +601,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -566,7 +615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "lock_api", "once_cell", "parking_lot_core", @@ -574,15 +623,18 @@ dependencies = [ [[package]] name = "data-url" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" +checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" [[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 = "digest" @@ -624,7 +676,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -635,9 +687,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "ecow" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1990d053cf6edf3f030682dba3b0eb65ef01fabb2686072765d8a17d6728e8" +checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02" dependencies = [ "serde", ] @@ -649,16 +701,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] name = "enum-ordinalize" -version = "3.1.13" +version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ "num-bigint", "num-traits", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -688,42 +746,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "exr" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" -dependencies = [ - "bit_field", - "flume", - "half 2.2.1", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] name = "fancy-regex" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -734,6 +765,12 @@ dependencies = [ ] [[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[package]] name = "fastrand" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -744,9 +781,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" @@ -771,9 +808,9 @@ dependencies = [ [[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", @@ -786,34 +823,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" [[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 0.9.8", -] - -[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree", +] + +[[package]] name = "fontdb" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8d8cbea8f21307d7e84bca254772981296f058a1d36b461bf4d83a7499fc9e" +checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" dependencies = [ + "fontconfig-parser", "log", + "memmap2", "slotmap", "tinyvec", - "ttf-parser 0.19.2", + "ttf-parser", ] [[package]] @@ -841,18 +876,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -878,10 +901,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -901,45 +922,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] -name = "half" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" -dependencies = [ - "crunchy", -] - -[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.7", +] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "hayagriva" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065e90e53aa502be868a307f58ca6b46e31143641e809047c689de75619d8cea" +checksum = "c5af3d464a6b5ae882f15fe1da4e696fd96b77fee78ded933e0ad81d1d87cbc5" dependencies = [ "biblatex", - "chrono", - "isolang", - "lazy_static", - "linked-hash-map", + "ciborium", + "citationberg", + "indexmap 2.0.2", + "numerals", "paste", - "regex", - "strum", + "rkyv", + "serde", + "serde_yaml 0.9.27", "thiserror", "unic-langid", "unicode-segmentation", + "unscanny", "url", - "yaml-rust", ] [[package]] @@ -950,9 +966,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hmac" @@ -965,9 +981,9 @@ dependencies = [ [[package]] name = "hypher" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723e315d77ea8aa1aedf53ad979ff0e763cfa2a1b3403248e427ae052f403cad" +checksum = "94bf16dd62ea2bec617a6f8a3e1ba03107311783069a647787ac689d1f35321e" [[package]] name = "iai" @@ -979,16 +995,16 @@ dependencies = [ [[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]] @@ -1002,9 +1018,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8302d8dfd6044d3ddb3f807a5ef3d7bbca9a574959c6d6e4dc39aa7012d0d5" +checksum = "3907b2246e8dd5a29ead8a965e7c0c8a90e9b928e614a4279257d45c5e553e91" dependencies = [ "displaydoc", "serde", @@ -1015,9 +1031,9 @@ dependencies = [ [[package]] name = "icu_locid" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3003f85dccfc0e238ff567693248c59153a46f4e6125ba4020b973cef4d1d335" +checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" dependencies = [ "displaydoc", "litemap", @@ -1027,13 +1043,35 @@ dependencies = [ ] [[package]] +name = "icu_locid_transform" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" + +[[package]] name = "icu_properties" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0e1aa26851f16c9e04412a5911c86b7f8768dac8f8d4c5f1c568a7e5d7a434" +checksum = "3477ae70f8ca8dc08ff7574b5398ed0a2f2e4e6b66bdff2558a92ed67e262be1" dependencies = [ "displaydoc", "icu_collections", + "icu_locid_transform", + "icu_properties_data", "icu_provider", "serde", "tinystr", @@ -1041,10 +1079,16 @@ dependencies = [ ] [[package]] +name = "icu_properties_data" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98507b488098f45eb95ef495612a2012e4d8ad6095dda86cb2f1728aa2204a60" + +[[package]] name = "icu_provider" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc312a7b6148f7dfe098047ae2494d12d4034f48ade58d4f353000db376e305" +checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" dependencies = [ "displaydoc", "icu_locid", @@ -1052,6 +1096,7 @@ dependencies = [ "postcard", "serde", "stable_deref_trait", + "tinystr", "writeable", "yoke", "zerofrom", @@ -1060,59 +1105,65 @@ dependencies = [ [[package]] name = "icu_provider_adapters" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ae1e2bd0c41728b77e7c46e9afdec5e2127d1eedacc684724667d50c126bd3" +checksum = "36b380ef2d3d93b015cd0563d7e0d005cc07f82a5503716dbc191798d0079e1d" dependencies = [ "icu_locid", + "icu_locid_transform", "icu_provider", "tinystr", - "yoke", "zerovec", ] [[package]] name = "icu_provider_blob" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd364c9a01f791a4bc04a74cf2a1d01d9f6926a40fd5ae1c28004e1e70d8338b" +checksum = "c31326d28c7f95a964a4f0ee86c24002da5f6db907e3bcb079949b4ff103b6a9" dependencies = [ "icu_provider", "postcard", "serde", "writeable", - "yoke", "zerovec", ] [[package]] name = "icu_provider_macros" -version = "1.2.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b728b9421e93eff1d9f8681101b78fa745e0748c95c655c83f337044a7e10" +checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "icu_segmenter" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3300a7b6bf187be98a57264ad094f11f2e062c2e8263132af010ff522ee5495" +checksum = "bcb3c1981ce2187a745f391a741cb14e77453325acb3b2e014b05da51c0a39f2" dependencies = [ + "core_maths", "displaydoc", "icu_collections", "icu_locid", "icu_provider", - "num-traits", + "icu_segmenter_data", "serde", "utf8_iter", "zerovec", ] [[package]] +name = "icu_segmenter_data" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9703f6713044d1c0a1335a6d78ffece4c9380582416ace6feeb608e84d279fc7" + +[[package]] name = "idna" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1137,14 +1188,11 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", "gif", "jpeg-decoder", "num-rational", "num-traits", "png", - "qoi", - "tiff", ] [[package]] @@ -1184,12 +1232,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.2", "rayon", "serde", ] @@ -1202,17 +1250,17 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "inferno" -version = "0.11.16" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73c0fefcb6d409a6587c07515951495d482006f89a21daa0f2f783aa4fd5e027" +checksum = "c50453ec3a6555fad17b1cd1a80d16af5bc7cb35094f64e429fd46549018c6a3" dependencies = [ - "ahash", + "ahash 0.8.6", "clap", "crossbeam-channel", "crossbeam-utils", "dashmap", "env_logger", - "indexmap 2.0.0", + "indexmap 2.0.2", "is-terminal", "itoa", "log", @@ -1292,15 +1340,6 @@ dependencies = [ ] [[package]] -name = "isolang" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f80f221db1bc708b71128757b9396727c04de86968081e18e89b0575e03be071" -dependencies = [ - "phf", -] - -[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1308,9 +1347,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -1320,9 +1359,6 @@ 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" @@ -1369,16 +1405,10 @@ 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 = "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 = "libdeflate-sys" @@ -1400,9 +1430,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "line-wrap" @@ -1421,9 +1451,9 @@ 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 = "lipsum" @@ -1437,15 +1467,15 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a04a5b2b6f54acba899926491d0a6c59d98012938ca2ab5befb281c034e8f94" +checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" [[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", @@ -1470,15 +1500,15 @@ dependencies = [ [[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 = "memmap2" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" dependencies = [ "libc", ] @@ -1504,9 +1534,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", @@ -1515,21 +1545,12 @@ dependencies = [ ] [[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] name = "notify" version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "crossbeam-channel", "filetime", "fsevent-sys", @@ -1596,22 +1617,11 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", - "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]] @@ -1621,15 +1631,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] -name = "oklab" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467e40ada50d13bab19019e3707862b5076ca15841f31ee1474c40397c1b9f11" -dependencies = [ - "rgb", -] - -[[package]] name = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1666,7 +1667,7 @@ dependencies = [ "bitvec", "crossbeam-channel", "filetime", - "indexmap 2.0.0", + "indexmap 2.0.2", "libdeflater", "log", "rayon", @@ -1677,14 +1678,37 @@ dependencies = [ ] [[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "libm", + "palette_derive", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets", ] @@ -1726,12 +1750,13 @@ dependencies = [ [[package]] name = "pdf-writer" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d77bc47c8968aa63f86a7e6693e270a6cbd1e3b784c364f1711a0ddecc71447" +checksum = "690874e8cf95d36ddffbdbdaad6ef8714c88bf8085996b673559389a04e38a02" dependencies = [ "bitflags 1.3.2", "itoa", + "memchr", "ryu", ] @@ -1742,50 +1767,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] name = "pico-args" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.32", -] - -[[package]] name = "pin-project-lite" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1797,7 +1784,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f67591f21f6668e63c1cd85adab066ac8a92bc7b962668dd8042197a6e4b8f8f" dependencies = [ - "ttf-parser 0.19.2", + "ttf-parser", ] [[package]] @@ -1808,14 +1795,14 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" dependencies = [ "base64", "indexmap 1.9.3", "line-wrap", - "quick-xml 0.29.0", + "quick-xml 0.30.0", "serde", "time", ] @@ -1835,15 +1822,22 @@ dependencies = [ [[package]] name = "postcard" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d534c6e61df1c7166e636ca612d9820d486fe96ddad37f7abc671517b297488e" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" dependencies = [ "cobs", + "embedded-io", "serde", ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1851,9 +1845,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -1868,6 +1862,26 @@ dependencies = [ ] [[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "pulldown-cmark" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1880,28 +1894,29 @@ dependencies = [ ] [[package]] -name = "qoi" -version = "0.4.1" +name = "quick-xml" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" dependencies = [ - "bytemuck", + "memchr", ] [[package]] name = "quick-xml" -version = "0.26.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" dependencies = [ "memchr", + "serde", ] [[package]] name = "quick-xml" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -1948,9 +1963,9 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1958,14 +1973,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1993,6 +2006,15 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2005,25 +2027,25 @@ 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", "regex-automata", - "regex-syntax", + "regex-syntax 0.8.2", ] [[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", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] @@ -2033,10 +2055,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rend" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +dependencies = [ + "bytecheck", +] + +[[package]] name = "resvg" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6554f47c38eca56827eea7f285c2a3018b4e12e0e195cc105833c008be338f1" +checksum = "cc7980f653f9a7db31acff916a262c3b78c562919263edea29bf41a056e20497" dependencies = [ "gif", "jpeg-decoder", @@ -2051,26 +2088,53 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.36" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ "bytemuck", ] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", + "getrandom", "libc", - "once_cell", - "spin 0.5.2", + "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys", +] + +[[package]] +name = "rkyv" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +dependencies = [ + "bitvec", + "bytecheck", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -2081,9 +2145,9 @@ checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" [[package]] name = "roxmltree" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" dependencies = [ "xmlparser", ] @@ -2105,11 +2169,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.13" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -2118,13 +2182,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", "ring", - "rustls-webpki 0.101.5", + "rustls-webpki", "sct", ] @@ -2139,19 +2203,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.100.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.5" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -2165,17 +2219,17 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +checksum = "71cd15fef9112a1f94ac64b58d1e4628192631ad6af4dc69997f995459c874e7" dependencies = [ "bitflags 1.3.2", "bytemuck", "smallvec", - "ttf-parser 0.18.1", + "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", - "unicode-general-category", + "unicode-properties", "unicode-script", ] @@ -2208,15 +2262,21 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", ] [[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] name = "self-replace" version = "1.3.5" source = "git+https://github.com/typst/self-replace#2e6d5e4808bba73b713fd85cf5616b7d846143c2" @@ -2228,35 +2288,35 @@ 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 = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -2265,9 +2325,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -2286,11 +2346,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -2299,9 +2359,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -2310,9 +2370,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -2321,9 +2381,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -2335,6 +2395,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] name = "simplecss" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2360,24 +2426,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "spin" -version = "0.5.2" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "stable_deref_trait" @@ -2455,9 +2512,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "svg2pdf" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c267ce43e1b46631a121481ae2d7dc00dda163d486f0f600be772bbe24d6037" +checksum = "363c5346967da04bf3ebb3d8bafa7f52c53c810167047904df1960eac3fc08b7" dependencies = [ "image", "miniz_oxide", @@ -2467,9 +2524,9 @@ dependencies = [ [[package]] name = "svgtypes" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" +checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52" dependencies = [ "kurbo", "siphasher", @@ -2488,9 +2545,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -2499,13 +2556,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.6" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "unicode-xid", ] @@ -2522,7 +2579,7 @@ dependencies = [ "fnv", "once_cell", "plist", - "regex-syntax", + "regex-syntax 0.7.5", "serde", "serde_json", "thiserror", @@ -2549,44 +2606,44 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.3.5", + "fastrand 2.0.1", + "redox_syscall 0.4.1", "rustix", "windows-sys", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] @@ -2600,24 +2657,14 @@ dependencies = [ ] [[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]] 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", + "powerfmt", "serde", "time-core", "time-macros", @@ -2625,24 +2672,24 @@ dependencies = [ [[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" -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", ] [[package]] name = "tiny-skia" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" +checksum = "3b72a92a05db376db09fe6d50b7948d106011761c05a6a45e23e17ee9b556222" dependencies = [ "arrayref", "arrayvec", @@ -2655,9 +2702,9 @@ dependencies = [ [[package]] name = "tiny-skia-path" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" +checksum = "6ac3865b9708fc7e1961a65c3a4fa55e984272f33092d3c859929f887fceb647" dependencies = [ "arrayref", "bytemuck", @@ -2666,9 +2713,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" dependencies = [ "displaydoc", "serde", @@ -2692,9 +2739,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.0" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" dependencies = [ "serde", "serde_spanned", @@ -2704,20 +2751,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.20.0" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -2726,11 +2773,10 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2738,20 +2784,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[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", @@ -2780,12 +2826,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -2805,12 +2851,6 @@ dependencies = [ [[package]] name = "ttf-parser" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" - -[[package]] -name = "ttf-parser" version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" @@ -2823,28 +2863,28 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[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 = "typst" -version = "0.8.0" +version = "0.9.0" dependencies = [ "base64", - "bitflags 2.4.0", + "bitflags 2.4.1", "bytemuck", "comemo", "ecow", "flate2", "fontdb", - "if_chain", "image", - "indexmap 2.0.0", + "indexmap 2.0.2", + "kurbo", "log", "miniz_oxide", - "oklab", "once_cell", + "palette", "pdf-writer", "pixglyph", "regex", @@ -2860,7 +2900,7 @@ dependencies = [ "tiny-skia", "toml", "tracing", - "ttf-parser 0.19.2", + "ttf-parser", "typst-macros", "typst-syntax", "unicode-ident", @@ -2877,7 +2917,7 @@ dependencies = [ [[package]] name = "typst-cli" -version = "0.8.0" +version = "0.9.0" dependencies = [ "chrono", "clap", @@ -2888,9 +2928,10 @@ dependencies = [ "dirs", "ecow", "env_proxy", + "filetime", "flate2", + "fontdb", "inferno", - "memmap2", "notify", "once_cell", "open", @@ -2902,7 +2943,7 @@ dependencies = [ "semver", "serde", "serde_json", - "serde_yaml 0.9.25", + "serde_yaml 0.9.27", "siphasher", "tar", "tempfile", @@ -2913,14 +2954,13 @@ dependencies = [ "typst", "typst-library", "ureq", - "walkdir", "xz2", "zip", ] [[package]] name = "typst-docs" -version = "0.8.0" +version = "0.9.0" dependencies = [ "comemo", "ecow", @@ -2929,7 +2969,7 @@ dependencies = [ "once_cell", "pulldown-cmark", "serde", - "serde_yaml 0.9.25", + "serde_yaml 0.9.27", "syntect", "typed-arena", "typst", @@ -2940,8 +2980,21 @@ dependencies = [ ] [[package]] +name = "typst-ide" +version = "0.9.0" +dependencies = [ + "comemo", + "ecow", + "if_chain", + "log", + "serde", + "typst", + "unscanny", +] + +[[package]] name = "typst-library" -version = "0.8.0" +version = "0.9.0" dependencies = [ "az", "chinese-number", @@ -2956,6 +3009,7 @@ dependencies = [ "icu_provider_adapters", "icu_provider_blob", "icu_segmenter", + "indexmap 2.0.2", "kurbo", "lipsum", "log", @@ -2963,13 +3017,13 @@ dependencies = [ "roxmltree", "rustybuzz", "serde_json", - "serde_yaml 0.9.25", + "serde_yaml 0.9.27", "smallvec", "syntect", "time", "toml", "tracing", - "ttf-parser 0.19.2", + "ttf-parser", "typed-arena", "typst", "unicode-bidi", @@ -2980,17 +3034,17 @@ dependencies = [ [[package]] name = "typst-macros" -version = "0.8.0" +version = "0.9.0" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", ] [[package]] name = "typst-syntax" -version = "0.8.0" +version = "0.9.0" dependencies = [ "comemo", "ecow", @@ -3005,7 +3059,7 @@ dependencies = [ [[package]] name = "typst-tests" -version = "0.8.0" +version = "0.9.0" dependencies = [ "clap", "comemo", @@ -3015,7 +3069,7 @@ dependencies = [ "oxipng", "rayon", "tiny-skia", - "ttf-parser 0.19.2", + "ttf-parser", "typst", "typst-library", "unscanny", @@ -3037,6 +3091,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" dependencies = [ + "serde", "tinystr", ] @@ -3068,12 +3123,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" [[package]] -name = "unicode-general-category" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" - -[[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3120,9 +3169,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -3150,22 +3199,22 @@ checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ "base64", "flate2", "log", "once_cell", "rustls", - "rustls-webpki 0.100.3", + "rustls-webpki", "serde", "serde_json", "url", @@ -3181,13 +3230,14 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] name = "usvg" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d09ddfb0d93bf84824c09336d32e42f80961a9d1680832eb24fdf249ce11e6" +checksum = "c51daa774fe9ee5efcf7b4fec13019b8119cda764d9a8b5b06df02bb1445c656" dependencies = [ "base64", "log", @@ -3200,9 +3250,9 @@ dependencies = [ [[package]] name = "usvg-parser" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19bf93d230813599927d88557014e0908ecc3531666d47c634c6838bc8db408" +checksum = "45c88a5ffaa338f0e978ecf3d4e00d8f9f493e29bed0752e1a808a1db16afc40" dependencies = [ "data-url", "flate2", @@ -3218,9 +3268,9 @@ dependencies = [ [[package]] name = "usvg-text-layout" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "035044604e89652c0a2959b8b356946997a52649ba6cade45928c2842376feb4" +checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593" dependencies = [ "fontdb", "kurbo", @@ -3234,9 +3284,9 @@ dependencies = [ [[package]] name = "usvg-tree" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7939a7e4ed21cadb5d311d6339730681c3e24c3e81d60065be80e485d3fc8b92" +checksum = "6cacb0c5edeaf3e80e5afcf5b0d4004cc1d36318befc9a7c6606507e5d0f4062" dependencies = [ "rctree", "strict-num", @@ -3257,6 +3307,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" + +[[package]] name = "valuable" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3305,7 +3361,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -3327,7 +3383,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3345,7 +3401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" dependencies = [ "smallvec", - "spin 0.9.8", + "spin", "wasmi_arena", "wasmi_core", "wasmparser-nostd", @@ -3379,23 +3435,10 @@ dependencies = [ ] [[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-roots" -version = "0.23.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.3", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "weezl" @@ -3421,9 +3464,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -3435,10 +3478,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", ] @@ -3511,18 +3554,18 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" dependencies = [ "memchr", ] [[package]] name = "writeable" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e49e42bdb1d5dc76f4cd78102f8f0714d32edfa3efb82286eb0f0b1fc0da0f" +checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" [[package]] name = "wyz" @@ -3544,9 +3587,9 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xmlwriter" @@ -3556,9 +3599,9 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "xmp-writer" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd742bbbb930fc972b28bf66b7546dfbc7bb9a4c7924299df0ae6a5641fcadf" +checksum = "4543ba138f64a94b19e1e9c66c165bca7e03d470e1c066cb76ea279d9d0e1989" [[package]] name = "xz2" @@ -3590,9 +3633,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1848075a23a28f9773498ee9a0f2cf58fcbad4f8c0ccf84a210ab33c6ae495de" +checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" dependencies = [ "serde", "stable_deref_trait", @@ -3602,42 +3645,62 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af46c169923ed7516eef0aa32b56d2651b229f57458ebe46b49ddd6efef5b7a2" +checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "synstructure", ] [[package]] +name = "zerocopy" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] name = "zerofrom" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d76c3251de27615dfcce21e636c172dafb2549cd7fd93e21c66f6ca6bea2" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eae7c1f7d4b8eafce526bc0771449ddc2f250881ae31c50d22c032b5a1c499" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "synstructure", ] [[package]] name = "zerovec" -version = "0.9.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "198f54134cd865f437820aa3b43d0ad518af4e68ee161b444cdd15d8e567c8ea" +checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" dependencies = [ "serde", "yoke", @@ -3647,14 +3710,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.9.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486558732d5dde10d0f8cb2936507c1bb21bc539d924c949baf5f36a58e51bac" +checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "synstructure", + "syn 2.0.38", ] [[package]] @@ -3710,20 +3772,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" 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/tools/typesetting/typst/default.nix b/pkgs/tools/typesetting/typst/default.nix index 1d9e95f5025..eeb25fa30bd 100644 --- a/pkgs/tools/typesetting/typst/default.nix +++ b/pkgs/tools/typesetting/typst/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "typst"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "typst"; repo = "typst"; rev = "v${version}"; - hash = "sha256-q2b/PoNwpzarJbIPzokYgZRD2/Oe/XB40C4VXdwL/NA="; + hash = "sha256-LwRB/AQE8TZZyHEQ7kKB10itzEgYjg4R/k+YFqmutDc="; }; cargoLock = { diff --git a/pkgs/tools/video/lux/default.nix b/pkgs/tools/video/lux/default.nix index 79b3eec9e5b..f6a4ea61f2d 100644 --- a/pkgs/tools/video/lux/default.nix +++ b/pkgs/tools/video/lux/default.nix @@ -1,33 +1,43 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, ffmpeg }: +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, ffmpeg +}: buildGoModule rec { pname = "lux"; - version = "0.19.0"; + version = "0.21.0"; + src = fetchFromGitHub { owner = "iawia002"; repo = "lux"; rev = "v${version}"; - sha256 = "sha256-klm1985qBErFfYIWPjr1/n6nYr/jA9dbrDMfw4bf1tM="; + hash = "sha256-LCYWfF7O8wByCJNDi2BZsI7EU6wJqhcr/sbNOoQ2Src="; }; nativeBuildInputs = [ makeWrapper ]; - vendorHash = "sha256-7wgGJYiIsVTRSuSb4a9LgYCkkayGhNMKqcIKoDxMuAM="; + vendorHash = "sha256-wW/jrsurmyLcDX+58lp0M+snJ2avEs0HciNZ8BgIqrI="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/iawia002/lux/app.version=v${version}" + ]; postInstall = '' wrapProgram $out/bin/lux \ --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; - doCheck = false; + doCheck = false; # require network meta = with lib; { description = "Fast and simple video download library and CLI tool written in Go"; homepage = "https://github.com/iawia002/lux"; changelog = "https://github.com/iawia002/lux/releases/tag/v${version}"; license = licenses.mit; - maintainers = []; + maintainers = with maintainers; [ galaxy ]; }; } diff --git a/pkgs/tools/video/vcsi/default.nix b/pkgs/tools/video/vcsi/default.nix index ad09d57d791..bb3bc4c9856 100644 --- a/pkgs/tools/video/vcsi/default.nix +++ b/pkgs/tools/video/vcsi/default.nix @@ -1,14 +1,20 @@ -{ lib, python3Packages, fetchPypi, ffmpeg }: +{ lib, python3Packages, fetchFromGitHub, ffmpeg }: python3Packages.buildPythonApplication rec { pname = "vcsi"; - version = "7.0.13"; + version = "7.0.16"; - src = fetchPypi { - inherit pname version; - sha256 = "01qwbb2l8gwf622zzhh0kzdzw3njvsdwmndwn01i9bn4qm5cas8r"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "amietn"; + repo = pname; + rev = "v${version}"; + hash = "sha256-I0o6GX/TNMfU+rQtSqReblRplXPynPF6m2zg0YokmtI="; }; + nativeBuildInputs = [ python3Packages.poetry-core ]; + propagatedBuildInputs = with python3Packages; [ numpy pillow @@ -26,6 +32,6 @@ python3Packages.buildPythonApplication rec { description = "Create video contact sheets"; homepage = "https://github.com/amietn/vcsi"; license = licenses.mit; - maintainers = with maintainers; [ dandellion ]; + maintainers = with maintainers; [ dandellion zopieux ]; }; } diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 43f8cfd2143..aa8e7664e08 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.32.0"; + version = "0.33.0"; subPackages = [ "govc" ]; @@ -10,10 +10,10 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-GnMWgN6ZxxGU/tRAPIk2cvpsBiut97iPcU9920wepxM="; + sha256 = "sha256-YY/rTrL6zEhZkeaYz2yG/h2s81IefClou4abbmQuDiU="; }; - vendorHash = "sha256-mf9ZYZEmqB/47JLHn8N3VDr57SXbFLubXnwfXj682FA="; + vendorHash = "sha256-DBcovHOOfIy4dfi8U9zaCUzz5Zz8oIG44JCqMKtdxgg="; ldflags = [ "-s" diff --git a/pkgs/tools/wayland/sov/default.nix b/pkgs/tools/wayland/sov/default.nix index 31451d82d4b..c8ddc6524f2 100644 --- a/pkgs/tools/wayland/sov/default.nix +++ b/pkgs/tools/wayland/sov/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , meson , ninja , pkg-config @@ -23,13 +24,28 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-1L5D0pzcXbkz3VS7VB6ID8BJEbGeNxjo3xCr71CGcIo="; }; + patches = [ + # mark wayland-scanner as build-time dependency + # https://github.com/milgra/sov/pull/45 + (fetchpatch2 { + url = "https://github.com/milgra/sov/commit/8677dcfc47e440157388a8f15bdda9419d84db04.patch"; + hash = "sha256-P1k1zosHcVO7hyhD1JWbj07h7pQ7ybgDHfoufBinEys="; + }) + ]; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + buildInputs = [ freetype libglvnd diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 25123ec9b24..4e829d1e0b6 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -8,17 +8,16 @@ ocamlPackages.buildDunePackage rec { pname = "wayland-proxy-virtwl"; - version = "unstable-2023-08-13"; + version = "unstable-2023-10-27"; src = fetchFromGitHub { owner = "talex5"; repo = pname; - rev = "050c49a377808105b895e81e7e498f35cc151e58"; - sha256 = "sha256-6YJv3CCED6LUSPFwYQyHUFkkvOWZGPNHVzw60b5F8+c="; + rev = "cc9548c4980ff33f86d5645ce337a79bf95d6139"; + sha256 = "sha256-aAqbPslTu+RLQPKPJQH2iYjcI8/De2WPk5nHULdfocU="; }; - minimalOCamlVersion = "4.12"; - duneVersion = "3"; + minimalOCamlVersion = "5.0"; nativeBuildInputs = [ pkg-config @@ -26,11 +25,11 @@ ocamlPackages.buildDunePackage rec { buildInputs = [ libdrm ] ++ (with ocamlPackages; [ dune-configurator + eio_main ppx_cstruct wayland cmdliner logs - cstruct-lwt ppx_cstruct ]); diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 0746dd5ff09..eaaec0f0bb2 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.13.2"; + version = "0.14.2"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-dmdRe4GZ1W2gD7ZF1MudBqfZIm9HyBjISa+xB54BLz4="; + hash = "sha256-dEkTRpeJhqUGDCqTLVsFoDXgHvfEqMYt/9DEldjqv0Y="; }; strictDeps = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 85ac74fae7d..094416b32af 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -710,6 +710,7 @@ mapAliases ({ 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 + privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 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 @@ -882,6 +883,7 @@ mapAliases ({ telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 testVersion = testers.testVersion; # Added 2022-04-20 + tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 timescale-prometheus = promscale; # Added 2020-09-29 tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18e843038e0..2251a98c4e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -447,6 +447,10 @@ with pkgs; ccal = callPackage ../tools/misc/ccal { }; + celeste-classic-pm = pkgs.celeste-classic.override { + practiceMod = true; + }; + cereal = cereal_1_3_0; cereal_1_3_0 = callPackage ../development/libraries/cereal/1.3.0.nix { }; cereal_1_3_2 = callPackage ../development/libraries/cereal/1.3.2.nix { }; @@ -1093,7 +1097,7 @@ with pkgs; }; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { - 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. @@ -2057,8 +2061,6 @@ with pkgs; tfk8s = callPackage ../tools/misc/tfk8s { }; - tfplugindocs = callPackage ../development/tools/tfplugindocs { }; - thumbs = callPackage ../tools/misc/thumbs { }; tnat64 = callPackage ../tools/networking/tnat64 { }; @@ -4800,7 +4802,9 @@ with pkgs; wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; + wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { + ocamlPackages = ocaml-ng.ocamlPackages_5_0; + }; waylogout = callPackage ../tools/wayland/waylogout { }; @@ -5793,7 +5797,7 @@ with pkgs; klipper = callPackage ../servers/klipper { }; - klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { }; + klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { gcc-arm-embedded = gcc-arm-embedded-11; }; klipper-flash = callPackage ../servers/klipper/klipper-flash.nix { }; @@ -6248,7 +6252,7 @@ with pkgs; pn = callPackage ../tools/text/pn { }; pocket-casts = callPackage ../applications/audio/pocket-casts { - electron = electron_22; + electron = electron_27; }; portal = callPackage ../tools/misc/portal { }; @@ -9920,8 +9924,6 @@ with pkgs; lhasa = callPackage ../tools/compression/lhasa { }; - libcpuid = callPackage ../tools/misc/libcpuid { }; - libcsptr = callPackage ../development/libraries/libcsptr { }; libgovirt = callPackage ../applications/virtualization/libgovirt { }; @@ -13418,8 +13420,6 @@ with pkgs; spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { }; - spigot = callPackage ../tools/misc/spigot { }; - spiped = callPackage ../tools/networking/spiped { }; sqlite3-to-mysql = callPackage ../tools/misc/sqlite3-to-mysql { }; @@ -16894,7 +16894,7 @@ with pkgs; ocamlformat # latest version ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 - ocamlformat_0_26_0; + ocamlformat_0_26_0 ocamlformat_0_26_1; inherit (ocamlPackages) odig; @@ -19869,8 +19869,6 @@ with pkgs; premake = premake4; - privacyidea = callPackage ../applications/misc/privacyidea { }; - process-compose = callPackage ../applications/misc/process-compose { }; process-viewer = callPackage ../applications/misc/process-viewer { }; @@ -20923,9 +20921,7 @@ with pkgs; cog = callPackage ../development/web/cog { }; - cosmocc = callPackage ../development/tools/cosmocc { }; - - cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; + inherit (cosmopolitan) cosmocc; python-cosmopolitan = callPackage ../development/interpreters/python-cosmopolitan { }; @@ -22450,6 +22446,10 @@ with pkgs; libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { }; + libaribcaption = callPackage ../by-name/li/libaribcaption/package.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreFoundation CoreGraphics CoreText; + }; + libasn1c = callPackage ../servers/osmocom/libasn1c/default.nix { }; libasr = callPackage ../development/libraries/libasr { }; @@ -22531,6 +22531,8 @@ with pkgs; then pkgs.libcanberra else pkgs.libcanberra-gtk2; + libcaption = callPackage ../development/libraries/libcaption { }; + libcbor = callPackage ../development/libraries/libcbor { }; libccd = callPackage ../development/libraries/libccd { }; @@ -24345,10 +24347,6 @@ with pkgs; ffmpeg = ffmpeg_4; }; - opencv3WithoutCuda = opencv3.override { - enableCuda = false; - }; - opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; @@ -24356,6 +24354,10 @@ with pkgs; ffmpeg = ffmpeg_4; }; + opencv4WithoutCuda = opencv4.override { + enableCuda = false; + }; + opencv = opencv4; imath = callPackage ../development/libraries/imath { }; @@ -26225,7 +26227,7 @@ with pkgs; jre = pkgs.jdk11_headless; python = python3; }; - cassandra = cassandra_3_11; + cassandra = cassandra_4; cassandra-cpp-driver = callPackage ../development/libraries/cassandra-cpp-driver/default.nix { }; @@ -27080,14 +27082,12 @@ with pkgs; timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; inherit (import ../servers/sql/postgresql pkgs) - postgresql_11 postgresql_12 postgresql_13 postgresql_14 postgresql_15 postgresql_16 - postgresql_11_jit postgresql_12_jit postgresql_13_jit postgresql_14_jit @@ -27098,12 +27098,10 @@ with pkgs; postgresql_jit = postgresql_15_jit.override { this = postgresql_jit; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs; - postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs; postgresql16Packages = recurseIntoAttrs postgresql_16.pkgs; - postgresql11JitPackages = recurseIntoAttrs postgresql_11_jit.pkgs; postgresql12JitPackages = recurseIntoAttrs postgresql_12_jit.pkgs; postgresql13JitPackages = recurseIntoAttrs postgresql_13_jit.pkgs; postgresql14JitPackages = recurseIntoAttrs postgresql_14_jit.pkgs; @@ -30328,8 +30326,6 @@ with pkgs; anilibria-winmaclinux = libsForQt5.callPackage ../applications/video/anilibria-winmaclinux { }; - yggdrasil = callPackage ../tools/networking/yggdrasil { }; - masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; @@ -30991,6 +30987,8 @@ with pkgs; cosmic-panel = callPackage ../applications/window-managers/cosmic/panel { }; + cosmic-settings = callPackage ../applications/window-managers/cosmic/settings { }; + coursera-dl = callPackage ../applications/misc/coursera-dl { }; coyim = callPackage ../applications/networking/instant-messengers/coyim { }; @@ -34925,7 +34923,7 @@ with pkgs; qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; - qpwgraph = libsForQt5.callPackage ../applications/audio/qpwgraph { }; + qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { }; qrcode = callPackage ../tools/graphics/qrcode { }; @@ -38326,6 +38324,11 @@ with pkgs; }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; + rkpd2 = callPackage ../games/shattered-pixel-dungeon/rkpd2.nix { }; + rat-king-adventure = callPackage ../games/shattered-pixel-dungeon/rat-king-adventure.nix { }; + experienced-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix { }; + summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix { }; + shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix { }; shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { }; @@ -39810,7 +39813,7 @@ with pkgs; caffe = callPackage ../applications/science/math/caffe ({ inherit (config) cudaSupport; cudaPackages = cudaPackages_10_1; - opencv3 = opencv3WithoutCuda; # Used only for image loading. + opencv4 = opencv4WithoutCuda; # Used only for image loading. blas = openblas; inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; } // (config.caffe or {})); @@ -40454,6 +40457,8 @@ with pkgs; j2cli = with python3Packages; toPythonApplication j2cli; + jq-lsp = callPackage ../development/tools/language-servers/jq-lsp { }; + jquake = callPackage ../applications/misc/jquake { }; jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; @@ -41531,6 +41536,10 @@ with pkgs; yandex-browser = callPackage ../applications/networking/browsers/yandex-browser { }; + yandex-browser-beta = yandex-browser.override { edition = "beta"; }; + + yandex-browser-corporate = yandex-browser.override { edition = "corporate"; }; + yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; yara = callPackage ../tools/security/yara { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 078bbb80942..5ca5e3867d5 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -125,7 +125,13 @@ let Verdi = callPackage ../development/coq-modules/Verdi {}; VST = callPackage ../development/coq-modules/VST ((lib.optionalAttrs (lib.versionAtLeast self.coq.version "8.14") { - compcert = self.compcert.override { version = "3.11"; }; + compcert = self.compcert.override { + version = with lib.versions; lib.switch self.coq.version [ + { case = isEq "8.17"; out = "3.13"; } + { case = range "8.15" "8.16"; out = "3.12"; } + { case = isEq "8.14"; out = "3.11"; } + ] null; + }; }) // (lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") { ITree = self.ITree.override { version = "4.0.0"; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index e4b1133109f..c839d11748c 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -393,6 +393,8 @@ in { mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { }; + nct6687d = callPackage ../os-specific/linux/nct6687d { }; + new-lg4ff = callPackage ../os-specific/linux/new-lg4ff { }; nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 01010c77061..95c2ea7b418 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1273,6 +1273,7 @@ let ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; }; ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; }; ocamlformat_0_26_0 = ocamlformat.override { version = "0.26.0"; }; + ocamlformat_0_26_1 = ocamlformat.override { version = "0.26.1"; }; ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d35504c5893..7a0db7fa216 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14657,6 +14657,36 @@ with self; { }; }; + MacPropertyList = buildPerlPackage { + pname = "Mac-PropertyList"; + version = "1.504"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BD/BDFOY/Mac-PropertyList-1.504.tar.gz"; + hash = "sha256-aIl96Yw2j76c22iF1H3qADxG7Ho3MmNSPvZkVwc7eq4="; + }; + propagatedBuildInputs = [ XMLEntities ]; + meta = { + description = "Work with Mac plists at a low level"; + homepage = "https://github.com/briandfoy/mac-propertylist"; + license = lib.licenses.artistic2; + }; + }; + + MacSysProfile = buildPerlPackage { + pname = "Mac-SysProfile"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DM/DMUEY/Mac-SysProfile-0.05.tar.gz"; + hash = "sha256-QDOXa3dbOcwqaTtyoC1l71p7oDveTU2w3/RuEmx9n2w="; + }; + propagatedBuildInputs = [ MacPropertyList ]; + meta = { + description = "Perl extension for OS X system_profiler"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.darwin; + }; + }; + MailAuthenticationResults = buildPerlPackage { pname = "Mail-AuthenticationResults"; version = "1.20200824.1"; @@ -18303,6 +18333,22 @@ with self; { }; }; + NetCUPS = buildPerlPackage { + pname = "Net-CUPS"; + version = "0.64"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NI/NINE/Net-CUPS-0.64.tar.gz"; + hash = "sha256-17x3/w9iv4dMhDxZDrEqgLvUR0mi+3Tb7URcNdDoWoU="; + }; + buildInputs = [ pkgs.cups pkgs.cups-filters ]; + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.cups}/lib -lcups"; + meta = { + description = "Common Unix Printing System Interface"; + homepage = "https://github.com/niner/perl-Net-CUPS"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetDBus = buildPerlPackage { pname = "Net-DBus"; version = "1.2.0"; @@ -19665,6 +19711,20 @@ with self; { }; }; + ParseEDID = buildPerlPackage { + pname = "Parse-Edid"; + version = "1.0.7"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GR/GROUSSE/Parse-EDID-1.0.7.tar.gz"; + hash = "sha256-GtwPEFoyGYoqK02lsOD5hfBe/tmc42YZCnkOFl1nW/E="; + }; + buildInputs = [ TestWarn ]; + meta = { + description = "Extended display identification data (EDID) parser"; + license = lib.licenses.gpl3Plus; + }; + }; + ParseDebControl = buildPerlPackage { pname = "Parse-DebControl"; version = "2.005"; @@ -20734,6 +20794,35 @@ with self; { }; }; + ProcDaemon = buildPerlPackage { + pname = "Proc-Daemon"; + version = "0.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AK/AKREAL/Proc-Daemon-0.23.tar.gz"; + hash = "sha256-NMC4W3lItDHLq8l87lgINeUVzPQ7rb2DOesQlHQIm2k="; + }; + buildInputs = [ ProcProcessTable ]; + meta = { + description = "Run Perl program(s) as a daemon process"; + homepage = "https://github.com/akreal/Proc-Daemon"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ProcPIDFile = buildPerlPackage { + pname = "Proc-PID-File"; + version = "1.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DM/DMITRI/Proc-PID-File-1.29.tar.gz"; + hash = "sha256-O87aSd8YLT2BaLcMKlGyBW8v1FlQptBCipmS/TVc1KQ="; + }; + meta = { + description = "Manage process id files"; + homepage = "https://github.com/dtikhonov/Proc-PID-File"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ProcFind = buildPerlPackage { pname = "Proc-Find"; version = "0.051"; @@ -28019,6 +28108,24 @@ with self; { }; }; + XMLEntities = buildPerlPackage { + pname = "XML-Entities"; + version = "1.0002"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SI/SIXTEASE/XML-Entities-1.0002.tar.gz"; + hash = "sha256-wyqk8wlXPXZIqy5Bb2K2sgZS8q2c/T7sgv1REB/nMQ0="; + }; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + propagatedBuildInputs = [ LWP ]; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/download-entities.pl + ''; + meta = { + description = "Mapping of XML entities to Unicode"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLDOM = buildPerlPackage { pname = "XML-DOM"; version = "1.46"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5357761aa23..00f517bc578 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -203,6 +203,7 @@ mapAliases ({ jaraco_text = jaraco-text; # added 2023-07-14 jaraco_stream = jaraco-stream; # added 2023-07-14 JayDeBeApi = jaydebeapi; # added 2023-02-19 + jinja2_pluralize = jinja2-pluralize; # added 2023-11-01 jinja2_time = jinja2-time; # added 2022-11-07 JPype1 = jpype1; # added 2023-02-19 jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28 @@ -246,6 +247,7 @@ mapAliases ({ notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 Nuitka = nuitka; # added 2023-02-19 ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead."; + openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30 opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19 @@ -261,7 +263,7 @@ mapAliases ({ poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29 postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 - privacyidea = throw "privacyidea has been renamed to pkgs.privacyidea"; # added 2021-06-20 + privacyidea-ldap-proxy = throw "privacyidea-ldap-proxy has been removed from nixpkgs"; # added 2023-10-31 prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 protonup = protonup-ng; # Added 2022-11-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2293e7c1643..baf3d17e899 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1440,6 +1440,8 @@ self: super: with self; { bip-utils = callPackage ../development/python-modules/bip-utils { }; + bip32 = callPackage ../development/python-modules/bip32 { }; + bitarray = callPackage ../development/python-modules/bitarray { }; bitbox02 = callPackage ../development/python-modules/bitbox02 { }; @@ -5637,7 +5639,7 @@ self: super: with self; { jinja2-git = callPackage ../development/python-modules/jinja2-git { }; - jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; + jinja2-pluralize = callPackage ../development/python-modules/jinja2-pluralize { }; jinja2-time = callPackage ../development/python-modules/jinja2-time { }; @@ -5753,6 +5755,8 @@ self: super: with self; { junitparser = callPackage ../development/python-modules/junitparser { }; + junit2html = callPackage ../development/python-modules/junit2html { }; + junit-xml = callPackage ../development/python-modules/junit-xml { }; junos-eznc = callPackage ../development/python-modules/junos-eznc { }; @@ -7039,6 +7043,8 @@ self: super: with self; { mpmath = callPackage ../development/python-modules/mpmath { }; + mpris-server = callPackage ../development/python-modules/mpris-server { }; + mpv = callPackage ../development/python-modules/mpv { inherit (pkgs) mpv; }; @@ -8423,8 +8429,6 @@ self: super: with self; { openant = callPackage ../development/python-modules/openant { }; - openapi-schema-pydantic = callPackage ../development/python-modules/openapi-schema-pydantic { }; - openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { }; openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; @@ -9123,6 +9127,7 @@ self: super: with self; { pycketcasts = callPackage ../development/python-modules/pycketcasts { }; + pycomposefile = callPackage ../development/python-modules/pycomposefile { }; pycontrol4 = callPackage ../development/python-modules/pycontrol4 { }; pycookiecheat = callPackage ../development/python-modules/pycookiecheat { }; @@ -9510,8 +9515,6 @@ self: super: with self; { prison = callPackage ../development/python-modules/prison { }; - privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea-ldap-proxy { }; - proboscis = callPackage ../development/python-modules/proboscis { }; process-tests = callPackage ../development/python-modules/process-tests { }; @@ -13243,6 +13246,8 @@ self: super: with self; { texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; }; + sphinxcontrib-wavedrom = callPackage ../development/python-modules/sphinxcontrib-wavedrom { }; + sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; sphinxcontrib-youtube = callPackage ../development/python-modules/sphinxcontrib-youtube { }; @@ -13327,6 +13332,8 @@ self: super: with self; { sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + sqlite-migrate = callPackage ../development/python-modules/sqlite-migrate { }; + sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { }; sqlite-utils = callPackage ../development/python-modules/sqlite-utils { }; |